Merge branch 'main' into BC-4256-Integration-tldraw

hpi-schul-cloud · Nov 2, 2023 · 42d1221 · 42d1221
2 parents 0420836 + 46788a4
commit 42d1221
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 44 deletions.
diff --git a/ansible/roles/schulcloud-server-core/tasks/main.yml b/ansible/roles/schulcloud-server-core/tasks/main.yml
@@ -92,12 +92,14 @@
       template: api-fwu-deployment.yml.j2
     when: FEATURE_FWU_CONTENT_ENABLED is defined and FEATURE_FWU_CONTENT_ENABLED|bool
 
-  - name: Fwu Learning Contents Ingress
+  - name: Fwu Learning Contents Ingress Remove
     kubernetes.core.k8s:
       kubeconfig: ~/.kube/config
       namespace: "{{ NAMESPACE }}"
-      template: api-fwu-ingress.yml.j2
-      apply: yes
+      state: absent
+      api_version: networking.k8s.io/v1
+      kind: Ingress
+      name: "{{ NAMESPACE }}-api-fwu-ingress"
     when: FEATURE_FWU_CONTENT_ENABLED is defined and FEATURE_FWU_CONTENT_ENABLED|bool
 
   - name: Delete Files CronJob

diff --git a/ansible/roles/schulcloud-server-core/templates/api-fwu-ingress.yml.j2 b/ansible/roles/schulcloud-server-core/templates/api-fwu-ingress.yml.j2