Merge branch 'main' into bc-5724

hpi-schul-cloud · Aug 19, 2024 · 21a67d7 · 21a67d7
2 parents 19f5bfc + edf129b
commit 21a67d7
Show file tree

Hide file tree

Showing 17 changed files with 273 additions and 3 deletions.
diff --git a/ansible/roles/common-cartridge/tasks/main.yml b/ansible/roles/common-cartridge/tasks/main.yml
@@ -5,6 +5,8 @@
     namespace: "{{ NAMESPACE }}"
     template: configmap.yml.j2
   when: WITH_COMMON_CARTRIDGE is defined and WITH_COMMON_CARTRIDGE|bool
+  tags:
+    - configmap
 
 - name: 1Password
   kubernetes.core.k8s:
@@ -14,20 +16,26 @@
   when: 
       - ONEPASSWORD_OPERATOR is defined and ONEPASSWORD_OPERATOR|bool
       - WITH_COMMON_CARTRIDGE is defined and WITH_COMMON_CARTRIDGE|bool
+  tags:
+    - 1password
 
 - name: Deployment
   kubernetes.core.k8s:
     kubeconfig: ~/.kube/config
     namespace: "{{ NAMESPACE }}"
     template: deployment.yml.j2
   when: WITH_COMMON_CARTRIDGE is defined and WITH_COMMON_CARTRIDGE|bool
+  tags:
+    - deployment
 
 - name: Service
   kubernetes.core.k8s:
     kubeconfig: ~/.kube/config
     namespace: "{{ NAMESPACE }}"
     template: svc.yml.j2
   when: WITH_COMMON_CARTRIDGE is defined and WITH_COMMON_CARTRIDGE|bool
+  tags:
+    - service
 
 # This is a testing route and will not be deployed
 # - name: Ingress
@@ -36,3 +44,5 @@
 #     namespace: "{{ NAMESPACE }}"
 #     template: ingress.yml.j2
 #   when: WITH_COMMON_CARTRIDGE is defined and WITH_COMMON_CARTRIDGE|bool
+#   tags:
+#     - ingress
diff --git a/ansible/roles/h5p-library-management/tasks/main.yml b/ansible/roles/h5p-library-management/tasks/main.yml
@@ -4,17 +4,23 @@
       namespace: "{{ NAMESPACE }}"
       template: api-h5p-library-management-onepassword.yml.j2
     when: ONEPASSWORD_OPERATOR is defined and ONEPASSWORD_OPERATOR|bool and WITH_H5P_LIBRARY_MANAGEMENT is defined and WITH_H5P_LIBRARY_MANAGEMENT|bool == true
+    tags:
+      - 1password
 
   - name: H5pLibraryManagement ConfigMap
     when: WITH_H5P_LIBRARY_MANAGEMENT is defined and WITH_H5P_LIBRARY_MANAGEMENT|bool == true
     kubernetes.core.k8s:
       kubeconfig: ~/.kube/config
       namespace: "{{ NAMESPACE }}"
       template: api-h5p-library-management-configmap.yml.j2
+    tags:
+      - configmap
 
   - name: H5pLibraryManagement CronJob
     when: WITH_H5P_LIBRARY_MANAGEMENT is defined and WITH_H5P_LIBRARY_MANAGEMENT|bool == true
     kubernetes.core.k8s:
       kubeconfig: ~/.kube/config
       namespace: "{{ NAMESPACE }}"
       template: api-h5p-library-management-cronjob.yml.j2
+    tags:
+      - cronjob
diff --git a/ansible/roles/moin-schule-sync/tasks/main.yml b/ansible/roles/moin-schule-sync/tasks/main.yml
@@ -4,31 +4,41 @@
     kubeconfig: ~/.kube/config
     namespace: "{{ NAMESPACE }}"
     template: moin-schule-sync-onepassword.yml.j2
+  tags:
+    - 1password
 
 - name: moin.schule users sync CronJob
   when: WITH_MOIN_SCHULE is defined and WITH_MOIN_SCHULE|bool == true
   kubernetes.core.k8s:
     kubeconfig: ~/.kube/config
     namespace: "{{ NAMESPACE }}"
     template: moin-schule-users-sync-cronjob.yml.j2
+  tags:
+    - cronjob
 
 - name: moin.schule users sync CronJob ConfigMap
   when: WITH_MOIN_SCHULE is defined and WITH_MOIN_SCHULE|bool == true
   kubernetes.core.k8s:
     kubeconfig: ~/.kube/config
     namespace: "{{ NAMESPACE }}"
     template: moin-schule-users-sync-cronjob-configmap.yml.j2
+  tags:
+    - configmap
 
 - name: unsynced moin.schule users deletion queueing CronJob
   when: WITH_MOIN_SCHULE is defined and WITH_MOIN_SCHULE|bool == true and WITH_UNSYNCED_ENTITIES_DELETION is defined and WITH_UNSYNCED_ENTITIES_DELETION|bool == true
   kubernetes.core.k8s:
     kubeconfig: ~/.kube/config
     namespace: "{{ NAMESPACE }}"
     template: moin-schule-users-deletion-queueing-cronjob.yml.j2
+  tags:
+    - cronjob
 
 - name: unsynced moin.schule users deletion queueing CronJob ConfigMap
   when: WITH_MOIN_SCHULE is defined and WITH_MOIN_SCHULE|bool == true and WITH_UNSYNCED_ENTITIES_DELETION is defined and WITH_UNSYNCED_ENTITIES_DELETION|bool == true
   kubernetes.core.k8s:
     kubeconfig: ~/.kube/config
     namespace: "{{ NAMESPACE }}"
     template: moin-schule-users-deletion-queueing-cronjob-configmap.yml.j2
+  tags:
+    - configmap