Skip to content

Commit

Permalink
Revert "N21-2014 Setup new SHD client (#926)"
Browse files Browse the repository at this point in the history
This reverts commit 34b3371
  • Loading branch information
mrikallab committed Feb 3, 2025
1 parent 10469c0 commit 39552e3
Show file tree
Hide file tree
Showing 31 changed files with 0 additions and 42 deletions.
1 change: 0 additions & 1 deletion .github/workflows/clean_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ jobs:
- schulcloud-client
- nuxt-client
- superhero-dashboard
- shd-client
- schulcloud-calendar
- antivirus_check_service
- version-aggregator
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ jobs:
- schulcloud-client
- nuxt-client
- superhero-dashboard
- shd-client
- schulcloud-calendar
- antivirus_check_service
- version-aggregator
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/host.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,6 @@ 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
Expand Down
1 change: 0 additions & 1 deletion ansible/group_vars/all/git_repos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ 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
Expand Down
1 change: 0 additions & 1 deletion ansible/group_vars/infra/pod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@ RABBITMQ_REPLICAS: 1
REDIS_REPLICAS: 1
ROCKET_CHAT_REPLICAS: 1
SHD_REPLICAS: 1
SHD_CLIENT_REPLICAS: 1
STORAGE_REPLICAS: 1
1 change: 0 additions & 1 deletion ansible/group_vars/loadtest/pod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@ RABBITMQ_REPLICAS: 1
REDIS_REPLICAS: 1
ROCKET_CHAT_REPLICAS: 1
SHD_REPLICAS: 1
SHD_CLIENT_REPLICAS: 1
STORAGE_REPLICAS: 1
4 changes: 0 additions & 4 deletions ansible/group_vars/production/resources.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,6 @@ 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"
Expand Down
4 changes: 0 additions & 4 deletions ansible/group_vars/reference/resources.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,6 @@ 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"
Expand Down
1 change: 0 additions & 1 deletion ansible/host_vars/dev-loadtest-01/version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ SCHULCLOUD_SERVER_IMAGE_TAG: 33.0.1
SCHULCLOUD_CLIENT_IMAGE_TAG: 33.0.0
NUXT_CLIENT_IMAGE_TAG: 33.0.1
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
Expand Down
1 change: 0 additions & 1 deletion ansible/host_vars/infra.dbildungscloud-01/version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ SCHULCLOUD_SERVER_IMAGE_TAG: 33.0.1
SCHULCLOUD_CLIENT_IMAGE_TAG: 33.0.0
NUXT_CLIENT_IMAGE_TAG: 33.0.1
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
Expand Down
1 change: 0 additions & 1 deletion ansible/host_vars/prod-brb/pod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ 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
Expand Down
1 change: 0 additions & 1 deletion ansible/host_vars/prod-brb/version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ SCHULCLOUD_SERVER_IMAGE_TAG: 33.0.1
SCHULCLOUD_CLIENT_IMAGE_TAG: 33.0.0
NUXT_CLIENT_IMAGE_TAG: 33.0.1
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
Expand Down
1 change: 0 additions & 1 deletion ansible/host_vars/prod-dbc/pod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ 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
Expand Down
1 change: 0 additions & 1 deletion ansible/host_vars/prod-dbc/version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ SCHULCLOUD_SERVER_IMAGE_TAG: 33.0.1
SCHULCLOUD_CLIENT_IMAGE_TAG: 33.0.0
NUXT_CLIENT_IMAGE_TAG: 33.0.1
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
Expand Down
1 change: 0 additions & 1 deletion ansible/host_vars/prod-nbc/pod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ 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
Expand Down
1 change: 0 additions & 1 deletion ansible/host_vars/prod-nbc/version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ SCHULCLOUD_SERVER_IMAGE_TAG: 33.0.1
SCHULCLOUD_CLIENT_IMAGE_TAG: 33.0.0
NUXT_CLIENT_IMAGE_TAG: 33.0.1
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
Expand Down
1 change: 0 additions & 1 deletion ansible/host_vars/prod-thr/pod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ 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
Expand Down
1 change: 0 additions & 1 deletion ansible/host_vars/prod-thr/version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ SCHULCLOUD_SERVER_IMAGE_TAG: 33.0.1
SCHULCLOUD_CLIENT_IMAGE_TAG: 33.0.0
NUXT_CLIENT_IMAGE_TAG: 33.0.1
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
Expand Down
1 change: 0 additions & 1 deletion ansible/host_vars/ref-audit/pod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ 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
Expand Down
1 change: 0 additions & 1 deletion ansible/host_vars/ref-audit/version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ SCHULCLOUD_SERVER_IMAGE_TAG: 33.0.1
SCHULCLOUD_CLIENT_IMAGE_TAG: 33.0.0
NUXT_CLIENT_IMAGE_TAG: 33.0.1
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
Expand Down
1 change: 0 additions & 1 deletion ansible/host_vars/ref-brb/pod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ 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
Expand Down
1 change: 0 additions & 1 deletion ansible/host_vars/ref-brb/version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ SCHULCLOUD_SERVER_IMAGE_TAG: 33.0.1
SCHULCLOUD_CLIENT_IMAGE_TAG: 33.0.0
NUXT_CLIENT_IMAGE_TAG: 33.0.1
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
Expand Down
1 change: 0 additions & 1 deletion ansible/host_vars/ref-dbc/pod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ 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
Expand Down
1 change: 0 additions & 1 deletion ansible/host_vars/ref-dbc/version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ SCHULCLOUD_SERVER_IMAGE_TAG: 33.0.1
SCHULCLOUD_CLIENT_IMAGE_TAG: 33.0.0
NUXT_CLIENT_IMAGE_TAG: 33.0.1
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
Expand Down
1 change: 0 additions & 1 deletion ansible/host_vars/ref-nbc/pod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ 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
Expand Down
1 change: 0 additions & 1 deletion ansible/host_vars/ref-nbc/version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ SCHULCLOUD_SERVER_IMAGE_TAG: 33.0.1
SCHULCLOUD_CLIENT_IMAGE_TAG: 33.0.0
NUXT_CLIENT_IMAGE_TAG: 33.0.1
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
Expand Down
1 change: 0 additions & 1 deletion ansible/host_vars/ref-thr/pod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ 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
Expand Down
1 change: 0 additions & 1 deletion ansible/host_vars/ref-thr/version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ SCHULCLOUD_SERVER_IMAGE_TAG: 33.0.1
SCHULCLOUD_CLIENT_IMAGE_TAG: 33.0.0
NUXT_CLIENT_IMAGE_TAG: 33.0.1
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
Expand Down
1 change: 0 additions & 1 deletion ansible/playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
- schulcloud-client-core
- nuxt-client-core
- superhero-dashboard
- shd-client-core
- schulcloud-calendar-core
- schulcloud-calendar-init
- h5p-library-management
Expand Down
1 change: 0 additions & 1 deletion ansible/playbook_rollout.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
- role: clammit
- role: h5p-staticfiles-server-core
- role: superhero-dashboard
- role: shd-client-core
- role: schulcloud-calendar-core
- role: schulcloud-calendar-init
- role: antivirus_check_service
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ deployments_for_scaled_objects:
- name: oidcmock-deployment
- name: rocketchat-deployment
- name: shd-deployment
- name: shd-client-deployment
- name: version-aggregator-deployment
- name: mailcatcher-deployment
- name: maildrop-deployment
Expand Down

0 comments on commit 39552e3

Please sign in to comment.