Merge pull request #77 from heka-ai/main

Fix api-deployment template, references to s3.aws from values and add minio tar.gz file
getlago · Oct 11, 2024 · 5af7bbd · 5af7bbd
2 parents b185608 + e6e0a2f
commit 5af7bbd
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 22 deletions.
diff --git a/charts/minio-5.2.0.tgz b/charts/minio-5.2.0.tgz
diff --git a/requirements.lock b/requirements.lock
diff --git a/templates/api-deployment.yaml b/templates/api-deployment.yaml
@@ -202,7 +202,7 @@ spec:
                       {{ end }}
             - name: LAGO_AWS_S3_REGION
               value: {{ if .Values.global.s3.enabled }}
-                        {{ .Values.global.s3.aws.region | quote }}
+                        {{ .Values.global.s3.region | quote }}
                       {{ else if .Values.minio.enabled }}
                         {{ default "us-east-1" .Values.minio.region | quote }}
                       {{ end }}
@@ -251,13 +251,13 @@ spec:
           resources:
             {{- toYaml . | nindent 12}}
           {{- end }}
-          {{- if and (not .Values.global.s3.enabled) (not .Values.minio.enabled) -}}
+          {{- if and (not .Values.global.s3.enabled) (not .Values.minio.enabled) }}
           volumeMounts:
             - mountPath: /app/storage
               name: {{ .Release.Name }}-storage-data
           {{ end }}
       restartPolicy: Always
-      {{- if and (not .Values.global.s3.enabled) (not .Values.minio.enabled) -}}
+      {{- if and (not .Values.global.s3.enabled) (not .Values.minio.enabled) }}
       volumes:
         - name: {{ .Release.Name }}-storage-data
           persistentVolumeClaim:

diff --git a/templates/secrets.yaml b/templates/secrets.yaml
@@ -53,11 +53,11 @@ data:
 
   {{- if not .Values.global.existingSecret }}
   {{ if .Values.global.s3.enabled }}
-  {{ if .Values.global.s3.aws.accessKeyId }}
-  awsS3AccessKeyId: {{ .Values.global.s3.aws.accessKeyId | b64enc }}
+  {{ if .Values.global.s3.accessKeyId }}
+  awsS3AccessKeyId: {{ .Values.global.s3.accessKeyId | b64enc }}
   {{ end }}
-  {{ if .Values.global.s3.aws.secretAccessKey }}
-  awsS3SecretAccessKey: {{ .Values.global.s3.aws.secretAccessKey | b64enc }}
+  {{ if .Values.global.s3.secretAccessKey }}
+  awsS3SecretAccessKey: {{ .Values.global.s3.secretAccessKey | b64enc }}
   {{ end }}
   {{ if eq .Values.global.s3.provider "minio" }}
   {{ if .Values.global.s3.minio.accessKeyId }}

diff --git a/templates/worker-deployment.yaml b/templates/worker-deployment.yaml
@@ -119,28 +119,28 @@ spec:
             {{ if .Values.global.s3.enabled }}
             - name: LAGO_USE_AWS_S3
               value: "true"
-            {{ if .Values.global.s3.aws.endpoint }}
+            {{ if .Values.global.s3.endpoint }}
             - name: LAGO_AWS_S3_ENDPOINT
-              value: {{ .Values.global.s3.aws.endpoint | quote }}
+              value: {{ .Values.global.s3.endpoint | quote }}
             {{ end }}
-            {{ if or .Values.global.s3.aws.accessKeyId .Values.global.existingSecret }}
+            {{ if or .Values.global.s3.accessKeyId .Values.global.existingSecret }}
             - name: LAGO_AWS_S3_ACCESS_KEY_ID
               valueFrom:
                 secretKeyRef:
                   name: {{ include "secret-path" . }}
                   key: awsS3AccessKeyId
             {{ end }}
-            {{ if or .Values.global.s3.aws.secretAccessKey .Values.global.existingSecret }}
+            {{ if or .Values.global.s3.secretAccessKey .Values.global.existingSecret }}
             - name: LAGO_AWS_S3_SECRET_ACCESS_KEY
               valueFrom:
                 secretKeyRef:
                   name: {{ include "secret-path" . }}
                   key: awsS3SecretAccessKey
             {{ end }}
             - name: LAGO_AWS_S3_BUCKET
-              value: {{ .Values.global.s3.aws.bucket | quote }}
+              value: {{ .Values.global.s3.bucket | quote }}
             - name: LAGO_AWS_S3_REGION
-              value: {{ .Values.global.s3.aws.region | quote }}
+              value: {{ .Values.global.s3.region | quote }}
             {{ end }}
             {{ if .Values.global.smtp.enabled }}
             - name: LAGO_FROM_EMAIL