Merge branch 'main' into DBP-1112-stabilize-helm-chart-publishment

dBildungsplattform · Dec 16, 2024 · 6c0ba16 · 6c0ba16
2 parents 9b75b98 + 9e6a324
commit 6c0ba16
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 19 deletions.
diff --git a/automation/dbildungs-iam-keycloak/Chart.yaml b/automation/dbildungs-iam-keycloak/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
-appVersion: 1.0.8
+appVersion: SPSH-1648
 description: A Helm Chart for the dbildungs-iam-keycloak
 name: dbildungs-iam-keycloak
 type: application
-version: 1.0.8
+version: 0.0.0-spsh-1648-20241216-1820
diff --git a/automation/dbildungs-iam-keycloak/values.yaml b/automation/dbildungs-iam-keycloak/values.yaml
@@ -50,7 +50,7 @@ database:
   username: "dbildungs_iam_keycloak"
 
 realm:
-  name: dbilduns-iam-keycloak-realm
+  name: dbildungs-iam-keycloak-realm
   filepath: "dev-realm-spsh.json"
 
 restartPolicy: Always

diff --git a/automation/dbildungs-iam-ldap/Chart.lock b/automation/dbildungs-iam-ldap/Chart.lock
@@ -6,4 +6,4 @@ dependencies:
   repository: https://charts.bitnami.com/bitnami
   version: 2.27.0
 digest: sha256:63b46b2edf8052dbee0f4b2111a8838aa521f9fc95681e0ee3f32274aa4473a6
-generated: "2024-12-07T18:06:07.683452052Z"
+generated: "2024-12-13T09:33:57.972096983Z"
diff --git a/automation/dbildungs-iam-ldap/Chart.yaml b/automation/dbildungs-iam-ldap/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.0.8
+appVersion: 1.1.1
 dependencies:
 - condition: phpldapadmin.enabled
   name: phpldapadmin
@@ -16,4 +16,4 @@ keywords:
 - ldap
 - openldap
 name: dbildungs-iam-ldap
-version: 1.0.8
+version: 1.1.1
diff --git a/automation/dbildungs-iam-server/Chart.yaml b/automation/dbildungs-iam-server/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
-appVersion: 1.0.8
+appVersion: SPSH-1570
 description: dBildungs-IAM-server
 name: dbildungs-iam-server
 type: application
-version: 1.0.8
+version: 0.0.0-spsh-1570-20241216-1503
diff --git a/automation/dbp-moodle/Chart.lock b/automation/dbp-moodle/Chart.lock
@@ -27,4 +27,4 @@ dependencies:
   repository: https://burningalchemist.github.io/sql_exporter/
   version: 0.6.1
 digest: sha256:c2d696cb5b0cfe3096fabb66d1fbdf72969e84cf33898a25fd8f218e6bdca87b
-generated: "2024-11-29T12:34:25.950483429Z"
+generated: "2024-12-12T15:03:57.545805771Z"
diff --git a/automation/dbp-moodle/Chart.yaml b/automation/dbp-moodle/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: OPS-7465
+appVersion: DBP-1016
 dependencies:
 - name: moodle
   repository: https://charts.bitnami.com/bitnami
@@ -47,4 +47,4 @@ description: 'This is a Helm Chart bundling some of the bitnami resources to dep
 home: https://dbildungsplattform.github.io/dbp-moodle/
 name: dbp-moodle
 type: application
-version: 0.0.0-ops-7465-20241129-1234
+version: 0.0.0-dbp-1016-20241212-1503
diff --git a/automation/dbp-moodle/README.md b/automation/dbp-moodle/README.md
@@ -1,6 +1,6 @@
 # dbp-moodle
 
-![Version: 0.0.14](https://img.shields.io/badge/Version-0.0.14-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.1.14](https://img.shields.io/badge/AppVersion-4.1.14-informational?style=flat-square)
+![Version: 0.0.16](https://img.shields.io/badge/Version-0.0.16-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.1.14](https://img.shields.io/badge/AppVersion-4.1.14-informational?style=flat-square)
 
 This is a Helm Chart bundling some of the bitnami resources to deploy Moodle for DBildungsplattform. Extending them with features such as
 MariaDB and PostgreSQL support, Horizontal Autoscaling capabilities, Redis Session Store, Etherpad-Lite.
@@ -290,7 +290,7 @@ The Chart can be deployed without any modification but it is advised to set own
 | moodlecronjob.jobs[0].concurrencyPolicy | string | `"Forbid"` |  |
 | moodlecronjob.jobs[0].extraVolumeMounts[0].mountPath | string | `"/scripts/"` |  |
 | moodlecronjob.jobs[0].extraVolumeMounts[0].name | string | `"moodle-php-script"` |  |
-| moodlecronjob.jobs[0].extraVolumes[0].configMap.defaultMode | int | `457` |  |
+| moodlecronjob.jobs[0].extraVolumes[0].configMap.defaultMode | int | `364` |  |
 | moodlecronjob.jobs[0].extraVolumes[0].configMap.name | string | `"moodle-php-script"` |  |
 | moodlecronjob.jobs[0].extraVolumes[0].name | string | `"moodle-php-script"` |  |
 | moodlecronjob.jobs[0].failedJobsHistoryLimit | int | `1` |  |
@@ -302,11 +302,14 @@ The Chart can be deployed without any modification but it is advised to set own
 | moodlecronjob.jobs[0].restartPolicy | string | `"Never"` |  |
 | moodlecronjob.jobs[0].schedule | string | `"* * * * *"` |  |
 | moodlecronjob.jobs[0].successfulJobsHistoryLimit | int | `1` |  |
+| moodlecronjob.podSecurityContext.fsGroup | int | `1001` |  |
 | moodlecronjob.resources | object | `{}` |  |
 | moodlecronjob.securityContext.allowPrivilegeEscalation | bool | `false` |  |
 | moodlecronjob.securityContext.capabilities.drop[0] | string | `"ALL"` |  |
 | moodlecronjob.securityContext.privileged | bool | `false` |  |
 | moodlecronjob.securityContext.runAsGroup | int | `1001` |  |
+| moodlecronjob.securityContext.runAsNonRoot | bool | `true` |  |
+| moodlecronjob.securityContext.runAsUser | int | `1001` |  |
 | moodlecronjob.serviceAccount.create | bool | `false` |  |
 | moodlecronjob.serviceAccount.name | string | `"moodle-cronjob"` |  |
 | moodlecronjob.tolerations | list | `[]` |  |

diff --git a/automation/dbp-moodle/scripts/backup.sh b/automation/dbp-moodle/scripts/backup.sh
@@ -44,7 +44,7 @@ dummy_probe_patch=$(cat <<-EOF
 # If update backup: depending on exit code create the signal for the update helper job with success or failure
 function clean_up() {
     exit_code=$?
-    if ! [ -a /mountData/moodledata/CliUpdate ]; then
+    if ! [ -e /mountData/moodledata/CliUpdate ]; then
         echo "=== Starting cleanup ==="
         echo "=== Stopping maintenance mode ==="
         rm -f /mountData/moodledata/climaintenance.html
@@ -108,7 +108,7 @@ if [ ! -d "${backup_dir}" ]; then
 fi
 
 # If the backup is done for the update it skips the preparation because the update helper already did this
-if ! [ -a /mountData/moodledata/CliUpdate ]; then
+if ! [ -e /mountData/moodledata/CliUpdate ]; then
     # Suspend the cronjob to avoid errors due to missing moodle
     echo "=== Suspending moodle cronjob ==="
     kubectl patch cronjobs "{{ .Release.Name }}-moodlecronjob-{{ include "moodlecronjob.job_name" . }}" -n "{{ .Release.Namespace }}" -p '{"spec" : {"suspend" : true }}'

diff --git a/automation/dbp-moodle/scripts/restore.sh b/automation/dbp-moodle/scripts/restore.sh
@@ -20,7 +20,7 @@ health_file="/tmp/healthy"
 # Create liveness probe file
 touch "${health_file}"
 
-{{ if and .Values.dbpMoodle.backup.s3_certificate_secret.mountpath .Values.dbpMoodle.backup.s3_certificate_secret.key }}
+{{ if and .Values.dbpMoodle.backup.s3_certificate_secret.enabled }}
 printf "Appendending custom certificate (%s/%s) to /etc/ssl/certs/ca-certificates.crt\n" "{{ .Values.dbpMoodle.backup.s3_certificate_secret.mountpath }}" "{{ .Values.dbpMoodle.backup.s3_certificate_secret.key }}"
 cat "{{ .Values.dbpMoodle.backup.s3_certificate_secret.mountpath }}/{{ .Values.dbpMoodle.backup.s3_certificate_secret.key }}" >> /etc/ssl/certs/ca-certificates.crt
 {{ end }}

diff --git a/automation/dbp-moodle/values.yaml b/automation/dbp-moodle/values.yaml
@@ -519,10 +519,14 @@ moodlecronjob:
   serviceAccount:
     name: "moodle-cronjob"
     create: false
+  podSecurityContext:
+    fsGroup: 1001
   securityContext:
     privileged: false
     allowPrivilegeEscalation: false
     runAsGroup: 1001
+    runAsUser: 1001
+    runAsNonRoot: true
     capabilities:
       drop:
         - ALL
@@ -549,7 +553,7 @@ moodlecronjob:
         - name: moodle-php-script
           configMap:
             name: moodle-php-script
-            defaultMode: 0711
+            defaultMode: 0554
       livenessProbe:
         exec:
           command:

diff --git a/automation/schulportal-client/Chart.yaml b/automation/schulportal-client/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
-appVersion: 1.0.8
+appVersion: SPSH-1628
 description: Helm-Chart for schulportal-client
 name: schulportal-client
 type: application
-version: 1.0.8
+version: 0.0.0-spsh-1628-20241216-1627