fix: postgres backup can use r2 too

trieb-work · Nov 16, 2023 · db17ee6 · db17ee6
1 parent 1fdf3ee
commit db17ee6
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 7 deletions.
diff --git a/charts/strapi/Chart.yaml b/charts/strapi/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.57
+version: 0.1.58
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/strapi/templates/postgres_backup.yaml b/charts/strapi/templates/postgres_backup.yaml
@@ -26,6 +26,24 @@ spec:
                 value: {{ .Values.postgresBackup.historyLimit | quote }}
               - name: DATABASES
                 value: {{ .Values.postgresql.auth.database | quote }}     
+
+            {{- if .Values.r2.enabled }}
+              - name: S3_KEY
+                valueFrom:
+                  secretKeyRef:
+                    key: AWS_ACCESS_KEY_ID
+                    name: {{ include "strapi.fullname" . }}
+              - name: S3_ENDPOINT
+                valueFrom:
+                  secretKeyRef:
+                    key: CF_ENDPOINT
+                    name: {{ include "strapi.fullname" . }}
+              - name: AWS_SECRET_ACCESS_KEY
+                valueFrom:
+                  secretKeyRef:
+                    key: CF_SECRET_ACCESS_KEY
+                    name: {{ include "strapi.fullname" . }}
+              {{- else }}
               - name: S3_KEY
                 valueFrom:
                   secretKeyRef:
@@ -41,6 +59,7 @@ spec:
                   secretKeyRef:
                     key: AWS_SECRET_ACCESS_KEY
                     name: {{ include "strapi.fullname" . }}
+              {{- end }}
               - name: S3_BUCKET_NAME
                 value: {{ .Values.postgresBackup.bucketName | quote }}      
               - name: POSTGRES_DB_PASSWORD
@@ -64,8 +83,7 @@ spec:
               allowPrivilegeEscalation: false
               privileged: false
               readOnlyRootFilesystem: false
-          restartPolicy: Never
-          terminationGracePeriodSeconds: 30
-  schedule: {{ .Values.postgresBackup.schedule }}
-
-{{- end -}}
+            restartPolicy: Never
+            terminationGracePeriodSeconds: 30
+            schedule: {{ .Values.postgresBackup.schedule }}
+            {{- end -}}
diff --git a/charts/strapi/values.yaml b/charts/strapi/values.yaml
@@ -38,6 +38,7 @@ postgresql:
     # set the master PW here
     postgresPassword: 
     username: strapi
+    # set a password here!
     password: 
     database: strapi
   tls:
@@ -49,7 +50,8 @@ postgresql:
     tag: "13.5.0"
   primary:
     persistence:
-      enabled: false  
+      enabled: false
+      size:
 
 serviceAccount:
   # Specifies whether a service account should be created