hpi-schul-cloud · MarvinOehlerkingCap · Aug 19, 2024 · Aug 1, 2024 · Aug 1, 2024 · Aug 6, 2024
diff --git a/.github/workflows/clean_workflow.yml b/.github/workflows/clean_workflow.yml
@@ -45,6 +45,7 @@ jobs:
          - schulcloud-client
          - nuxt-client
          - superhero-dashboard
+         - shd-client
          - schulcloud-calendar
          - antivirus_check_service
          - version-aggregator

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -51,6 +51,7 @@ jobs:
          - schulcloud-client
          - nuxt-client
          - superhero-dashboard
+         - shd-client
          - schulcloud-calendar
          - antivirus_check_service
          - version-aggregator

diff --git a/.github/workflows/host.yml b/.github/workflows/host.yml
@@ -85,6 +85,12 @@ jobs:
           path: repo/superhero-dashboard
           token: ${{ secrets.token }}
           ref: ${{ env.SUPERHERO_DASHBOARD_VERSION }}
+      - uses: actions/checkout@v4
+        with:
+          repository: hpi-schul-cloud/shd-client
+          path: repo/shd-client
+          token: ${{ secrets.token }}
+          ref: ${{ env.SHD_CLIENT_VERSION }}
       - uses: actions/checkout@v4
         with:
           repository: hpi-schul-cloud/h5p-staticfiles-server

diff --git a/ansible/group_vars/all/git_repos.yml b/ansible/group_vars/all/git_repos.yml
@@ -2,6 +2,7 @@ SCHULCLOUD_SERVER_REPO_NAME: schulcloud-server
 SCHULCLOUD_CLIENT_REPO_NAME: schulcloud-client
 NUXT_CLIENT_REPO_NAME: nuxt-client
 SUPERHERO_DASHBOARD_REPO_NAME: superhero-dashboard
+SHD_CLIENT_REPO_NAME: shd-client
 SCHULCLOUD_CALENDAR_REPO_NAME: schulcloud-calendar
 ANTIVIRUS_CHECK_SERVICE_REPO_NAME: antivirus-check-service
 VERSION_AGGREGATOR_REPO_NAME: version-aggregator

diff --git a/ansible/group_vars/infra/pod.yml b/ansible/group_vars/infra/pod.yml
@@ -19,4 +19,5 @@ RABBITMQ_REPLICAS: 1
 REDIS_REPLICAS: 1
 ROCKET_CHAT_REPLICAS: 1
 SHD_REPLICAS: 1
+SHD_CLIENT_REPLICAS: 1
 STORAGE_REPLICAS: 1
diff --git a/ansible/group_vars/loadtest/pod.yml b/ansible/group_vars/loadtest/pod.yml
@@ -19,4 +19,5 @@ RABBITMQ_REPLICAS: 1
 REDIS_REPLICAS: 1
 ROCKET_CHAT_REPLICAS: 1
 SHD_REPLICAS: 1
+SHD_CLIENT_REPLICAS: 1
 STORAGE_REPLICAS: 1
diff --git a/ansible/group_vars/production/resources.yml b/ansible/group_vars/production/resources.yml
@@ -83,6 +83,10 @@ SHD_CPU_LIMITS: "1000m"
 SHD_CPU_REQUESTS: "100m"
 SHD_MEMORY_LIMITS: "2Gi"
 SHD_MEMORY_REQUESTS: "2Gi"
+SHD_CLIENT_CPU_LIMITS: "1000m"
+SHD_CLIENT_CPU_REQUESTS: "100m"
+SHD_CLIENT_MEMORY_LIMITS: "2Gi"
+SHD_CLIENT_MEMORY_REQUESTS: "2Gi"
 STORAGE_CPU_LIMITS: "1000m"
 STORAGE_CPU_REQUESTS: "100m"
 STORAGE_MEMORY_LIMITS: "1Gi"

diff --git a/ansible/group_vars/reference/resources.yml b/ansible/group_vars/reference/resources.yml
@@ -83,6 +83,10 @@ SHD_CPU_LIMITS: "1000m"
 SHD_CPU_REQUESTS: "100m"
 SHD_MEMORY_LIMITS: "2Gi"
 SHD_MEMORY_REQUESTS: "2Gi"
+SHD_CLIENT_CPU_LIMITS: "1000m"
+SHD_CLIENT_CPU_REQUESTS: "100m"
+SHD_CLIENT_MEMORY_LIMITS: "2Gi"
+SHD_CLIENT_MEMORY_REQUESTS: "2Gi"
 STORAGE_CPU_LIMITS: "1000m"
 STORAGE_CPU_REQUESTS: "100m"
 STORAGE_MEMORY_LIMITS: "1Gi"

diff --git a/ansible/host_vars/dev-loadtest-01/version.yml b/ansible/host_vars/dev-loadtest-01/version.yml
@@ -2,6 +2,7 @@ SCHULCLOUD_SERVER_IMAGE_TAG: 32.41.3
 SCHULCLOUD_CLIENT_IMAGE_TAG: 32.41.0
 NUXT_CLIENT_IMAGE_TAG: 32.41.0
 SUPERHERO_DASHBOARD_IMAGE_TAG: 32.41.0
+SHD_CLIENT_IMAGE_TAG: 1.0.0
 SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.35.0
 ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.31.1
 VERSION_AGGREGATOR_IMAGE_TAG: 1.0.14

diff --git a/ansible/host_vars/infra.dbildungscloud-01/version.yml b/ansible/host_vars/infra.dbildungscloud-01/version.yml
@@ -2,6 +2,7 @@ SCHULCLOUD_SERVER_IMAGE_TAG: 32.41.3
 SCHULCLOUD_CLIENT_IMAGE_TAG: 32.41.0
 NUXT_CLIENT_IMAGE_TAG: 32.41.0
 SUPERHERO_DASHBOARD_IMAGE_TAG: 32.41.0
+SHD_CLIENT_IMAGE_TAG: 1.0.0
 SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.35.0
 ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.31.1
 VERSION_AGGREGATOR_IMAGE_TAG: 1.0.14

diff --git a/ansible/host_vars/prod-brb/pod.yml b/ansible/host_vars/prod-brb/pod.yml
@@ -16,6 +16,7 @@ RABBITMQ_REPLICAS: 3
 ROCKET_CHAT_REPLICAS: 10
 REDIS_REPLICAS: 1
 SHD_REPLICAS: 1
+SHD_CLIENT_REPLICAS: 1
 API_FILE_STORAGE_REPLICAS: 5
 AMQP_FILE_STORAGE_REPLICAS: 5
 ERWINIDM_REPLICAS: 3

diff --git a/ansible/host_vars/prod-brb/version.yml b/ansible/host_vars/prod-brb/version.yml
@@ -2,6 +2,7 @@ SCHULCLOUD_SERVER_IMAGE_TAG: 32.41.3
 SCHULCLOUD_CLIENT_IMAGE_TAG: 32.41.0
 NUXT_CLIENT_IMAGE_TAG: 32.41.0
 SUPERHERO_DASHBOARD_IMAGE_TAG: 32.41.0
+SHD_CLIENT_IMAGE_TAG: 1.0.0
 SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.35.0
 ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.31.1
 VERSION_AGGREGATOR_IMAGE_TAG: 1.0.14

diff --git a/ansible/host_vars/prod-dbc/pod.yml b/ansible/host_vars/prod-dbc/pod.yml
@@ -16,6 +16,7 @@ RABBITMQ_REPLICAS: 3
 REDIS_REPLICAS: 1
 ROCKET_CHAT_REPLICAS: 5
 SHD_REPLICAS: 1
+SHD_CLIENT_REPLICAS: 1
 STORAGE_REPLICAS: 1
 API_FILE_STORAGE_REPLICAS: 5
 AMQP_FILE_STORAGE_REPLICAS: 5

diff --git a/ansible/host_vars/prod-dbc/version.yml b/ansible/host_vars/prod-dbc/version.yml
@@ -2,6 +2,7 @@ SCHULCLOUD_SERVER_IMAGE_TAG: 32.41.3
 SCHULCLOUD_CLIENT_IMAGE_TAG: 32.41.0
 NUXT_CLIENT_IMAGE_TAG: 32.41.0
 SUPERHERO_DASHBOARD_IMAGE_TAG: 32.41.0
+SHD_CLIENT_IMAGE_TAG: 1.0.0
 SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.35.0
 ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.31.1
 VERSION_AGGREGATOR_IMAGE_TAG: 1.0.14

diff --git a/ansible/host_vars/prod-nbc/pod.yml b/ansible/host_vars/prod-nbc/pod.yml
@@ -17,6 +17,7 @@ RABBITMQ_REPLICAS: 3
 REDIS_REPLICAS: 1
 ROCKET_CHAT_REPLICAS: 5
 SHD_REPLICAS: 1
+SHD_CLIENT_REPLICAS: 1
 API_FILE_STORAGE_REPLICAS: 5
 AMQP_FILE_STORAGE_REPLICAS: 5
 ERWINIDM_REPLICAS: 3

diff --git a/ansible/host_vars/prod-nbc/version.yml b/ansible/host_vars/prod-nbc/version.yml
@@ -2,6 +2,7 @@ SCHULCLOUD_SERVER_IMAGE_TAG: 32.41.3
 SCHULCLOUD_CLIENT_IMAGE_TAG: 32.41.0
 NUXT_CLIENT_IMAGE_TAG: 32.41.0
 SUPERHERO_DASHBOARD_IMAGE_TAG: 32.41.0
+SHD_CLIENT_IMAGE_TAG: 1.0.0
 SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.35.0
 ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.31.1
 VERSION_AGGREGATOR_IMAGE_TAG: 1.0.14

diff --git a/ansible/host_vars/prod-thr/pod.yml b/ansible/host_vars/prod-thr/pod.yml
@@ -18,6 +18,7 @@ RABBITMQ_REPLICAS: 3
 REDIS_REPLICAS: 1
 ROCKET_CHAT_REPLICAS: 7
 SHD_REPLICAS: 1
+SHD_CLIENT_REPLICAS: 1
 API_FILE_STORAGE_REPLICAS: 10
 AMQP_FILE_STORAGE_REPLICAS: 5
 ERWINIDM_REPLICAS: 3

diff --git a/ansible/host_vars/prod-thr/version.yml b/ansible/host_vars/prod-thr/version.yml
@@ -2,6 +2,7 @@ SCHULCLOUD_SERVER_IMAGE_TAG: 32.41.3
 SCHULCLOUD_CLIENT_IMAGE_TAG: 32.41.0
 NUXT_CLIENT_IMAGE_TAG: 32.41.0
 SUPERHERO_DASHBOARD_IMAGE_TAG: 32.41.0
+SHD_CLIENT_IMAGE_TAG: 1.0.0
 SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.35.0
 ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.31.1
 VERSION_AGGREGATOR_IMAGE_TAG: 1.0.14

diff --git a/ansible/host_vars/ref-audit/pod.yml b/ansible/host_vars/ref-audit/pod.yml
@@ -18,6 +18,7 @@ RABBITMQ_REPLICAS: 3
 REDIS_REPLICAS: 1
 ROCKET_CHAT_REPLICAS: 1
 SHD_REPLICAS: 1
+SHD_CLIENT_REPLICAS: 1
 STORAGE_REPLICAS: 1
 ERWINIDM_REPLICAS: 3
 API_FILE_STORAGE_REPLICAS: 3

diff --git a/ansible/host_vars/ref-audit/version.yml b/ansible/host_vars/ref-audit/version.yml
@@ -2,6 +2,7 @@ SCHULCLOUD_SERVER_IMAGE_TAG: 32.41.3
 SCHULCLOUD_CLIENT_IMAGE_TAG: 32.41.0
 NUXT_CLIENT_IMAGE_TAG: 32.41.0
 SUPERHERO_DASHBOARD_IMAGE_TAG: 32.41.0
+SHD_CLIENT_IMAGE_TAG: 1.0.0
 SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.35.0
 ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.31.1
 VERSION_AGGREGATOR_IMAGE_TAG: 1.0.14

diff --git a/ansible/host_vars/ref-brb/pod.yml b/ansible/host_vars/ref-brb/pod.yml
@@ -19,6 +19,7 @@ RABBITMQ_REPLICAS: 3
 REDIS_REPLICAS: 1
 ROCKET_CHAT_REPLICAS: 1
 SHD_REPLICAS: 1
+SHD_CLIENT_REPLICAS: 1
 STORAGE_REPLICAS: 1
 ERWINIDM_REPLICAS: 3
 API_FILE_STORAGE_REPLICAS: 3

diff --git a/ansible/host_vars/ref-brb/version.yml b/ansible/host_vars/ref-brb/version.yml
@@ -2,6 +2,7 @@ SCHULCLOUD_SERVER_IMAGE_TAG: 32.41.3
 SCHULCLOUD_CLIENT_IMAGE_TAG: 32.41.0
 NUXT_CLIENT_IMAGE_TAG: 32.41.0
 SUPERHERO_DASHBOARD_IMAGE_TAG: 32.41.0
+SHD_CLIENT_IMAGE_TAG: 1.0.0
 SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.35.0
 ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.31.1
 VERSION_AGGREGATOR_IMAGE_TAG: 1.0.14

diff --git a/ansible/host_vars/ref-dbc/pod.yml b/ansible/host_vars/ref-dbc/pod.yml
@@ -19,6 +19,7 @@ RABBITMQ_REPLICAS: 3
 REDIS_REPLICAS: 1
 ROCKET_CHAT_REPLICAS: 1
 SHD_REPLICAS: 1
+SHD_CLIENT_REPLICAS: 1
 STORAGE_REPLICAS: 1
 ERWINIDM_REPLICAS: 3
 API_FILE_STORAGE_REPLICAS: 3

diff --git a/ansible/host_vars/ref-dbc/version.yml b/ansible/host_vars/ref-dbc/version.yml
@@ -2,6 +2,7 @@ SCHULCLOUD_SERVER_IMAGE_TAG: 32.41.3
 SCHULCLOUD_CLIENT_IMAGE_TAG: 32.41.0
 NUXT_CLIENT_IMAGE_TAG: 32.41.0
 SUPERHERO_DASHBOARD_IMAGE_TAG: 32.41.0
+SHD_CLIENT_IMAGE_TAG: 1.0.0
 SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.35.0
 ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.31.1
 VERSION_AGGREGATOR_IMAGE_TAG: 1.0.14

diff --git a/ansible/host_vars/ref-nbc/pod.yml b/ansible/host_vars/ref-nbc/pod.yml
@@ -20,6 +20,7 @@ RABBITMQ_REPLICAS: 3
 REDIS_REPLICAS: 1
 ROCKET_CHAT_REPLICAS: 1
 SHD_REPLICAS: 1
+SHD_CLIENT_REPLICAS: 1
 STORAGE_REPLICAS: 1
 ERWINIDM_REPLICAS: 3
 API_FILE_STORAGE_REPLICAS: 3

diff --git a/ansible/host_vars/ref-nbc/version.yml b/ansible/host_vars/ref-nbc/version.yml
@@ -2,6 +2,7 @@ SCHULCLOUD_SERVER_IMAGE_TAG: 32.41.3
 SCHULCLOUD_CLIENT_IMAGE_TAG: 32.41.0
 NUXT_CLIENT_IMAGE_TAG: 32.41.0
 SUPERHERO_DASHBOARD_IMAGE_TAG: 32.41.0
+SHD_CLIENT_IMAGE_TAG: 1.0.0
 SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.35.0
 ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.31.1
 VERSION_AGGREGATOR_IMAGE_TAG: 1.0.14

diff --git a/ansible/host_vars/ref-thr/pod.yml b/ansible/host_vars/ref-thr/pod.yml
@@ -18,6 +18,7 @@ RABBITMQ_REPLICAS: 3
 REDIS_REPLICAS: 1
 ROCKET_CHAT_REPLICAS: 1
 SHD_REPLICAS: 1
+SHD_CLIENT_REPLICAS: 1
 STORAGE_REPLICAS: 1
 ERWINIDM_REPLICAS: 3
 API_H5P_EDITOR_REPLICAS: 1

diff --git a/ansible/host_vars/ref-thr/version.yml b/ansible/host_vars/ref-thr/version.yml
@@ -2,6 +2,7 @@ SCHULCLOUD_SERVER_IMAGE_TAG: 32.41.3
 SCHULCLOUD_CLIENT_IMAGE_TAG: 32.41.0
 NUXT_CLIENT_IMAGE_TAG: 32.41.0
 SUPERHERO_DASHBOARD_IMAGE_TAG: 32.41.0
+SHD_CLIENT_IMAGE_TAG: 1.0.0
 SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.35.0
 ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.31.1
 VERSION_AGGREGATOR_IMAGE_TAG: 1.0.14

diff --git a/ansible/playbook.yml b/ansible/playbook.yml
@@ -32,6 +32,7 @@
     - schulcloud-client-core
     - nuxt-client-core
     - superhero-dashboard
+    - shd-client-core
     - schulcloud-calendar-core
     - schulcloud-calendar-init
     - h5p-library-management

diff --git a/ansible/playbook_rollout.yml b/ansible/playbook_rollout.yml
@@ -40,6 +40,7 @@
     - role: h5p-proxy
     - role: h5p-staticfiles-server-core
     - role: superhero-dashboard
+    - role: shd-client-core
     - role: schulcloud-calendar-core
     - role: schulcloud-calendar-init
     - role: antivirus_check_service

diff --git a/ansible/roles/namespace-activator-scaled-objects/defaults/main.yml b/ansible/roles/namespace-activator-scaled-objects/defaults/main.yml
@@ -25,6 +25,7 @@ deployments_for_scaled_objects:
   - oidcmock-deployment
   - rocketchat-deployment
   - shd-deployment
+  - shd-client-deployment
   - version-aggregator-deployment
   - tldraw-deployment
   - tldraw-client-deployment