make s3 storage configuration logic more readable

butonic · butonic · commit 95d78817c533 · 2025-06-30T11:51:21.000+02:00
Signed-off-by: Jörn Friedrich Dreyer &lt;jfd@butonic.de&gt;
diff --git a/charts/opencloud/templates/opencloud/deployment.yaml b/charts/opencloud/templates/opencloud/deployment.yaml
@@ -287,53 +287,42 @@ spec:
               value: "decomposed"
             
             # S3 storage configuration
+            {{- /* Precompute S3 settings */}}
+            {{- if .Values.opencloud.storage.s3.external.enabled }}
+              {{- $s3Endpoint := .Values.opencloud.storage.s3.external.endpoint | quote }}
+              {{- $s3Region := .Values.opencloud.storage.s3.external.region | quote }}
+              {{- $s3Bucket := .Values.opencloud.storage.s3.external.bucket | quote }}
+              {{- $s3CreateBucket := (.Values.opencloud.storage.s3.external.createBucket | default true) | quote }}
+              {{- $s3SecretName := .Values.opencloud.storage.s3.external.existingSecret | default (printf "%s-s3" (include "opencloud.opencloud.fullname" .)) }}
+              {{- $accessKey := "accessKey" }}
+              {{- $secretKey := "secretKey" }}
+            {{- else }}
+              {{- $s3Endpoint := printf "\"http://%s:9000\"" (include "opencloud.minio.fullname" .) }}
+              {{- $s3Region := .Values.opencloud.storage.s3.internal.region | default "default" | quote }}
+              {{- $s3Bucket := .Values.opencloud.storage.s3.internal.bucketName | quote }}
+              {{- $s3CreateBucket := "true" }}
+              {{- $s3SecretName := .Values.opencloud.storage.s3.internal.existingSecret | default (include "opencloud.minio.fullname" .) }}
+              {{- $accessKey := "rootUser" }}
+              {{- $secretKey := "rootPassword" }}
+            {{- end }}
             - name: STORAGE_USERS_DECOMPOSEDS3_ENDPOINT
-              value: {{ if .Values.opencloud.storage.s3.external.enabled }}{{ .Values.opencloud.storage.s3.external.endpoint | quote }}{{ else }}"http://{{ include "opencloud.minio.fullname" . }}:9000"{{ end }}
+              value: {{ $s3Endpoint }}
             - name: STORAGE_USERS_DECOMPOSEDS3_REGION
-              value: {{ if .Values.opencloud.storage.s3.external.enabled }}{{ .Values.opencloud.storage.s3.external.region | quote }}{{ else }}{{ .Values.opencloud.storage.s3.internal.region | default "default" | quote }}{{ end }}
+              value: {{ $s3Region }}
+            - name: STORAGE_USERS_DECOMPOSEDS3_BUCKET
+              value: {{ $s3Bucket }}
+            - name: STORAGE_USERS_DECOMPOSEDS3_CREATE_BUCKET
+              value: {{ $s3CreateBucket }}
             - name: STORAGE_USERS_DECOMPOSEDS3_ACCESS_KEY
               valueFrom:
-                {{- if .Values.opencloud.storage.s3.external.enabled }}
                 secretKeyRef:
-                  name: {{- if .Values.opencloud.storage.s3.external.existingSecret }}
-                          {{ .Values.opencloud.storage.s3.external.existingSecret }}
-                        {{- else }}
-                          {{ include "opencloud.opencloud.fullname" . }}-s3
-                        {{- end }}
-                  key: accessKey
-                {{- else }}
-                secretKeyRef:
-                  name: {{- if .Values.opencloud.storage.s3.internal.existingSecret }}
-                          {{ .Values.opencloud.storage.s3.internal.existingSecret }}
-                        {{- else }}
-                          {{ include "opencloud.minio.fullname" . }}
-                        {{- end }}
-                  key: rootUser
-                {{- end }}
-
+                  name: {{ $s3SecretName }}
+                  key: {{ $accessKey }}
             - name: STORAGE_USERS_DECOMPOSEDS3_SECRET_KEY
               valueFrom:
-                {{- if .Values.opencloud.storage.s3.external.enabled }}
-                secretKeyRef:
-                  name: {{- if .Values.opencloud.storage.s3.external.existingSecret }}
-                          {{ .Values.opencloud.storage.s3.external.existingSecret }}
-                        {{- else }}
-                          {{ include "opencloud.opencloud.fullname" . }}-s3
-                        {{- end }}
-                  key: secretKey
-                {{- else }}
                 secretKeyRef:
-                  name: {{- if .Values.opencloud.storage.s3.internal.existingSecret }}
-                          {{- .Values.opencloud.storage.s3.internal.existingSecret }}
-                        {{- else}}
-                          {{ include "opencloud.minio.fullname" . }}
-                        {{- end }}
-                  key: rootPassword
-                {{- end }}
-            - name: STORAGE_USERS_DECOMPOSEDS3_BUCKET
-              value: {{ if .Values.opencloud.storage.s3.external.enabled }}{{ .Values.opencloud.storage.s3.external.bucket | quote }}{{ else }}{{ .Values.opencloud.storage.s3.internal.bucketName | quote }}{{ end }}
-            - name: STORAGE_USERS_DECOMPOSEDS3_CREATE_BUCKET
-              value: {{ if .Values.opencloud.storage.s3.external.enabled }}{{ .Values.opencloud.storage.s3.external.createBucket | default true | quote }}{{ else }}"true"{{ end }}
+                  name: {{ $s3SecretName }}
+                  key: {{ $secretKey }}
             {{- with .Values.opencloud.env }}
             {{- toYaml . | nindent 12 }}
             {{- end }}
