diff --git a/.github/workflows/clean_workflow.yml b/.github/workflows/clean_workflow.yml index f64d2a201..20051a26e 100644 --- a/.github/workflows/clean_workflow.yml +++ b/.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 diff --git a/ansible/collections/requirements.yml b/ansible/collections/requirements.yml index e6dab53f7..18f0c6bd7 100644 --- a/ansible/collections/requirements.yml +++ b/ansible/collections/requirements.yml @@ -1,4 +1,4 @@ --- collections: - name: kubernetes.core - version: 2.4.0 + version: 5.0.0 diff --git a/ansible/group_vars/all/config.yml b/ansible/group_vars/all/config.yml index 24025edb4..d5b3d22f3 100644 --- a/ansible/group_vars/all/config.yml +++ b/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 diff --git a/ansible/group_vars/develop/cfg.yml b/ansible/group_vars/develop/cfg.yml index 8ab445bf0..af002f036 100644 --- a/ansible/group_vars/develop/cfg.yml +++ b/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" diff --git a/ansible/group_vars/develop/clamav.yml b/ansible/group_vars/develop/clamav.yml deleted file mode 100644 index f9b26e766..000000000 --- a/ansible/group_vars/develop/clamav.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -CLAMAV_IMAGE_NAME: docker.io/mkodockx/docker-clamav -CLAMAV_IMAGE_TAG: alpine diff --git a/ansible/group_vars/infra/clamav.yml b/ansible/group_vars/infra/clamav.yml deleted file mode 100644 index f9b26e766..000000000 --- a/ansible/group_vars/infra/clamav.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -CLAMAV_IMAGE_NAME: docker.io/mkodockx/docker-clamav -CLAMAV_IMAGE_TAG: alpine diff --git a/ansible/group_vars/loadtest/clamav.yml b/ansible/group_vars/loadtest/clamav.yml deleted file mode 100644 index f9b26e766..000000000 --- a/ansible/group_vars/loadtest/clamav.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -CLAMAV_IMAGE_NAME: docker.io/mkodockx/docker-clamav -CLAMAV_IMAGE_TAG: alpine diff --git a/ansible/group_vars/production/clamav.yml b/ansible/group_vars/production/clamav.yml deleted file mode 100644 index f9b26e766..000000000 --- a/ansible/group_vars/production/clamav.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -CLAMAV_IMAGE_NAME: docker.io/mkodockx/docker-clamav -CLAMAV_IMAGE_TAG: alpine diff --git a/ansible/group_vars/reference/clamav.yml b/ansible/group_vars/reference/clamav.yml deleted file mode 100644 index f9b26e766..000000000 --- a/ansible/group_vars/reference/clamav.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -CLAMAV_IMAGE_NAME: docker.io/mkodockx/docker-clamav -CLAMAV_IMAGE_TAG: alpine diff --git a/ansible/host_vars/dev-loadtest-01/version.yml b/ansible/host_vars/dev-loadtest-01/version.yml index bd930e5cb..312b7a293 100644 --- a/ansible/host_vars/dev-loadtest-01/version.yml +++ b/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 diff --git a/ansible/host_vars/infra.dbildungscloud-01/version.yml b/ansible/host_vars/infra.dbildungscloud-01/version.yml index bd930e5cb..312b7a293 100644 --- a/ansible/host_vars/infra.dbildungscloud-01/version.yml +++ b/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 diff --git a/ansible/host_vars/prod-brb/version.yml b/ansible/host_vars/prod-brb/version.yml index bd930e5cb..312b7a293 100644 --- a/ansible/host_vars/prod-brb/version.yml +++ b/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 diff --git a/ansible/host_vars/prod-dbc/version.yml b/ansible/host_vars/prod-dbc/version.yml index bd930e5cb..312b7a293 100644 --- a/ansible/host_vars/prod-dbc/version.yml +++ b/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 diff --git a/ansible/host_vars/prod-nbc/version.yml b/ansible/host_vars/prod-nbc/version.yml index bd930e5cb..312b7a293 100644 --- a/ansible/host_vars/prod-nbc/version.yml +++ b/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 diff --git a/ansible/host_vars/prod-thr/version.yml b/ansible/host_vars/prod-thr/version.yml index bd930e5cb..312b7a293 100644 --- a/ansible/host_vars/prod-thr/version.yml +++ b/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 diff --git a/ansible/host_vars/ref-audit/cfg.yml b/ansible/host_vars/ref-audit/cfg.yml index 2f700034b..3ed9dfe44 100644 --- a/ansible/host_vars/ref-audit/cfg.yml +++ b/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/ diff --git a/ansible/host_vars/ref-audit/version.yml b/ansible/host_vars/ref-audit/version.yml index bd930e5cb..312b7a293 100644 --- a/ansible/host_vars/ref-audit/version.yml +++ b/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 diff --git a/ansible/host_vars/ref-brb/version.yml b/ansible/host_vars/ref-brb/version.yml index bd930e5cb..312b7a293 100644 --- a/ansible/host_vars/ref-brb/version.yml +++ b/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 diff --git a/ansible/host_vars/ref-dbc/version.yml b/ansible/host_vars/ref-dbc/version.yml index bd930e5cb..312b7a293 100644 --- a/ansible/host_vars/ref-dbc/version.yml +++ b/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 diff --git a/ansible/host_vars/ref-nbc/version.yml b/ansible/host_vars/ref-nbc/version.yml index bd930e5cb..312b7a293 100644 --- a/ansible/host_vars/ref-nbc/version.yml +++ b/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 diff --git a/ansible/host_vars/ref-thr/version.yml b/ansible/host_vars/ref-thr/version.yml index bd930e5cb..312b7a293 100644 --- a/ansible/host_vars/ref-thr/version.yml +++ b/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 diff --git a/ansible/host_vars/thr_host/cfg.yml b/ansible/host_vars/thr_host/cfg.yml index 56b1b20ed..79047842d 100644 --- a/ansible/host_vars/thr_host/cfg.yml +++ b/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 \ No newline at end of file +FEATURE_TSP_MIGRATION_ENABLED: "true" +TSP_API_CLIENT_BASE_URL: https://test.schulportal-thueringen.de/tip-ms/api diff --git a/ansible/roles/clamav/defaults/main.yml b/ansible/roles/clamav/defaults/main.yml new file mode 100644 index 000000000..37ab4ced3 --- /dev/null +++ b/ansible/roles/clamav/defaults/main.yml @@ -0,0 +1,2 @@ +CLAMAV_IMAGE_NAME: docker.io/clamav/clamav +CLAMAV_IMAGE_TAG: 1.4.1 diff --git a/ansible/roles/clamav/templates/configmap.yml.j2 b/ansible/roles/clamav/templates/configmap.yml.j2 index a1c56d3a1..b11db0e05 100644 --- a/ansible/roles/clamav/templates/configmap.yml.j2 +++ b/ansible/roles/clamav/templates/configmap.yml.j2 @@ -8,3 +8,4 @@ metadata: data: CLAMD_CONF_StreamMaxLength: 3000M + CLAMD_CONF_AlertBrokenExecutables: 'yes' diff --git a/ansible/roles/clamav/templates/deployment.yml.j2 b/ansible/roles/clamav/templates/deployment.yml.j2 index 5d05bebea..2b38b4d6d 100644 --- a/ansible/roles/clamav/templates/deployment.yml.j2 +++ b/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) }} diff --git a/ansible/roles/dof_rabbitmq/defaults/main.yaml b/ansible/roles/dof_rabbitmq/defaults/main.yaml index 947b208e1..9c3e095de 100644 --- a/ansible/roles/dof_rabbitmq/defaults/main.yaml +++ b/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" \ No newline at end of file diff --git a/ansible/roles/dof_rabbitmq/files/enable-feature-flags.sh b/ansible/roles/dof_rabbitmq/files/enable-feature-flags.sh new file mode 100755 index 000000000..60547c7d5 --- /dev/null +++ b/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 [--kubeconfig ] [--component-name ] [--container-name ] [--command ]" + exit 1 + ;; + esac +done + +if [[ -z "$NAMESPACE" ]]; then + echo "Error: --namespace is required" + echo "Usage: $0 --namespace [--kubeconfig ] [--component-name ] [--container-name ] [--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 diff --git a/ansible/roles/dof_rabbitmq/tasks/main.yml b/ansible/roles/dof_rabbitmq/tasks/main.yml index 8d7592ef8..2a5d24a37 100644 --- a/ansible/roles/dof_rabbitmq/tasks/main.yml +++ b/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 +