Merge branch 'main' into N21-2285-update-media-activations-extension

.github/workflows/clean_workflow.yml

@@ -74,7 +74,7 @@ jobs:
             echo "branch_exists=false" >> $GITHUB_ENV
           fi
       ## Write for matrix outputs workaround https://github.com/orgs/community/discussions/17245
-      - uses: cloudposse/github-action-matrix-outputs-write@0.5.0
+      - uses: cloudposse/github-action-matrix-outputs-write@v1
         id: out
         with:
           matrix-step-name: ${{ github.job }}
@@ -90,7 +90,7 @@ jobs:
       are_all_branches_deleted: ${{ steps.are_all_branches_deleted.outputs.are_all_branches_deleted }}
     steps:
       ## read for matrix outputs workaround https://github.com/orgs/community/discussions/17245
-      - uses: cloudposse/github-action-matrix-outputs-read@0.1.2
+      - uses: cloudposse/github-action-matrix-outputs-read@v1
         id: read
         with:
           matrix-step-name: gather_branch_exists

ansible/collections/requirements.yml

@@ -1,4 +1,4 @@
 ---
 collections:
   - name: kubernetes.core
-    version: 2.4.0
+    version: 5.0.0

ansible/group_vars/all/config.yml

@@ -552,7 +552,7 @@ configuration_all:
     client: false
     nuxtclient: false
   FEATURE_COLUMN_BOARD_VIDEOCONFERENCE_ENABLED:
-    value: "false"
+    value: "true"
     server: true
     client: false
     nuxtclient: false
@@ -1100,7 +1100,7 @@ configuration_all:
     client: false
     nuxtclient: false
   FEATURE_ROOMS_ENABLED:
-    value: "false"
+    value: "true"
     server: true
     client: true
     nuxtclient: false

ansible/group_vars/develop/cfg.yml

@@ -17,10 +17,6 @@ FEATURE_COLUMN_BOARD_SUBMISSIONS_ENABLED: "true"
 
 FEATURE_COLUMN_BOARD_LINK_ELEMENT_ENABLED: "true"
 
-FEATURE_COLUMN_BOARD_VIDEOCONFERENCE_ENABLED: "true"
-
-FEATURE_ROOMS_ENABLED: "true"
-
 FEATURE_SCHOOL_POLICY_ENABLED_NEW: "true"
 
 FEATURE_SCHOOL_TERMS_OF_USE_ENABLED: "true"
@@ -37,8 +33,6 @@ SC_DEFAULT_STORAGE_CLASS_NAME: "nfs-client"
 
 BOARD_COLLABORATION_SERVER_REPLICAS: 1
 
-FEATURE_COLUMN_BOARD_SOCKET_ENABLED: "true"
-
 COMMON_CARTRIDGE_REPLICAS: 1
 
 SERVER_H5P_LIBRARY_MANAGEMENT_CRONJOB: "{{ 60 | random(seed=NAMESPACE) }} 3 * * 3,6"

ansible/host_vars/dev-loadtest-01/version.yml

@@ -1,11 +1,11 @@
-SCHULCLOUD_SERVER_IMAGE_TAG: 32.50.3
-SCHULCLOUD_CLIENT_IMAGE_TAG: 32.50.0
-NUXT_CLIENT_IMAGE_TAG: 32.50.0
-SUPERHERO_DASHBOARD_IMAGE_TAG: 32.50.0
-SHD_CLIENT_IMAGE_TAG: 32.50.0
+SCHULCLOUD_SERVER_IMAGE_TAG: 32.51.0
+SCHULCLOUD_CLIENT_IMAGE_TAG: 32.51.0
+NUXT_CLIENT_IMAGE_TAG: 32.51.0
+SUPERHERO_DASHBOARD_IMAGE_TAG: 32.51.0
+SHD_CLIENT_IMAGE_TAG: 32.51.0
 SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.50.0
 ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.50.0
 VERSION_AGGREGATOR_IMAGE_TAG: 32.50.0
 H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.11
-TLDRAW_CLIENT_IMAGE_TAG: 32.50.0
-TLDRAW_SERVER_IMAGE_TAG: 32.50.0
+TLDRAW_CLIENT_IMAGE_TAG: 32.51.0
+TLDRAW_SERVER_IMAGE_TAG: 32.51.0

ansible/host_vars/infra.dbildungscloud-01/version.yml

@@ -1,11 +1,11 @@
-SCHULCLOUD_SERVER_IMAGE_TAG: 32.50.3
-SCHULCLOUD_CLIENT_IMAGE_TAG: 32.50.0
-NUXT_CLIENT_IMAGE_TAG: 32.50.0
-SUPERHERO_DASHBOARD_IMAGE_TAG: 32.50.0
-SHD_CLIENT_IMAGE_TAG: 32.50.0
+SCHULCLOUD_SERVER_IMAGE_TAG: 32.51.0
+SCHULCLOUD_CLIENT_IMAGE_TAG: 32.51.0
+NUXT_CLIENT_IMAGE_TAG: 32.51.0
+SUPERHERO_DASHBOARD_IMAGE_TAG: 32.51.0
+SHD_CLIENT_IMAGE_TAG: 32.51.0
 SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.50.0
 ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.50.0
 VERSION_AGGREGATOR_IMAGE_TAG: 32.50.0
 H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.11
-TLDRAW_CLIENT_IMAGE_TAG: 32.50.0
-TLDRAW_SERVER_IMAGE_TAG: 32.50.0
+TLDRAW_CLIENT_IMAGE_TAG: 32.51.0
+TLDRAW_SERVER_IMAGE_TAG: 32.51.0

ansible/host_vars/prod-brb/version.yml

@@ -1,11 +1,11 @@
-SCHULCLOUD_SERVER_IMAGE_TAG: 32.50.3
-SCHULCLOUD_CLIENT_IMAGE_TAG: 32.50.0
-NUXT_CLIENT_IMAGE_TAG: 32.50.0
-SUPERHERO_DASHBOARD_IMAGE_TAG: 32.50.0
-SHD_CLIENT_IMAGE_TAG: 32.50.0
+SCHULCLOUD_SERVER_IMAGE_TAG: 32.51.0
+SCHULCLOUD_CLIENT_IMAGE_TAG: 32.51.0
+NUXT_CLIENT_IMAGE_TAG: 32.51.0
+SUPERHERO_DASHBOARD_IMAGE_TAG: 32.51.0
+SHD_CLIENT_IMAGE_TAG: 32.51.0
 SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.50.0
 ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.50.0
 VERSION_AGGREGATOR_IMAGE_TAG: 32.50.0
 H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.11
-TLDRAW_CLIENT_IMAGE_TAG: 32.50.0
-TLDRAW_SERVER_IMAGE_TAG: 32.50.0
+TLDRAW_CLIENT_IMAGE_TAG: 32.51.0
+TLDRAW_SERVER_IMAGE_TAG: 32.51.0

ansible/host_vars/prod-dbc/version.yml

@@ -1,11 +1,11 @@
-SCHULCLOUD_SERVER_IMAGE_TAG: 32.50.3
-SCHULCLOUD_CLIENT_IMAGE_TAG: 32.50.0
-NUXT_CLIENT_IMAGE_TAG: 32.50.0
-SUPERHERO_DASHBOARD_IMAGE_TAG: 32.50.0
-SHD_CLIENT_IMAGE_TAG: 32.50.0
+SCHULCLOUD_SERVER_IMAGE_TAG: 32.51.0
+SCHULCLOUD_CLIENT_IMAGE_TAG: 32.51.0
+NUXT_CLIENT_IMAGE_TAG: 32.51.0
+SUPERHERO_DASHBOARD_IMAGE_TAG: 32.51.0
+SHD_CLIENT_IMAGE_TAG: 32.51.0
 SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.50.0
 ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.50.0
 VERSION_AGGREGATOR_IMAGE_TAG: 32.50.0
 H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.11
-TLDRAW_CLIENT_IMAGE_TAG: 32.50.0
-TLDRAW_SERVER_IMAGE_TAG: 32.50.0
+TLDRAW_CLIENT_IMAGE_TAG: 32.51.0
+TLDRAW_SERVER_IMAGE_TAG: 32.51.0

ansible/host_vars/prod-nbc/version.yml

@@ -1,11 +1,11 @@
-SCHULCLOUD_SERVER_IMAGE_TAG: 32.50.3
-SCHULCLOUD_CLIENT_IMAGE_TAG: 32.50.0
-NUXT_CLIENT_IMAGE_TAG: 32.50.0
-SUPERHERO_DASHBOARD_IMAGE_TAG: 32.50.0
-SHD_CLIENT_IMAGE_TAG: 32.50.0
+SCHULCLOUD_SERVER_IMAGE_TAG: 32.51.0
+SCHULCLOUD_CLIENT_IMAGE_TAG: 32.51.0
+NUXT_CLIENT_IMAGE_TAG: 32.51.0
+SUPERHERO_DASHBOARD_IMAGE_TAG: 32.51.0
+SHD_CLIENT_IMAGE_TAG: 32.51.0
 SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.50.0
 ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.50.0
 VERSION_AGGREGATOR_IMAGE_TAG: 32.50.0
 H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.11
-TLDRAW_CLIENT_IMAGE_TAG: 32.50.0
-TLDRAW_SERVER_IMAGE_TAG: 32.50.0
+TLDRAW_CLIENT_IMAGE_TAG: 32.51.0
+TLDRAW_SERVER_IMAGE_TAG: 32.51.0

ansible/host_vars/prod-thr/version.yml

@@ -1,11 +1,11 @@
-SCHULCLOUD_SERVER_IMAGE_TAG: 32.50.3
-SCHULCLOUD_CLIENT_IMAGE_TAG: 32.50.0
-NUXT_CLIENT_IMAGE_TAG: 32.50.0
-SUPERHERO_DASHBOARD_IMAGE_TAG: 32.50.0
-SHD_CLIENT_IMAGE_TAG: 32.50.0
+SCHULCLOUD_SERVER_IMAGE_TAG: 32.51.0
+SCHULCLOUD_CLIENT_IMAGE_TAG: 32.51.0
+NUXT_CLIENT_IMAGE_TAG: 32.51.0
+SUPERHERO_DASHBOARD_IMAGE_TAG: 32.51.0
+SHD_CLIENT_IMAGE_TAG: 32.51.0
 SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.50.0
 ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.50.0
 VERSION_AGGREGATOR_IMAGE_TAG: 32.50.0
 H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.11
-TLDRAW_CLIENT_IMAGE_TAG: 32.50.0
-TLDRAW_SERVER_IMAGE_TAG: 32.50.0
+TLDRAW_CLIENT_IMAGE_TAG: 32.51.0
+TLDRAW_SERVER_IMAGE_TAG: 32.51.0

ansible/host_vars/ref-audit/cfg.yml

@@ -3,7 +3,6 @@ DOMAIN: staging.audit.dbildungscloud.org
 
 FEATURE_OAUTH_LOGIN_ENABLED: "true"
 FEATURE_H5P_EDITOR_ENABLED: "true"
-FEATURE_ROOMS_ENABLED: "true"
 
 DISPLAY_REQUEST_LEVEL: -1
 ALERT_STATUS_URL: https://status.dbildungscloud.dev/

ansible/host_vars/ref-audit/version.yml

@@ -1,11 +1,11 @@
-SCHULCLOUD_SERVER_IMAGE_TAG: 32.50.3
-SCHULCLOUD_CLIENT_IMAGE_TAG: 32.50.0
-NUXT_CLIENT_IMAGE_TAG: 32.50.0
-SUPERHERO_DASHBOARD_IMAGE_TAG: 32.50.0
-SHD_CLIENT_IMAGE_TAG: 32.50.0
+SCHULCLOUD_SERVER_IMAGE_TAG: 32.51.0
+SCHULCLOUD_CLIENT_IMAGE_TAG: 32.51.0
+NUXT_CLIENT_IMAGE_TAG: 32.51.0
+SUPERHERO_DASHBOARD_IMAGE_TAG: 32.51.0
+SHD_CLIENT_IMAGE_TAG: 32.51.0
 SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.50.0
 ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.50.0
 VERSION_AGGREGATOR_IMAGE_TAG: 32.50.0
 H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.11
-TLDRAW_CLIENT_IMAGE_TAG: 32.50.0
-TLDRAW_SERVER_IMAGE_TAG: 32.50.0
+TLDRAW_CLIENT_IMAGE_TAG: 32.51.0
+TLDRAW_SERVER_IMAGE_TAG: 32.51.0

ansible/host_vars/ref-brb/version.yml

@@ -1,11 +1,11 @@
-SCHULCLOUD_SERVER_IMAGE_TAG: 32.50.3
-SCHULCLOUD_CLIENT_IMAGE_TAG: 32.50.0
-NUXT_CLIENT_IMAGE_TAG: 32.50.0
-SUPERHERO_DASHBOARD_IMAGE_TAG: 32.50.0
-SHD_CLIENT_IMAGE_TAG: 32.50.0
+SCHULCLOUD_SERVER_IMAGE_TAG: 32.51.0
+SCHULCLOUD_CLIENT_IMAGE_TAG: 32.51.0
+NUXT_CLIENT_IMAGE_TAG: 32.51.0
+SUPERHERO_DASHBOARD_IMAGE_TAG: 32.51.0
+SHD_CLIENT_IMAGE_TAG: 32.51.0
 SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.50.0
 ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.50.0
 VERSION_AGGREGATOR_IMAGE_TAG: 32.50.0
 H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.11
-TLDRAW_CLIENT_IMAGE_TAG: 32.50.0
-TLDRAW_SERVER_IMAGE_TAG: 32.50.0
+TLDRAW_CLIENT_IMAGE_TAG: 32.51.0
+TLDRAW_SERVER_IMAGE_TAG: 32.51.0

ansible/host_vars/ref-dbc/version.yml

@@ -1,11 +1,11 @@
-SCHULCLOUD_SERVER_IMAGE_TAG: 32.50.3
-SCHULCLOUD_CLIENT_IMAGE_TAG: 32.50.0
-NUXT_CLIENT_IMAGE_TAG: 32.50.0
-SUPERHERO_DASHBOARD_IMAGE_TAG: 32.50.0
-SHD_CLIENT_IMAGE_TAG: 32.50.0
+SCHULCLOUD_SERVER_IMAGE_TAG: 32.51.0
+SCHULCLOUD_CLIENT_IMAGE_TAG: 32.51.0
+NUXT_CLIENT_IMAGE_TAG: 32.51.0
+SUPERHERO_DASHBOARD_IMAGE_TAG: 32.51.0
+SHD_CLIENT_IMAGE_TAG: 32.51.0
 SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.50.0
 ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.50.0
 VERSION_AGGREGATOR_IMAGE_TAG: 32.50.0
 H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.11
-TLDRAW_CLIENT_IMAGE_TAG: 32.50.0
-TLDRAW_SERVER_IMAGE_TAG: 32.50.0
+TLDRAW_CLIENT_IMAGE_TAG: 32.51.0
+TLDRAW_SERVER_IMAGE_TAG: 32.51.0

ansible/host_vars/ref-nbc/version.yml

@@ -1,11 +1,11 @@
-SCHULCLOUD_SERVER_IMAGE_TAG: 32.50.3
-SCHULCLOUD_CLIENT_IMAGE_TAG: 32.50.0
-NUXT_CLIENT_IMAGE_TAG: 32.50.0
-SUPERHERO_DASHBOARD_IMAGE_TAG: 32.50.0
-SHD_CLIENT_IMAGE_TAG: 32.50.0
+SCHULCLOUD_SERVER_IMAGE_TAG: 32.51.0
+SCHULCLOUD_CLIENT_IMAGE_TAG: 32.51.0
+NUXT_CLIENT_IMAGE_TAG: 32.51.0
+SUPERHERO_DASHBOARD_IMAGE_TAG: 32.51.0
+SHD_CLIENT_IMAGE_TAG: 32.51.0
 SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.50.0
 ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.50.0
 VERSION_AGGREGATOR_IMAGE_TAG: 32.50.0
 H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.11
-TLDRAW_CLIENT_IMAGE_TAG: 32.50.0
-TLDRAW_SERVER_IMAGE_TAG: 32.50.0
+TLDRAW_CLIENT_IMAGE_TAG: 32.51.0
+TLDRAW_SERVER_IMAGE_TAG: 32.51.0

ansible/host_vars/ref-thr/version.yml

@@ -1,11 +1,11 @@
-SCHULCLOUD_SERVER_IMAGE_TAG: 32.50.3
-SCHULCLOUD_CLIENT_IMAGE_TAG: 32.50.0
-NUXT_CLIENT_IMAGE_TAG: 32.50.0
-SUPERHERO_DASHBOARD_IMAGE_TAG: 32.50.0
-SHD_CLIENT_IMAGE_TAG: 32.50.0
+SCHULCLOUD_SERVER_IMAGE_TAG: 32.51.0
+SCHULCLOUD_CLIENT_IMAGE_TAG: 32.51.0
+NUXT_CLIENT_IMAGE_TAG: 32.51.0
+SUPERHERO_DASHBOARD_IMAGE_TAG: 32.51.0
+SHD_CLIENT_IMAGE_TAG: 32.51.0
 SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.50.0
 ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.50.0
 VERSION_AGGREGATOR_IMAGE_TAG: 32.50.0
 H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.11
-TLDRAW_CLIENT_IMAGE_TAG: 32.50.0
-TLDRAW_SERVER_IMAGE_TAG: 32.50.0
+TLDRAW_CLIENT_IMAGE_TAG: 32.51.0
+TLDRAW_SERVER_IMAGE_TAG: 32.51.0

ansible/host_vars/thr_host/cfg.yml

@@ -6,4 +6,5 @@ NEXTCLOUD_REDIRECT_URL: https://nextcloud-thr.dbildungscloud.dev/apps/files/?dir
 NEXTCLOUD_BASE_URL: https://nextcloud-thr.dbildungscloud.dev/
 
 FEATURE_TSP_SYNC_ENABLED: "true"
-TSP_API_CLIENT_BASE_URL: https://test2.schulportal-thueringen.de/tip-ms/api
+FEATURE_TSP_MIGRATION_ENABLED: "true"
+TSP_API_CLIENT_BASE_URL: https://test.schulportal-thueringen.de/tip-ms/api

ansible/roles/clamav/defaults/main.yml

@@ -0,0 +1,2 @@
+CLAMAV_IMAGE_NAME: docker.io/clamav/clamav
+CLAMAV_IMAGE_TAG: 1.4.1

ansible/roles/clamav/templates/configmap.yml.j2

@@ -8,3 +8,4 @@ metadata:
 data:
 
   CLAMD_CONF_StreamMaxLength: 3000M
+  CLAMD_CONF_AlertBrokenExecutables: 'yes'

ansible/roles/clamav/templates/deployment.yml.j2

@@ -44,6 +44,12 @@ spec:
         envFrom:
         - configMapRef:
             name: clamav-configmap
+        startupProbe:
+          exec:
+            command:
+            - clamdcheck.sh
+          failureThreshold: 30
+          periodSeconds: 10
         resources:
           limits:
             cpu: {{ CLAMAV_CPU_MAX|default("500m", true) }}

ansible/roles/dof_rabbitmq/defaults/main.yaml

@@ -1,3 +1,3 @@
 RABBITMQ_IMAGE_NAME: docker.io/rabbitmq
-RABBITMQ_IMAGE_TAG: 3.13.7-management
+RABBITMQ_IMAGE_TAG: 4.0.5-management-alpine
 RABBITMQ_PER_OBJECT_METRICS: "true"

ansible/roles/dof_rabbitmq/files/enable-feature-flags.sh

@@ -0,0 +1,60 @@
+#!/bin/bash
+
+set -euo pipefail
+
+KUBECONFIG_OPTION=""
+NAMESPACE=""
+COMPONENT_NAME="rabbitmq"
+CONTAINER_NAME="rabbitmq"
+COMMAND="rabbitmqctl enable_feature_flag all"
+
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        --kubeconfig)
+            KUBECONFIG_OPTION="--kubeconfig=$2"
+            shift 2
+            ;;
+        --namespace)
+            NAMESPACE=$2
+            shift 2
+            ;;
+        --component-name)
+            COMPONENT_NAME=$2
+            shift 2
+            ;;
+        --container-name)
+            CONTAINER_NAME=$2
+            shift 2
+            ;;
+        --command)
+            COMMAND=$2
+            shift 2
+            ;;
+        *)
+            echo "Unknown argument: $1"
+            echo "Usage: $0 --namespace <namespace> [--kubeconfig <path>] [--component-name <name>] [--container-name <name>] [--command <command>]"
+            exit 1
+            ;;
+    esac
+done
+
+if [[ -z "$NAMESPACE" ]]; then
+    echo "Error: --namespace is required"
+    echo "Usage: $0 --namespace <namespace> [--kubeconfig <path>] [--component-name <name>] [--container-name <name>] [--command <command>]"
+    exit 1
+fi
+
+PODS=$(kubectl $KUBECONFIG_OPTION get pods -n "$NAMESPACE" -l "app.kubernetes.io/component=$COMPONENT_NAME" -o jsonpath='{.items[*].metadata.name}')
+
+if [[ -z "$PODS" ]]; then
+    echo "No pods found matching app.kubernetes.io/component=$COMPONENT_NAME in namespace $NAMESPACE"
+    exit 1
+fi
+
+for POD in $PODS; do
+    echo "Executing command in pod: $POD"
+    kubectl $KUBECONFIG_OPTION exec -n "$NAMESPACE" -c "$CONTAINER_NAME" "$POD" -- $COMMAND || {
+        echo "Failed to execute command in pod: $POD" >&2
+        exit 1
+    }
+done

ansible/roles/dof_rabbitmq/tasks/main.yml

@@ -34,3 +34,4 @@
     when: RABBITMQ_SERVICE_MONITOR is undefined or RABBITMQ_SERVICE_MONITOR is defined and not RABBITMQ_SERVICE_MONITOR
     tags:
       - prometheus
+