Merge branch 'main' into EW-777

ansible/roles/common-cartridge/tasks/main.yml

@@ -52,11 +52,11 @@
     - service
 
 # This is a testing route and will not be deployed
-# - name: Ingress
-#   kubernetes.core.k8s:
-#     kubeconfig: ~/.kube/config
-#     namespace: "{{ NAMESPACE }}"
-#     template: ingress.yml.j2
-#   when: WITH_COMMON_CARTRIDGE is defined and WITH_COMMON_CARTRIDGE|bool
-#   tags:
-#     - ingress
+- name: Ingress
+  kubernetes.core.k8s:
+    kubeconfig: ~/.kube/config
+    namespace: "{{ NAMESPACE }}"
+    template: ingress.yml.j2
+  when: WITH_COMMON_CARTRIDGE is defined and WITH_COMMON_CARTRIDGE|bool
+  tags:
+    - ingress

ansible/roles/schulcloud-server-core/tasks/main.yml

@@ -222,15 +222,6 @@
     tags:
       - cronjob
 
-  - name: Delete Tldraw Files CronJob
-    kubernetes.core.k8s:
-      kubeconfig: ~/.kube/config
-      namespace: "{{ NAMESPACE }}"
-      template: tldraw-delete-files-cronjob.yml.j2
-      state: "{{ 'present' if WITH_TLDRAW else 'absent'}}"
-    tags:
-      - cronjob
-
   - name: Data deletion trigger CronJob
     kubernetes.core.k8s:
       kubeconfig: ~/.kube/config
@@ -349,66 +340,6 @@
     tags:
       - prometheus
 
-  - name: External Secret for TlDraw Server
-    kubernetes.core.k8s:
-      kubeconfig: ~/.kube/config
-      namespace: "{{ NAMESPACE }}"
-      template: tldraw-server-external-secret.yml.j2
-      state: "{{ 'present' if WITH_BRANCH_MONGO_DB_MANAGEMENT is defined and WITH_BRANCH_MONGO_DB_MANAGEMENT|bool else 'absent'}}"
-    when:
-      - EXTERNAL_SECRETS_OPERATOR is defined and EXTERNAL_SECRETS_OPERATOR|bool 
-      - WITH_TLDRAW is defined and WITH_TLDRAW|bool
-    tags:
-      - 1password
-
-  - name: TlDraw server Secret (from 1Password)
-    kubernetes.core.k8s:
-      kubeconfig: ~/.kube/config
-      namespace: "{{ NAMESPACE }}"
-      template: tldraw-server-onepassword.yml.j2
-    when:
-     - ONEPASSWORD_OPERATOR is defined and ONEPASSWORD_OPERATOR|bool
-     - WITH_TLDRAW is defined and WITH_TLDRAW|bool
-    tags:
-      - 1password
-
-  - name: TlDraw server deployment
-    kubernetes.core.k8s:
-      kubeconfig: ~/.kube/config
-      namespace: "{{ NAMESPACE }}"
-      template: tldraw-deployment.yml.j2
-      state: "{{ 'present' if WITH_TLDRAW else 'absent'}}"
-    tags:
-      - deployment
-
-  - name: TlDraw server service
-    kubernetes.core.k8s:
-      kubeconfig: ~/.kube/config
-      namespace: "{{ NAMESPACE }}"
-      template: tldraw-server-svc.yml.j2
-    when: WITH_TLDRAW is defined and WITH_TLDRAW|bool
-    tags:
-      - service
-
-  - name: Tldraw ingress
-    kubernetes.core.k8s:
-      kubeconfig: ~/.kube/config
-      namespace: "{{ NAMESPACE }}"
-      template: tldraw-ingress.yml.j2
-      apply: yes
-    when: WITH_TLDRAW is defined and WITH_TLDRAW|bool
-    tags:
-      - ingress
-
-  - name: TldrawServiceMonitor
-    kubernetes.core.k8s:
-      kubeconfig: ~/.kube/config
-      namespace: "{{ NAMESPACE }}"
-      template: tldraw-svc-monitor.yml.j2
-      state: "{{ 'present' if WITH_TLDRAW else 'absent'}}"
-    tags:
-      - prometheus
-
   - name: BoardCollaboration configmap
     kubernetes.core.k8s:
       kubeconfig: ~/.kube/config

ansible/roles/schulcloud-server-core/templates/external-secret.yml.j2

@@ -18,7 +18,6 @@ spec:
       data:
         DB_URL: "{{ '{{ .MONGO_MANAGEMENT_TEMPLATE_URL }}/' ~ MONGO_MANAGEMENT_PREFIX ~ 'scapp' ~ MONGO_MANAGEMENT_POSTFIX }}"
         DATABASE__URL: "{{ '{{ .MONGO_MANAGEMENT_TEMPLATE_URL }}/' ~ MONGO_MANAGEMENT_PREFIX ~ 'scapp' ~ MONGO_MANAGEMENT_POSTFIX }}"
-        TLDRAW_DB_URL: "{{ '{{ .MONGO_MANAGEMENT_TEMPLATE_URL }}/' ~ MONGO_MANAGEMENT_PREFIX ~ 'tldraw' ~ MONGO_MANAGEMENT_POSTFIX }}"
   dataFrom:
   - extract:
       key: api-secret{{ EXTERNAL_SECRETS_POSTFIX }}