Skip to content

Commit

Permalink
Merge branch 'main' into EW-694
Browse files Browse the repository at this point in the history
  • Loading branch information
psachmann authored Jan 31, 2024
2 parents ddd56f0 + d82543a commit f5022fa
Show file tree
Hide file tree
Showing 19 changed files with 68 additions and 61 deletions.
2 changes: 1 addition & 1 deletion ansible/group_vars/all/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -984,7 +984,7 @@ configuration_all:
client: false
nuxtclient: false
MIGRATION_WIZARD_DOCUMENTATION_LINK:
value: "https://docs.dbildungscloud.de/x/VAEbDg?frameable=true"
value: "https://docs.dbildungscloud.de/pages/viewpage.action?pageId=236650836&frameable=true"
server: true
client: false
nuxtclient: false
4 changes: 2 additions & 2 deletions ansible/group_vars/all/keda.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
KEDA_ENABLED: false
SCALED_PREVIEW_GENERATOR_ENABLED: false
KEDA_ENABLED: true
SCALED_PREVIEW_GENERATOR_ENABLED: true
2 changes: 1 addition & 1 deletion ansible/group_vars/brb/instance_cfg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ FEATURE_CONSENT_NECESSARY: "false"
# ADMIN TABLES
ADMIN_TABLES_DISPLAY_CONSENT_COLUMN: "true"
# MIGRATION
MIGRATION_WIZARD_DOCUMENTATION_LINK: "https://docs.dbildungscloud.de/x/DwK6Cw?frameable=true"
MIGRATION_WIZARD_DOCUMENTATION_LINK: "https://docs.dbildungscloud.de/pages/viewpage.action?pageId=196739599&frameable=true"

## SERVER
AWS_REGION: eu-central-1
Expand Down
1 change: 1 addition & 0 deletions ansible/group_vars/develop/keda.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
KEDA_ENABLED: true
#can not be activated yet on dev: https://github:com/kedacore/keda/issues/5442:
SCALED_PREVIEW_GENERATOR_ENABLED: false
2 changes: 1 addition & 1 deletion ansible/group_vars/nbc/instance_cfg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ TEACHER_STUDENT_VISIBILITY__IS_VISIBLE: "true"
FEATURE_CONSENT_NECESSARY: "false"

# MIGRATION
MIGRATION_WIZARD_DOCUMENTATION_LINK: "https://docs.dbildungscloud.de/x/uANiEg?frameable=true"
MIGRATION_WIZARD_DOCUMENTATION_LINK: "https://docs.dbildungscloud.de/pages/viewpage.action?pageId=308413368&frameable=true"
# ADMIN TABLES
ADMIN_TABLES_DISPLAY_CONSENT_COLUMN: "false"
# Zusätzlich freigegebene routen
Expand Down
11 changes: 6 additions & 5 deletions ansible/host_vars/dev-loadtest-01/version.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
SCHULCLOUD_SERVER_IMAGE_TAG: 32.22.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.22.0
NUXT_CLIENT_IMAGE_TAG: 32.22.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.22.0
SCHULCLOUD_SERVER_IMAGE_TAG: 32.24.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.24.0
NUXT_CLIENT_IMAGE_TAG: 32.24.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.24.0
SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.21.0
ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.21.0
VERSION_AGGREGATOR_IMAGE_TAG: 1.0.11
H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.5
TLDRAW_CLIENT_IMAGE_TAG: 1.0.5
TLDRAW_CLIENT_IMAGE_TAG: 1.0.6

10 changes: 5 additions & 5 deletions ansible/host_vars/infra.dbildungscloud-01/version.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
SCHULCLOUD_SERVER_IMAGE_TAG: 32.22.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.22.0
NUXT_CLIENT_IMAGE_TAG: 32.22.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.22.0
SCHULCLOUD_SERVER_IMAGE_TAG: 32.24.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.24.0
NUXT_CLIENT_IMAGE_TAG: 32.24.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.24.0
SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.21.0
ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.21.0
VERSION_AGGREGATOR_IMAGE_TAG: 1.0.11
H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.5
TLDRAW_CLIENT_IMAGE_TAG: 1.0.5
TLDRAW_CLIENT_IMAGE_TAG: 1.0.6
10 changes: 5 additions & 5 deletions ansible/host_vars/prod-brb/version.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
SCHULCLOUD_SERVER_IMAGE_TAG: 32.22.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.22.0
NUXT_CLIENT_IMAGE_TAG: 32.22.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.22.0
SCHULCLOUD_SERVER_IMAGE_TAG: 32.24.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.24.0
NUXT_CLIENT_IMAGE_TAG: 32.24.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.24.0
SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.21.0
ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.21.0
VERSION_AGGREGATOR_IMAGE_TAG: 1.0.11
H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.5
TLDRAW_CLIENT_IMAGE_TAG: 1.0.5
TLDRAW_CLIENT_IMAGE_TAG: 1.0.6
10 changes: 5 additions & 5 deletions ansible/host_vars/prod-dbc/version.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
SCHULCLOUD_SERVER_IMAGE_TAG: 32.22.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.22.0
NUXT_CLIENT_IMAGE_TAG: 32.22.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.22.0
SCHULCLOUD_SERVER_IMAGE_TAG: 32.24.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.24.0
NUXT_CLIENT_IMAGE_TAG: 32.24.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.24.0
SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.21.0
ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.21.0
VERSION_AGGREGATOR_IMAGE_TAG: 1.0.11
H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.5
TLDRAW_CLIENT_IMAGE_TAG: 1.0.5
TLDRAW_CLIENT_IMAGE_TAG: 1.0.6
4 changes: 3 additions & 1 deletion ansible/host_vars/prod-nbc/cfg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ FEATURE_CTL_TOOLS_COPY_ENABLED: "false"
FEATURE_IDENTITY_MANAGEMENT_STORE_ENABLED: "false"

# Migration wizard
FEATURE_USER_MIGRATION_SYSTEM_ID: "646df8f63bcc1a27c52af131"
FEATURE_SHOW_MIGRATION_WIZARD: "false"
FEATURE_USER_MIGRATION_ENABLED: "false"
#FEATURE_USER_MIGRATION_SYSTEM_ID: "646df8f63bcc1a27c52af131"

# Bettermarks urls
BETTERMARKS_APPS_URL: "https://apps.bettermarks.niedersachsen.cloud"
Expand Down
10 changes: 5 additions & 5 deletions ansible/host_vars/prod-nbc/version.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
SCHULCLOUD_SERVER_IMAGE_TAG: 32.22.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.22.0
NUXT_CLIENT_IMAGE_TAG: 32.22.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.22.0
SCHULCLOUD_SERVER_IMAGE_TAG: 32.24.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.24.0
NUXT_CLIENT_IMAGE_TAG: 32.24.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.24.0
SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.21.0
ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.21.0
VERSION_AGGREGATOR_IMAGE_TAG: 1.0.11
H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.5
TLDRAW_CLIENT_IMAGE_TAG: 1.0.5
TLDRAW_CLIENT_IMAGE_TAG: 1.0.6
10 changes: 5 additions & 5 deletions ansible/host_vars/prod-thr/version.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
SCHULCLOUD_SERVER_IMAGE_TAG: 32.22.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.22.0
NUXT_CLIENT_IMAGE_TAG: 32.22.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.22.0
SCHULCLOUD_SERVER_IMAGE_TAG: 32.24.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.24.0
NUXT_CLIENT_IMAGE_TAG: 32.24.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.24.0
SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.21.0
ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.21.0
VERSION_AGGREGATOR_IMAGE_TAG: 1.0.11
H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.5
TLDRAW_CLIENT_IMAGE_TAG: 1.0.5
TLDRAW_CLIENT_IMAGE_TAG: 1.0.6
8 changes: 4 additions & 4 deletions ansible/host_vars/ref-audit/version.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
SCHULCLOUD_SERVER_IMAGE_TAG: 32.22.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.22.0
NUXT_CLIENT_IMAGE_TAG: 32.22.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.22.0
SCHULCLOUD_SERVER_IMAGE_TAG: 32.24.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.24.0
NUXT_CLIENT_IMAGE_TAG: 32.24.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.24.0
SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.21.0
ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.21.0
VERSION_AGGREGATOR_IMAGE_TAG: 1.0.11
Expand Down
10 changes: 5 additions & 5 deletions ansible/host_vars/ref-brb/version.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
SCHULCLOUD_SERVER_IMAGE_TAG: 32.22.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.22.0
NUXT_CLIENT_IMAGE_TAG: 32.22.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.22.0
SCHULCLOUD_SERVER_IMAGE_TAG: 32.24.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.24.0
NUXT_CLIENT_IMAGE_TAG: 32.24.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.24.0
SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.21.0
ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.21.0
VERSION_AGGREGATOR_IMAGE_TAG: 1.0.11
H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.5
TLDRAW_CLIENT_IMAGE_TAG: 1.0.5
TLDRAW_CLIENT_IMAGE_TAG: 1.0.6
10 changes: 5 additions & 5 deletions ansible/host_vars/ref-dbc/version.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
SCHULCLOUD_SERVER_IMAGE_TAG: 32.22.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.22.0
NUXT_CLIENT_IMAGE_TAG: 32.22.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.22.0
SCHULCLOUD_SERVER_IMAGE_TAG: 32.24.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.24.0
NUXT_CLIENT_IMAGE_TAG: 32.24.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.24.0
SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.21.0
ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.21.0
VERSION_AGGREGATOR_IMAGE_TAG: 1.0.11
H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.5
TLDRAW_CLIENT_IMAGE_TAG: 1.0.5
TLDRAW_CLIENT_IMAGE_TAG: 1.0.6
4 changes: 3 additions & 1 deletion ansible/host_vars/ref-nbc/cfg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ BETTERMARKS_APPS_URL: "https://apps.bettermarks.staging.niedersachsen.dbildungsc
BETTERMARKS_SCHOOL_URL: "https://school.bettermarks.staging.niedersachsen.dbildungscloud.org"

# Migration wizard
FEATURE_USER_MIGRATION_SYSTEM_ID: "62dab6401c473a01956a0d7d"
FEATURE_SHOW_MIGRATION_WIZARD: "false"
FEATURE_USER_MIGRATION_ENABLED: "false"
# FEATURE_USER_MIGRATION_SYSTEM_ID: "62dab6401c473a01956a0d7d"

FEATURE_CTL_TOOLS_COPY_ENABLED: "false"
10 changes: 5 additions & 5 deletions ansible/host_vars/ref-nbc/version.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
SCHULCLOUD_SERVER_IMAGE_TAG: 32.22.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.22.0
NUXT_CLIENT_IMAGE_TAG: 32.22.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.22.0
SCHULCLOUD_SERVER_IMAGE_TAG: 32.24.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.24.0
NUXT_CLIENT_IMAGE_TAG: 32.24.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.24.0
SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.21.0
ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.21.0
VERSION_AGGREGATOR_IMAGE_TAG: 1.0.11
H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.5
TLDRAW_CLIENT_IMAGE_TAG: 1.0.5
TLDRAW_CLIENT_IMAGE_TAG: 1.0.6
10 changes: 5 additions & 5 deletions ansible/host_vars/ref-thr/version.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
SCHULCLOUD_SERVER_IMAGE_TAG: 32.22.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.22.0
NUXT_CLIENT_IMAGE_TAG: 32.22.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.22.0
SCHULCLOUD_SERVER_IMAGE_TAG: 32.24.0
SCHULCLOUD_CLIENT_IMAGE_TAG: 32.24.0
NUXT_CLIENT_IMAGE_TAG: 32.24.0
SUPERHERO_DASHBOARD_IMAGE_TAG: 32.24.0
SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.21.0
ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.21.0
VERSION_AGGREGATOR_IMAGE_TAG: 1.0.11
H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.5
TLDRAW_CLIENT_IMAGE_TAG: 1.0.5
TLDRAW_CLIENT_IMAGE_TAG: 1.0.6
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ deployments_for_scaled_objects:
- tldraw-deployment
- tldraw-client-deployment
- mailcatcher-deployment
- maildrop-deployment

0 comments on commit f5022fa

Please sign in to comment.