Commit bc7f4f08 authored by Alex Conrey's avatar Alex Conrey
Browse files

feat: add support for extraEnv value in chart

parent 98f755e3

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

+3 −0
Original line number Diff line number Diff line
@@ -117,6 +117,9 @@ spec: 
{{- end }}

        {{- end }}

        env:

{{- if .Values.extraEnv }}

{{ toYaml .Values.extraEnv | indent 8 }}

{{- end }}

{{- if .Values.postgresql.managed }}

        - name: POSTGRES_USER

          valueFrom:

assets/auto-deploy-app/test/templates/deployment_test.go

+41 −0
Original line number Diff line number Diff line
@@ -1190,3 +1190,44 @@ func TestDeploymentTemplateWithExtraEnvFrom(t *testing.T) { 
		})

	}

}



func TestDeploymentTemplateWithExtraEnv(t *testing.T) {

	releaseName := "deployment-with-extra-env-test"

	templates := []string{"templates/deployment.yaml"}



	tcs := []struct {

		name        string

		values      map[string]string

		expectedEnv coreV1.EnvVar

	}{

		{

			name: "with extra env secret test",

			values: map[string]string{

				"extraEnv[0].name":  "env-name-test",

				"extraEnv[0].value": "test-value",

			},

			expectedEnv: coreV1.EnvVar{

				Name:  "env-name-test",

				Value: "test-value",

			},

		},

	}



	for _, tc := range tcs {

		t.Run(tc.name, func(t *testing.T) {

			opts := &helm.Options{

				SetValues: tc.values,

			}

			output, err := helm.RenderTemplateE(t, opts, helmChartPath, releaseName, templates)



			if err != nil {

				t.Error(err)

				return

			}



			deployment := new(appsV1.Deployment)

			helm.UnmarshalK8SYaml(t, output, deployment)

			require.Contains(t, deployment.Spec.Template.Spec.Containers[0].Env, tc.expectedEnv)

		})

	}

}

assets/auto-deploy-app/values.yaml

+4 −0
Original line number Diff line number Diff line
@@ -213,6 +213,10 @@ extraEnvFrom: [] 
# - secretRef:

#     name: {{ .Values.application.secretName }}



extraEnv: []

# - name:  ENV_VAR

#   value: ENV_VAL



workers: {}

  # worker:

  #   replicaCount: 1