linode · srodenhuis · Jul 18, 2024 · Jul 4, 2024 · Jul 4, 2024 · Jul 5, 2024
diff --git a/chart/otomi/values.schema.json b/chart/otomi/values.schema.json
diff --git a/charts/otomi-db/templates/cluster.yaml b/charts/otomi-db/templates/cluster.yaml
@@ -44,7 +44,7 @@ spec:
   backup:
     retentionPolicy: {{ .Values.backup.retentionPolicy }}
     barmanObjectStore:
-      destinationPath: s3://database
+      destinationPath: {{ .Values.backup.minioLocal.destinationPath }}
       endpointURL: "http://minio.minio.svc.cluster.local:9000"
       s3Credentials:
         accessKeyId:
@@ -54,44 +54,22 @@ spec:
           name: minio-creds
           key: MINIO_SECRET_KEY
   {{- end }}
-  {{- if eq .Values.backup.type "azure" }}
+  {{- if eq .Values.backup.type "linode" }}
   backup:
     retentionPolicy: {{ .Values.backup.retentionPolicy }}
     barmanObjectStore:
-      destinationPath: "https://{{ .Values.backup.azure.accountName }}.blob.core.windows.net/{{ .Values.backup.azure.containerName }}"
-      azureCredentials:
-        storageAccount:
-          name: azure-creds
-          key: AZURE_STORAGE_ACCOUNT
-        storageKey:
-          name: azure-creds
-          key: AZURE_STORAGE_KEY
-  {{- end }}
-  {{- if eq .Values.backup.type "s3" }}
-  backup:
-    retentionPolicy: {{ .Values.backup.retentionPolicy }}
-    barmanObjectStore:
-      destinationPath: s3://{{ .Values.backup.s3.bucket }}
-      endpointURL: {{ .Values.backup.s3.endpointURL }}
+      destinationPath: {{ .Values.backup.linode.destinationPath }}
+      endpointURL: {{ .Values.backup.linode.endpointURL }}
       s3Credentials:
         accessKeyId:
-          name: s3-creds
+          name: linode-creds
           key: S3_STORAGE_ACCOUNT
         secretAccessKey:
-          name: s3-creds
+          name: linode-creds
           key: S3_STORAGE_KEY
   {{- end }}
-  {{- if eq .Values.backup.type "gcs" }}
-  backup:
-    retentionPolicy: {{ .Values.backup.retentionPolicy }}
-    barmanObjectStore:
-      destinationPath: "gs://{{ .Values.backup.gcs.bucket }}"
-      googleCredentials:
-        applicationCredentials:
-          name: gcs-creds
-          key: gcsCredentials
-  {{- end }}
 {{- end }}
+
   {{- with .Values.clusterSpec }}
   {{- toYaml . | nindent 2 }}
   {{- end }}
diff --git a/charts/otomi-db/values.yaml b/charts/otomi-db/values.yaml
@@ -19,7 +19,6 @@ clusterAffinity:
     topologyKey: kubernetes.io/hostname
     podAntiAffinityType: preferred
 
-
 # Example for backups: 
 # clusterBackup:
 #   backup:
@@ -34,8 +33,6 @@ clusterAffinity:
 #           name: minio-creds
 #           key: MINIO_SECRET_KEY
 
-
-
 clusterSpec:
   bootstrap:
     initdb:
@@ -51,11 +48,7 @@ backup:
   backupOwnerReference: none
   retentionPolicy: 7d
   type: minioLocal
-  azure:
-    storageAccount: ""
-    container: ""
-  s3:
-    endpointURL: ""
-    bucket: ""
-  gcs: 
-    bucket: ""
+  minioLocal:
+    destinationPath: ""
+  linode:
+    destinationPath: ""
diff --git a/charts/velero/templates/deployment.yaml b/charts/velero/templates/deployment.yaml
@@ -233,7 +233,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: {{ include "velero.secretName" $ }}
-                  key: {{ default "none" $key }}
+                  key: {{ default "none" $value }}
           {{- end }}
           {{- end }}
           {{- if .Values.lifecycle }}

diff --git a/charts/velero/templates/secret.yaml b/charts/velero/templates/secret.yaml
@@ -18,7 +18,4 @@ data:
 {{- range $key, $value := .Values.credentials.secretContents }}
   {{ $key }}: {{ tpl $value $ | b64enc | quote }}
 {{- end }}
-{{- range $key, $value := .Values.credentials.extraEnvVars }}
-  {{ $key }}: {{ tpl $value $ | b64enc | quote }}
-{{- end }}
 {{- end -}}
diff --git a/helmfile.d/snippets/defaults.yaml b/helmfile.d/snippets/defaults.yaml
@@ -677,10 +677,17 @@ environments:
               requests:
                 cpu: 50m
                 memory: 256Mi
+        obj:
+          provider:
+            type: disabled
         platformBackups:
           database:
             harbor:
               enabled: false
+            gitea:
+              enabled: false
+            keycloak:
+              enabled: false
           persistentVolumes:
             gitea:
               enabled: false
@@ -694,7 +701,9 @@ environments:
               enabled: false
             minio:
               enabled: false
-        cluster: {}
+        cluster:
+          provider: linode
+          name: apl
         dns:
           domainFilters: []
           zoneIdFilters: []

diff --git a/tests/fixtures/env/apps/cnpg.yaml b/tests/fixtures/env/apps/cnpg.yaml
@@ -7,9 +7,3 @@ apps:
             requests:
                 cpu: 100m
                 memory: 200Mi
-        storage:
-            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/harbor.yaml b/tests/fixtures/env/apps/harbor.yaml
@@ -1,12 +1,6 @@
 apps:
     harbor:
         enabled: true
-        persistence:
-            imageChartStorage:
-                gcs:
-                    bucket: otomi-harbor
-                    rootdirectory: /google/demo
-                type: gcs
         core: {}
         jobservice: {}
         registry:

diff --git a/tests/fixtures/env/apps/loki.yaml b/tests/fixtures/env/apps/loki.yaml
@@ -83,10 +83,4 @@ apps:
         retention:
             duration: 24h
             period: 24h
-        storage:
-            s3:
-                bucket: my-bucket
-                region: west-eu
-                useInstanceRole: true
-            type: s3
         v11StartDate: 2021-05-13
diff --git a/tests/fixtures/env/apps/secrets.cnpg.yaml b/tests/fixtures/env/apps/secrets.cnpg.yaml
diff --git a/tests/fixtures/env/apps/secrets.harbor.yaml b/tests/fixtures/env/apps/secrets.harbor.yaml
@@ -1,10 +1,6 @@
 apps:
     harbor:
         adminPassword: harborsomesecretvalue
-        persistence:
-            imageChartStorage:
-                gcs:
-                    encodedkey: somesecretvalue
         secretKey: somesecretvalue
         core:
             secret: vQFMm9Qk0pTUF3MK

diff --git a/tests/fixtures/env/apps/secrets.velero.yaml b/tests/fixtures/env/apps/secrets.velero.yaml
diff --git a/tests/fixtures/env/apps/tempo.yaml b/tests/fixtures/env/apps/tempo.yaml
@@ -1,12 +1,6 @@
 apps:
     tempo:
         enabled: true
-        storage:
-            type: minioLocal
-            # azure:
-            #     accountName: account_name
-            #     containerName: container_name
-            #     accountKey: shshsheyeywywiqwioqw
         autoscaling:
             ingester:
                 enabled: true

diff --git a/tests/fixtures/env/apps/velero.yaml b/tests/fixtures/env/apps/velero.yaml
@@ -3,27 +3,3 @@ apps:
         enabled: true
         restic:
             enabled: false
-        cloud:
-            #     azure:
-            #         resourceGroup: test
-            #         environment: AzurePublicCloud
-            #         subscriptionId: test
-            #         tenantId: test
-            #         aadClientId: bla12344556666658457847476
-            #         aadClientSecret: bla383736363653
-            #     type: azure
-            # storage:
-            #     azureBlob:
-            #         storageAccount: bla
-            #         bucket: velero
-            #         resourceGroup: bla
-            #     type: azureBlob
-            google:
-                project: velero
-                serviceAccount: bla
-            type: google
-        storage:
-            gcs:
-                bucket: velero
-                serviceAccount: bla
-            type: gcs
diff --git a/tests/fixtures/env/cluster.yaml b/tests/fixtures/env/cluster.yaml
@@ -5,5 +5,5 @@ cluster:
     k8sContext: otomi-eks-demo
     name: demo
     owner: redkubes
-    provider: azure
+    provider: linode
     region: eu-central-1
diff --git a/tests/fixtures/env/secrets.settings.yaml b/tests/fixtures/env/secrets.settings.yaml
@@ -24,3 +24,14 @@ otomi:
         password: blablabla
 smtp:
     auth_password: somesecretvalue
+obj:
+    provider:
+        # s3:
+        #     secretAccessKey: somesecretvalue
+        linode:
+            secretAccessKey: somesecretvalue
+        # azureBlob:
+        #     aadClientSecret: somesecretvalue
+platformBackups:
+    persistentVolumes:
+        linodeApiToken: justanapitokenhere
diff --git a/tests/fixtures/env/settings.yaml b/tests/fixtures/env/settings.yaml
@@ -65,7 +65,7 @@ otomi:
     additionalClusters:
         - domainSuffix: demo.eks.otomi.cloud
           name: demo
-          provider: aws
+          provider: custom
     globalPullSecret:
         username: otomi
     hasExternalDNS: true
@@ -80,19 +80,30 @@ platformBackups:
             enabled: true
             retentionPolicy: 7d
             schedule: 0 0 0 * * *
+        keycloak:
+            enabled: true
+            retentionPolicy: 7d
+            schedule: 0 0 0 * * *
+        gitea:
+            enabled: true
+            retentionPolicy: 7d
+            schedule: 0 0 0 * * *
     persistentVolumes:
-        argo:
-            enabled: false
-        drone:
-            enabled: false
         gitea:
             enabled: false
-        harbor:
-            enabled: false
-        keycloak:
-            enabled: false
-        minio:
-            enabled: false
+obj:
+    bucket:
+        loki: loki
+        cnpg: cnpg
+        velero: velero
+        harbor: harbor
+        tempo: tempo
+    provider:
+        # type: minioLocal
+        linode:
+            region: nl-ams-1
+            accessKeyId: someaccessKeyId
+        type: linode
 smtp:
     auth_username: no-reply@doma.in
     from: no-reply@doma.in