Merge pull request #118 from codecademy-engineering/datadog_env_position

Move Datadog environment variable position
codecademy-engineering · May 24, 2024 · 6a33da7 · 6a33da7
2 parents 251cd8b + 6d4b4d7
commit 6a33da7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/charts/service/Chart.yaml b/charts/service/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: service
 description: A generic k8s service chart
 type: application
-version: 1.8.15
+version: 1.8.16
 maintainers:
   - email: [email protected]
     name: devops
diff --git a/charts/service/templates/deployment.yaml b/charts/service/templates/deployment.yaml
@@ -120,13 +120,6 @@ spec:
                 name: {{ .Values.envFromSecret }}
           {{- end }}
           env:
-          {{- range $key, $value := .Values.envKeyValue }}
-            - name: {{ $key }}
-              value: "{{ $value }}"
-          {{- end }}
-          {{- with .Values.env }}
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
           {{- with .Values.datadog }}
             - name: DD_AGENT_HOST
               valueFrom:
@@ -145,6 +138,13 @@ spec:
                 fieldRef:
                   fieldPath: metadata.labels['tags.datadoghq.com/version']
           {{- end }}
+          {{- range $key, $value := .Values.envKeyValue }}
+            - name: {{ $key }}
+              value: "{{ $value }}"
+          {{- end }}
+          {{- with .Values.env }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           {{- if .Values.containerPort }}
           ports:
             - name: http