diff --git a/assets/auto-deploy-app/templates/deployment.yaml b/assets/auto-deploy-app/templates/deployment.yaml index 5dfdd235379547859a1162e4839a0a0ea908b7d5..d6a7e69ec192c5085fcf7970ac38f9788475970a 100644 --- a/assets/auto-deploy-app/templates/deployment.yaml +++ b/assets/auto-deploy-app/templates/deployment.yaml @@ -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: diff --git a/assets/auto-deploy-app/test/templates/deployment_test.go b/assets/auto-deploy-app/test/templates/deployment_test.go index 11058a70793f0aa305454c8ef5bff5c718197a70..98c21254fd441a53ed73f10d77f2285119cb7097 100644 --- a/assets/auto-deploy-app/test/templates/deployment_test.go +++ b/assets/auto-deploy-app/test/templates/deployment_test.go @@ -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) + }) + } +} diff --git a/assets/auto-deploy-app/values.yaml b/assets/auto-deploy-app/values.yaml index 2590a1ff08fe8ba61358d53bf8a0a3714f50a866..4d03cdd0125737669d352378311e8d023afca265 100644 --- a/assets/auto-deploy-app/values.yaml +++ b/assets/auto-deploy-app/values.yaml @@ -213,6 +213,10 @@ extraEnvFrom: [] # - secretRef: # name: {{ .Values.application.secretName }} +extraEnv: [] +# - name: ENV_VAR +# value: ENV_VAL + workers: {} # worker: # replicaCount: 1