Reformat and s3 values

liquid-code-chart/templates/Deployments/backend-deployment.yaml

@@ -15,30 +15,36 @@ spec:
         app: {{ .Release.Name }}-backend
     spec:
       containers:
-      - name: {{ .Release.Name }}-backend
+        - name: {{ .Release.Name }}-backend
-        image: ghcr.io/nullptroma/liquid-backend:latest
+          image: ghcr.io/nullptroma/liquid-backend:latest
-        imagePullPolicy: Always
+          imagePullPolicy: Always
-        ports:
+          ports:
-          - containerPort: 8080
+            - containerPort: 8080
-        env:
+          env:
-        - name: S3_ACCESS_KEY
+            - name: S3_ENDPOINT
-          valueFrom:
+              value: {{ required "s3 endpoint!" .Values.s3.endpointUrl | quote }}
-            secretKeyRef:
+            - name: S3_PRIVATE_BUCKET
-              name: {{ required "secretname!" .Values.s3.secretName | quote }}
+              value: {{ required "privateBucket!" .Values.s3.privateBucket | quote }}
-              key: {{ required "acces-key-key!" .Values.s3.accessKeyKey | quote }}
+            - name: S3_PUBLIC_BUCKET
-        - name: S3_SECRET_KEY
+              value: {{ required "publicBucket!" .Values.s3.publicBucket | quote }}
-          valueFrom:
+            - name: S3_ACCESS_KEY
-            secretKeyRef:
+              valueFrom:
-              name: {{ .Values.s3.secretName | quote }}
+                secretKeyRef:
-              key: {{ required "secret-key-key!" .Values.s3.secretKeyKey | quote }}
+                  name: {{ required "secretname!" .Values.s3.secretName | quote }}
-        - name: PG_URI
+                  key: {{ required "acces-key-key!" .Values.s3.accessKeyKey | quote }}
-          valueFrom:
+            - name: S3_SECRET_KEY
-            secretKeyRef:
+              valueFrom:
-              name: {{ required "Cluster creds secret required!" .Values.database.secretName }}
+                secretKeyRef:
-              key: uri
+                  name: {{ .Values.s3.secretName | quote }}
-        envFrom:
+                  key: {{ required "secret-key-key!" .Values.s3.secretKeyKey | quote }}
-          - secretRef:
+            - name: PG_URI
-              name: {{ required "" .Values.jwt.secretName }}
+              valueFrom:
+                secretKeyRef:
+                  name: {{ required "Cluster creds secret required!" .Values.database.secretName }}
+                  key: uri
+          envFrom:
+            - secretRef:
+                name: {{ required "" .Values.jwt.secretName }}
 
       imagePullSecrets:
         - name: github-registry

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