Final changes to values file

dBildungsplattform · Sep 17, 2024 · 1c307ec · 1c307ec
1 parent 443aa24
commit 1c307ec
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 21 deletions.
diff --git a/charts/dbp-moodle/templates/jobs/moodle-restore-job.yaml b/charts/dbp-moodle/templates/jobs/moodle-restore-job.yaml
@@ -41,13 +41,7 @@ spec:
           - /scripts/restore-script
         securityContext:
           privileged: false
-        resources:
-          limits:
-            cpu: 2000m
-            memory: 16Gi
-          requests:
-            cpu: 1000m
-            memory: 8Gi
+        resources: {{ .Values.dbpMoodle.restore.resources | toYaml }}
         volumeMounts:
         - name: moodle-data
           mountPath: /bitnami/moodle
@@ -75,7 +69,7 @@ spec:
             secretKeyRef:
               name: {{ .Values.dbpMoodle.restore.existingSecretS3 }}
               key: {{ .Values.dbpMoodle.restore.existingSecretKeyS3Secret }}
-      affinity: {{ .Values.dbpMoodle.moodleRestoreJob.affinity | toYaml }}
-      tolerations: {{ .Values.dbpMoodle.moodleRestoreJob.tolerations | toYaml }}
+      affinity: {{ .Values.dbpMoodle.restore.affinity | toYaml }}
+      tolerations: {{ .Values.dbpMoodle.restore.tolerations | toYaml }}
       restartPolicy: Never
 {{- end }}
diff --git a/charts/dbp-moodle/templates/secrets/moodle-secret.yaml b/charts/dbp-moodle/templates/secrets/moodle-secret.yaml
@@ -9,7 +9,7 @@ stringData:
   moodle-password: {{ include "dbpMoodle.secrets.moodle_password" . }}
   {{- if .Values.postgresql.enabled }}
   mariadb-password: {{ include "dbpMoodle.secrets.mariadb_password" . }}
-  postgresql-password: {{ include "dbpMoodle.secrets.postgres_admin_password" . }}
+  postgres-admin-password: {{ include "dbpMoodle.secrets.postgres_admin_password" . }}
   {{- end }}
   {{- if .Values.mariadb.enabled }}
   mariadb-password: {{ include "dbpMoodle.secrets.mariadb_password" . }}

diff --git a/charts/dbp-moodle/values.yaml b/charts/dbp-moodle/values.yaml
@@ -120,26 +120,31 @@ dbpMoodle:
       - apiGroups: ["batch"]
         resources: ["cronjobs", "jobs"]
         verbs: ["get", "patch"]
-
-  moodleRestoreJob:
-    affinity: {}
-    tolerations: []
-    resources: {}
 
   restore:
     enabled: false # Only to be used to restore a snapshot with the dbp-restore script
     image_repository: schulcloud
     image_tag: 4.0.3
-    rules:
-      - apiGroups: ["apps"]
-        resources: ["deployments/scale", "deployments"]
-        verbs: ["get", "list", "scale", "patch"]
+    resources:
+      limits:
+        cpu: 2000m
+        memory: 16Gi
+      requests:
+        cpu: 1000m
+        memory: 8Gi
     existingSecretGPG: ""
     existingSecretDatabase: "moodle"
     existingSecretKeyDatabase: ""
     existingSecretS3: ""
     existingSecretKeyS3Access: ""
     existingSecretKeyS3Secret: ""
+    affinity: {}
+    tolerations: []
+
+    rules:
+      - apiGroups: ["apps"]
+        resources: ["deployments/scale", "deployments"]
+        verbs: ["get", "list", "scale", "patch"]
 
   moodlecronjob:
     rules:
@@ -296,9 +301,8 @@ postgresql:
     username: "moodle"
     database: "moodle"
     existingSecret: "moodle"
-    enablePostgresUser: true # If true, the admin user "postgres" is enabled
     secretKeys:
-      adminPasswordKey: "postgresql-password"
+      adminPasswordKey: "postgres-admin-password"
       userPasswordKey: "mariadb-password" # moodle expects its db password key to be mariadb-password
   metrics:
     enabled: true