diff --git a/Chart.yaml b/Chart.yaml index 00bc84b3e7b3f65e6b497c2648a97fbc1b6835e0..8e8dca9b7a95bf3ce35085312c5d8f8b761aed87 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 description: A Helm chart for GitLab -name: gitlab-chart +name: gitlab version: 0.1.0 keywords: - gitlab diff --git a/charts/gitlab/charts/certmanager-issuer/Chart.yaml b/charts/certmanager-issuer/Chart.yaml similarity index 100% rename from charts/gitlab/charts/certmanager-issuer/Chart.yaml rename to charts/certmanager-issuer/Chart.yaml diff --git a/charts/gitlab/charts/certmanager-issuer/templates/_create_issuer.sh b/charts/certmanager-issuer/templates/_create_issuer.sh similarity index 100% rename from charts/gitlab/charts/certmanager-issuer/templates/_create_issuer.sh rename to charts/certmanager-issuer/templates/_create_issuer.sh diff --git a/charts/gitlab/charts/certmanager-issuer/templates/_helpers.tpl b/charts/certmanager-issuer/templates/_helpers.tpl similarity index 100% rename from charts/gitlab/charts/certmanager-issuer/templates/_helpers.tpl rename to charts/certmanager-issuer/templates/_helpers.tpl diff --git a/charts/gitlab/charts/certmanager-issuer/templates/_issuer.yaml b/charts/certmanager-issuer/templates/_issuer.yaml similarity index 88% rename from charts/gitlab/charts/certmanager-issuer/templates/_issuer.yaml rename to charts/certmanager-issuer/templates/_issuer.yaml index d98daba73285cecb26db7442544a97220504cea1..344880d11f314f9ef2b653e87dae2e68e5f91737 100644 --- a/charts/gitlab/charts/certmanager-issuer/templates/_issuer.yaml +++ b/charts/certmanager-issuer/templates/_issuer.yaml @@ -12,7 +12,7 @@ spec: # The ACME server URL server: {{ .Values.server | quote }} # Email address used for ACME registration - email: {{ required "You must provide an email to associate with your TLS certificates. Please set gitlab.certmanager-issuer.email" .Values.email | quote }} + email: {{ required "You must provide an email to associate with your TLS certificates. Please set certmanager-issuer.email" .Values.email | quote }} # Name of a secret used to store the ACME account private key privateKeySecretRef: name: {{ .Release.Name }}-acme-key diff --git a/charts/gitlab/charts/certmanager-issuer/templates/cert-manager.yml b/charts/certmanager-issuer/templates/cert-manager.yml similarity index 100% rename from charts/gitlab/charts/certmanager-issuer/templates/cert-manager.yml rename to charts/certmanager-issuer/templates/cert-manager.yml diff --git a/charts/gitlab/charts/certmanager-issuer/templates/issuer-job.yaml b/charts/certmanager-issuer/templates/issuer-job.yaml similarity index 100% rename from charts/gitlab/charts/certmanager-issuer/templates/issuer-job.yaml rename to charts/certmanager-issuer/templates/issuer-job.yaml diff --git a/charts/gitlab/charts/certmanager-issuer/templates/rbac-config.yaml b/charts/certmanager-issuer/templates/rbac-config.yaml similarity index 100% rename from charts/gitlab/charts/certmanager-issuer/templates/rbac-config.yaml rename to charts/certmanager-issuer/templates/rbac-config.yaml diff --git a/charts/gitlab/charts/certmanager-issuer/values.yaml b/charts/certmanager-issuer/values.yaml similarity index 100% rename from charts/gitlab/charts/certmanager-issuer/values.yaml rename to charts/certmanager-issuer/values.yaml diff --git a/charts/gitlab/Chart.yaml b/charts/gitlab/Chart.yaml index 44186da7ca3f25b09faa3ac3a2358da7323968a6..3eb07fafd5ebc001320c5f0b7a4d748eac4f435a 100644 --- a/charts/gitlab/Chart.yaml +++ b/charts/gitlab/Chart.yaml @@ -1,4 +1,4 @@ apiVersion: v1 -description: A Helm chart for Kubernetes -name: gitlab +description: A collection of GitLab application services +name: gitlab-services version: 0.1.0 diff --git a/charts/gitlab/values.yaml b/charts/gitlab/values.yaml index a39b118407a2b9539d8a4b795befd4e66bb82e5f..4a88cd09e7e4ccf9f7b4f8de5c13a539a61edb0f 100644 --- a/charts/gitlab/values.yaml +++ b/charts/gitlab/values.yaml @@ -5,3 +5,6 @@ global: hosts: domain: example.local https: true + +gitlab-runner: + enabled: false diff --git a/charts/gitlab/charts/shared-secrets/Chart.yaml b/charts/shared-secrets/Chart.yaml similarity index 100% rename from charts/gitlab/charts/shared-secrets/Chart.yaml rename to charts/shared-secrets/Chart.yaml diff --git a/charts/gitlab/charts/shared-secrets/templates/_generate_secrets.sh b/charts/shared-secrets/templates/_generate_secrets.sh similarity index 100% rename from charts/gitlab/charts/shared-secrets/templates/_generate_secrets.sh rename to charts/shared-secrets/templates/_generate_secrets.sh diff --git a/charts/gitlab/charts/shared-secrets/templates/_helpers.tpl b/charts/shared-secrets/templates/_helpers.tpl similarity index 100% rename from charts/gitlab/charts/shared-secrets/templates/_helpers.tpl rename to charts/shared-secrets/templates/_helpers.tpl diff --git a/charts/gitlab/charts/shared-secrets/templates/configmap.yaml b/charts/shared-secrets/templates/configmap.yaml similarity index 100% rename from charts/gitlab/charts/shared-secrets/templates/configmap.yaml rename to charts/shared-secrets/templates/configmap.yaml diff --git a/charts/gitlab/charts/shared-secrets/templates/job.yaml b/charts/shared-secrets/templates/job.yaml similarity index 100% rename from charts/gitlab/charts/shared-secrets/templates/job.yaml rename to charts/shared-secrets/templates/job.yaml diff --git a/charts/gitlab/charts/shared-secrets/templates/rbac-config.yaml b/charts/shared-secrets/templates/rbac-config.yaml similarity index 100% rename from charts/gitlab/charts/shared-secrets/templates/rbac-config.yaml rename to charts/shared-secrets/templates/rbac-config.yaml diff --git a/charts/gitlab/charts/shared-secrets/values.yaml b/charts/shared-secrets/values.yaml similarity index 100% rename from charts/gitlab/charts/shared-secrets/values.yaml rename to charts/shared-secrets/values.yaml diff --git a/doc/installation/command-line-options.md b/doc/installation/command-line-options.md index aa0af8a19097443e8683c552e00c4e19e26ae9cd..3d8668fbbb3e049cf6107682feb749e3a583b100 100644 --- a/doc/installation/command-line-options.md +++ b/doc/installation/command-line-options.md @@ -19,7 +19,7 @@ Tables below contain all the possible charts configurations that can be supplied | --- | --- | --- | | global.hosts.https | Serve over https | true | | global.ingress.configureCertmanager | Configure cert-manager to get certificates from Let's Encrypt | true | -| gitlab.certmanager-issuer.email | Email for Let's Encrypt account | false | +| certmanager-issuer.email | Email for Let's Encrypt account | false | | global.ingress.tls.secretName | Existing `Secret` containing wildcard TLS certificate and key | _none_ | | gitlab.unicorn.ingress.tls.secretName | Existing `Secret` containing TLS certificate and key for gitlab | {Release.Name}-gitlab-tls | | minio.ingress.tls.secretName | Existing `Secret` containing TLS certificate and key for minio | {Release.Name}-minio-tls | diff --git a/doc/installation/deployment.md b/doc/installation/deployment.md index d86202194ff07d5db57d0783eb8f3bfc49045b20..7b95cfa6fef64005c31c81deb5fc4ebc74d29cdb 100644 --- a/doc/installation/deployment.md +++ b/doc/installation/deployment.md @@ -73,7 +73,7 @@ For the default configuration, you must specify an email address to register you certificates. *Include these options in your helm install command:* ``` ---set gitlab.certmanager-issuer.email=me@example.local +--set certmanager-issuer.email=me@example.local ``` ### Postgresql @@ -138,7 +138,7 @@ helm upgrade --install gitlab . \ --set global.hosts.domain=example.local \ --set global.hosts.externalIP=10.10.10.10 \ --set gitlab.migrations.initialRootPassword="example-password" \ - --set gitlab.certmanager-issuer.email=me@example.local + --set certmanager-issuer.email=me@example.local ``` ## Monitoring the Deployment diff --git a/doc/installation/tls.md b/doc/installation/tls.md index 2f2e881282f659310085777392bf271a6c790fa0..39f8220eeaa95d5374c9cafbb17f8fdf4c22657c 100644 --- a/doc/installation/tls.md +++ b/doc/installation/tls.md @@ -22,7 +22,7 @@ helm dep update ``` helm install ... - --set gitlab.certmanager-issuer.email=you@example.local + --set certmanager-issuer.email=you@example.local ``` Intalling certmanager is controlled by the `certmanager.install` setting, and using it in the charts is controlled by the diff --git a/values.yaml b/values.yaml index 2e6160b8d7acc3e501618db26bf5b8ffaa49bc10..b89bef07c2f7a2efbe3cd4a469ed94b225ab9cdd 100644 --- a/values.yaml +++ b/values.yaml @@ -69,7 +69,9 @@ redis-ha: # redis: # enabled: false # -# gitlab: +gitlab: + gitlab-runner: + enabled: true # omnibus: # enabled: false # migrations: