From 9d998e4138ff4682a800b54ded694414df45f702 Mon Sep 17 00:00:00 2001
From: Gabriel Creti <me@kaboo.boo>
Date: Fri, 11 Oct 2024 11:24:46 +0200
Subject: [PATCH 1/2] Remove requirements.lock, fix api-deployment

---
 requirements.lock             | 9 ---------
 templates/api-deployment.yaml | 4 ++--
 2 files changed, 2 insertions(+), 11 deletions(-)
 delete mode 100644 requirements.lock

diff --git a/requirements.lock b/requirements.lock
deleted file mode 100644
index 76c0b42..0000000
--- a/requirements.lock
+++ /dev/null
@@ -1,9 +0,0 @@
-dependencies:
-- name: postgresql
-  repository: https://charts.bitnami.com/bitnami
-  version: 13.2.2
-- name: redis
-  repository: https://charts.bitnami.com/bitnami
-  version: 18.2.1
-digest: sha256:d01903357743f9f6b319b84268e6821e941642672d5d85ea61b74986ad7bed1a
-generated: "2023-11-07T16:13:00.552026758+01:00"
diff --git a/templates/api-deployment.yaml b/templates/api-deployment.yaml
index e0ec38d..8414b5d 100644
--- a/templates/api-deployment.yaml
+++ b/templates/api-deployment.yaml
@@ -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:

From f5967c5854cdf1d43b973e60c6613ab8be72cca6 Mon Sep 17 00:00:00 2001
From: Gabriel Creti <me@kaboo.boo>
Date: Fri, 11 Oct 2024 11:30:02 +0200
Subject: [PATCH 2/2] Remove aws.s3 which was removed in PR !66

---
 templates/api-deployment.yaml    |  2 +-
 templates/secrets.yaml           |  8 ++++----
 templates/worker-deployment.yaml | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/templates/api-deployment.yaml b/templates/api-deployment.yaml
index 8414b5d..958c8b6 100644
--- 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 }}
diff --git a/templates/secrets.yaml b/templates/secrets.yaml
index 79803e2..5483f59 100644
--- 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
index 5c97e76..d7d401b 100644
--- a/templates/worker-deployment.yaml
+++ b/templates/worker-deployment.yaml
@@ -119,18 +119,18 @@ 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:
@@ -138,9 +138,9 @@ spec:
                   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