Commit 0fe2e3d3 authored by Shinya Maeda's avatar Shinya Maeda
Browse files

Merge branch 'disable-database-url-injection' into 'master' 

Only set DATABASE_URL env var if helm value exists

See merge request gitlab-org/cluster-integration/auto-deploy-image!256
parents a2fc6b49 4f910fad

assets/auto-deploy-app/Chart.yaml

+1 −1
Original line number Diff line number Diff line 
apiVersion: v1

description: GitLab's Auto-deploy Helm Chart

name: auto-deploy-app

version: 2.23.0

version: 2.24.0

icon: https://gitlab.com/gitlab-com/gitlab-artwork/raw/master/logo/logo-square.png

assets/auto-deploy-app/README.md

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
| application.initializeCommand | If present, this variable will run as shell command within an application Container as a Helm post-install Hook. Intended to run database initialization commands. When set, the Deployment resource will be skipped.| `nil` |

| application.secretName        | Pass in the name of a Secret which the deployment will [load all key-value pairs from the Secret as environment variables](https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/#configure-all-key-value-pairs-in-a-configmap-as-container-environment-variables) in the application container. | `nil` |

| application.secretChecksum    | Pass in the checksum of the secrets referenced by `application.secretName`. | `nil` |

| application.database_url      | If present, sets the `DATABASE_URL` environment variable. If postgres is enabled this will be autogenerated. | `nil` |

| hpa.enabled                   | If true, enables horizontal pod autoscaler. A resource request is also required to be set, such as `resources.requests.cpu: 200m`.| `false` |

| hpa.minReplicas               |             | `1`                                |

| hpa.maxReplicas               |             | `5`                                |

assets/auto-deploy-app/templates/db-initialize-job.yaml

+2 −0
Original line number Diff line number Diff line
@@ -31,8 +31,10 @@ spec: 
            name: {{ .Values.application.secretName }}

        {{- end }}

        env:

{{- if .Values.application.database_url }}

        - name: DATABASE_URL

          value: {{ .Values.application.database_url | quote }}

{{- end }}

        - name: GITLAB_ENVIRONMENT_NAME

          value: {{ .Values.gitlab.envName | quote }}

        - name: GITLAB_ENVIRONMENT_URL

assets/auto-deploy-app/templates/db-migrate-hook.yaml

+2 −0
Original line number Diff line number Diff line
@@ -31,8 +31,10 @@ spec: 
            name: {{ .Values.application.secretName }}

        {{- end }}

        env:

{{- if .Values.application.database_url }}

        - name: DATABASE_URL

          value: {{ .Values.application.database_url | quote }}

{{- end }}

        - name: GITLAB_ENVIRONMENT_NAME

          value: {{ .Values.gitlab.envName | quote }}

        - name: GITLAB_ENVIRONMENT_URL

assets/auto-deploy-app/templates/deployment.yaml

+2 −0
Original line number Diff line number Diff line
@@ -99,8 +99,10 @@ spec: 
              name: app-postgres

              key: privateIP

{{- end }}

{{- if .Values.application.database_url }}

        - name: DATABASE_URL

          value: {{ .Values.application.database_url | quote }}

{{- end }}

        - name: GITLAB_ENVIRONMENT_NAME

          value: {{ .Values.gitlab.envName | quote }}

        - name: GITLAB_ENVIRONMENT_URL