fix: errors in otomi-db chart (#1627)

linode · Jun 12, 2024 · 8c8bbda · 8c8bbda
1 parent 34a6608
commit 8c8bbda
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 18 deletions.
diff --git a/charts/otomi-db/templates/cluster.yaml b/charts/otomi-db/templates/cluster.yaml
@@ -70,16 +70,16 @@ spec:
   {{- if eq .Values.backup.type "s3" }}
   backup:
     retentionPolicy: {{ .Values.backup.retentionPolicy }}
-      barmanObjectStore:
-        destinationPath: s3://{{ .Values.backup.s3.bucket }}
-        endpointURL: {{ .Values.backup.endpointURL }}
-        s3Credentials:
-          accessKeyId:
-            name: s3-creds
-            key: S3_STORAGE_ACCOUNT
-          secretAccessKey:
-            name: s3-creds
-            key: S3_STORAGE_KEY
+    barmanObjectStore:
+      destinationPath: s3://{{ .Values.backup.s3.bucket }}
+      endpointURL: {{ .Values.backup.s3.endpointURL }}
+      s3Credentials:
+        accessKeyId:
+          name: s3-creds
+          key: S3_STORAGE_ACCOUNT
+        secretAccessKey:
+          name: s3-creds
+          key: S3_STORAGE_KEY
   {{- end }}
   {{- if eq .Values.backup.type "gcs" }}
   backup:

diff --git a/tests/fixtures/env/apps/cnpg.yaml b/tests/fixtures/env/apps/cnpg.yaml
@@ -3,12 +3,13 @@ apps:
         resources:
             limits:
                 cpu: 1000m
-                memory: 1000Mi
+                memory: 512Mi
             requests:
                 cpu: 100m
                 memory: 200Mi
         storage:
-            azure:
-                accountName: name
-                containerName: database
-            type: azure
+            s3:
+                accessKeyId: 2C2F1864-3ADB-4D06-8F77-C82CAB6F0415
+                bucket: databases/
+                s3Url: https://nl-ams-1.linodeobjects.com
+            type: s3
diff --git a/tests/fixtures/env/apps/secrets.cnpg.yaml b/tests/fixtures/env/apps/secrets.cnpg.yaml
@@ -1,5 +1,5 @@
 apps:
     cnpg:
         storage:
-            azure:
-                accountKey: anAccountKey
+            s3:
+                secretAccessKey: superdupersecretacceskey
diff --git a/tests/fixtures/env/settings.yaml b/tests/fixtures/env/settings.yaml
@@ -76,7 +76,7 @@ otomi:
 platformBackups:
     database:
         harbor:
-            enabled: false
+            enabled: true
             retentionPolicy: 7d
             schedule: 0 0 0 * * *
     persistentVolumes: