From fcea145ed512afaedd2bc74dc68a4843e7b238eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D1=8B=D1=82=D0=BA=D0=BE=D0=B2=20=D0=A0=D0=BE=D0=BC?=
 =?UTF-8?q?=D0=B0=D0=BD?= <roman.pytkov@mail.ru>
Date: Tue, 30 Apr 2024 21:44:37 +0300
Subject: [PATCH] Reformat and s3 values

---
 .../Deployments/backend-deployment.yaml       | 54 ++++++++++---------
 liquid-code-chart/values.yaml                 |  4 +-
 2 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/liquid-code-chart/templates/Deployments/backend-deployment.yaml b/liquid-code-chart/templates/Deployments/backend-deployment.yaml
index a4423dc..f7eb010 100644
--- a/liquid-code-chart/templates/Deployments/backend-deployment.yaml
+++ b/liquid-code-chart/templates/Deployments/backend-deployment.yaml
@@ -15,30 +15,36 @@ spec:
         app: {{ .Release.Name }}-backend
     spec:
       containers:
-      - name: {{ .Release.Name }}-backend
-        image: ghcr.io/nullptroma/liquid-backend:latest
-        imagePullPolicy: Always
-        ports:
-          - containerPort: 8080
-        env:
-        - name: S3_ACCESS_KEY
-          valueFrom:
-            secretKeyRef:
-              name: {{ required "secretname!" .Values.s3.secretName | quote }}
-              key: {{ required "acces-key-key!" .Values.s3.accessKeyKey | quote }}
-        - name: S3_SECRET_KEY
-          valueFrom:
-            secretKeyRef:
-              name: {{ .Values.s3.secretName | quote }}
-              key: {{ required "secret-key-key!" .Values.s3.secretKeyKey | quote }}
-        - name: PG_URI
-          valueFrom:
-            secretKeyRef:
-              name: {{ required "Cluster creds secret required!" .Values.database.secretName }}
-              key: uri
-        envFrom:
-          - secretRef:
-              name: {{ required "" .Values.jwt.secretName }}
+        - name: {{ .Release.Name }}-backend
+          image: ghcr.io/nullptroma/liquid-backend:latest
+          imagePullPolicy: Always
+          ports:
+            - containerPort: 8080
+          env:
+            - name: S3_ENDPOINT
+              value: {{ required "s3 endpoint!" .Values.s3.endpointUrl | quote }}
+            - name: S3_PRIVATE_BUCKET
+              value: {{ required "privateBucket!" .Values.s3.privateBucket | quote }}
+            - name: S3_PUBLIC_BUCKET
+              value: {{ required "publicBucket!" .Values.s3.publicBucket | quote }}
+            - name: S3_ACCESS_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: {{ required "secretname!" .Values.s3.secretName | quote }}
+                  key: {{ required "acces-key-key!" .Values.s3.accessKeyKey | quote }}
+            - name: S3_SECRET_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.s3.secretName | quote }}
+                  key: {{ required "secret-key-key!" .Values.s3.secretKeyKey | quote }}
+            - name: PG_URI
+              valueFrom:
+                secretKeyRef:
+                  name: {{ required "Cluster creds secret required!" .Values.database.secretName }}
+                  key: uri
+          envFrom:
+            - secretRef:
+                name: {{ required "" .Values.jwt.secretName }}
 
       imagePullSecrets:
         - name: github-registry
diff --git a/liquid-code-chart/values.yaml b/liquid-code-chart/values.yaml
index b6b7a30..32992d1 100644
--- a/liquid-code-chart/values.yaml
+++ b/liquid-code-chart/values.yaml
@@ -3,8 +3,10 @@ s3:
   secretName: s3-credentials
   accessKeyKey: ACCESS_KEY_ID
   secretKeyKey: ACCESS_SECRET_KEY
+  privateBucket: liquid-code
+  publicBucket: liquid-code-public
 jwt:
-    secretName: jwt-secrets
+  secretName: jwt-secrets
 database:
   secretName: liquid-db-app
   migrateDb: true