use env instead of envFrom in exporter deployment (#59)

castai · Sep 5, 2023 · c07d4aa · c07d4aa
1 parent f2f74d2
commit c07d4aa
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/charts/egressd/templates/exporter/deployment.yaml b/charts/egressd/templates/exporter/deployment.yaml
@@ -53,16 +53,20 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        envFrom:
-          - secretRef:
+        {{- if or .Values.castai.apiKey .Values.castai.apiKeySecretRef }}
+        - name: API_KEY
+          valueFrom:
+            secretKeyRef:
               {{- if .Values.castai.apiKey }}
-                {{- if ne .Values.castai.apiKeySecretRef "" }}
-                {{- fail "apiKey and apiKeySecretRef are mutually exclusive" }}
-                {{- end }}
               name: "{{- include "egressd.fullname" . }}"
-              {{- else }}
-              name: {{ required "apiKey or apiKeySecretRef must be provided" .Values.castai.apiKeySecretRef }}
+              key: API_KEY
+              {{- else if  .Values.castai.apiKeySecretRef }}
+              name: {{ .Values.castai.apiKeySecretRef }}
+              key: API_KEY
               {{- end }}
+        {{- else }}
+          {{- fail "apiKey or apiKeySecretRef must be provided" }}
+        {{- end }}
         ports:
         - name: http-server
           containerPort: {{ .Values.exporter.httpListenPort }}