fix(s3): fix env var if present

getlago · Jan 24, 2024 · 16f4c4b · 16f4c4b
1 parent 1075a65
commit 16f4c4b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/templates/api-deployment.yaml b/templates/api-deployment.yaml
@@ -99,16 +99,20 @@ spec:
             {{ if .Values.global.s3.enabled }}
             - name: LAGO_USE_AWS_S3
               value: "true"
+            {{ if .Values.global.s3.accessKeyId }}
             - name: LAGO_AWS_S3_ACCESS_KEY_ID
               valueFrom:
                 secretKeyRef:
                   name: {{ .Release.Name }}-secrets
                   key: awsS3AccessKeyId
+            {{ end }}
+            {{ if .Values.global.s3.secretAccessKey }}
             - name: LAGO_AWS_S3_SECRET_ACCESS_KEY
               valueFrom:
                 secretKeyRef:
                   name: {{ .Release.Name }}-secrets
                   key: awsS3SecretAccessKey
+            {{ end }}
             - name: LAGO_AWS_S3_BUCKET
               value: {{ .Values.global.s3.aws.bucket | quote }}
             - name: LAGO_AWS_S3_REGION

diff --git a/templates/worker-deployment.yaml b/templates/worker-deployment.yaml
@@ -89,16 +89,20 @@ spec:
             {{ if .Values.global.s3.enabled }}
             - name: LAGO_USE_AWS_S3
               value: "true"
-            - name: LAGO_AWS_S3_ACCESS_KEY_ID
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Release.Name }}-secrets
-                  key: awsS3AccessKeyId
+            {{ if .Values.global.s3.accessKeyId }}
+              - name: LAGO_AWS_S3_ACCESS_KEY_ID
+                valueFrom:
+                  secretKeyRef:
+                    name: {{ .Release.Name }}-secrets
+                    key: awsS3AccessKeyI
+            {{ end }}
+            {{ if .Values.global.s3.secretAccessKey }}
             - name: LAGO_AWS_S3_SECRET_ACCESS_KEY
               valueFrom:
                 secretKeyRef:
                   name: {{ .Release.Name }}-secrets
                   key: awsS3SecretAccessKey
+            {{ end }}
             - name: LAGO_AWS_S3_BUCKET
               value: {{ .Values.global.s3.aws.bucket | quote }}
             - name: LAGO_AWS_S3_REGION