adjust naming

hpi-schul-cloud · Nov 16, 2023 · ee3205f · ee3205f
1 parent f8443a9
commit ee3205f
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 16 deletions.
diff --git a/ansible/roles/schulcloud-server-core/templates/amqp-files-deployment.yml.j2 b/ansible/roles/schulcloud-server-core/templates/amqp-files-deployment.yml.j2
@@ -8,7 +8,7 @@ metadata:
     app.kubernetes.io/part-of: schulcloud-verbund
     app.kubernetes.io/version: {{ SCHULCLOUD_SERVER_IMAGE_TAG }}
     app.kubernetes.io/name: amqp-files
-    app.kubernetes.io/component: queue
+    app.kubernetes.io/component: files
     app.kubernetes.io/managed-by: ansible
     git.branch: {{ SCHULCLOUD_SERVER_BRANCH_NAME }}
     git.repo: {{ SCHULCLOUD_SERVER_REPO_NAME }}
@@ -31,7 +31,7 @@ spec:
         app.kubernetes.io/part-of: schulcloud-verbund
         app.kubernetes.io/version: {{ SCHULCLOUD_SERVER_IMAGE_TAG }}
         app.kubernetes.io/name: amqp-files
-        app.kubernetes.io/component: queue
+        app.kubernetes.io/component: files
         app.kubernetes.io/managed-by: ansible
         git.branch: {{ SCHULCLOUD_SERVER_BRANCH_NAME }}
         git.repo: {{ SCHULCLOUD_SERVER_REPO_NAME }}

diff --git a/ansible/roles/schulcloud-server-core/templates/api-delete-s3-files-cronjob.yml.j2 b/ansible/roles/schulcloud-server-core/templates/api-delete-s3-files-cronjob.yml.j2
@@ -7,7 +7,7 @@ metadata:
     cronjob: delete-s3-files
     app.kubernetes.io/part-of: schulcloud-verbund
     app.kubernetes.io/version: {{ SCHULCLOUD_SERVER_IMAGE_TAG }}
-    app.kubernetes.io/name: api
+    app.kubernetes.io/name: delete-s3-files
     app.kubernetes.io/component: files
     app.kubernetes.io/managed-by: ansible
     git.branch: {{ SCHULCLOUD_SERVER_BRANCH_NAME }}
@@ -22,7 +22,7 @@ spec:
       cronjob: delete-s3-files
       app.kubernetes.io/part-of: schulcloud-verbund
       app.kubernetes.io/version: {{ SCHULCLOUD_SERVER_IMAGE_TAG }}
-      app.kubernetes.io/name: api
+      app.kubernetes.io/name: delete-s3-files
       app.kubernetes.io/component: files
       app.kubernetes.io/managed-by: ansible
       git.branch: {{ SCHULCLOUD_SERVER_BRANCH_NAME }}

diff --git a/ansible/roles/schulcloud-server-core/templates/preview-generator-deployment.yml.j2 b/ansible/roles/schulcloud-server-core/templates/preview-generator-deployment.yml.j2
@@ -8,7 +8,7 @@ metadata:
     app.kubernetes.io/part-of: schulcloud-verbund
     app.kubernetes.io/version: {{ SCHULCLOUD_SERVER_IMAGE_TAG }}
     app.kubernetes.io/name: preview-generator
-    app.kubernetes.io/component: generator
+    app.kubernetes.io/component: files
     app.kubernetes.io/managed-by: ansible
     git.branch: {{ SCHULCLOUD_SERVER_BRANCH_NAME }}
     git.repo: {{ SCHULCLOUD_SERVER_REPO_NAME }}

diff --git a/ansible/roles/schulcloud-server-core/templates/preview-generator-scaled-object.yml.j2 b/ansible/roles/schulcloud-server-core/templates/preview-generator-scaled-object.yml.j2
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/part-of: schulcloud-verbund
     app.kubernetes.io/version: {{ SCHULCLOUD_SERVER_IMAGE_TAG }}
     app.kubernetes.io/name: preview-generator
-    app.kubernetes.io/component: scaledobject
+    app.kubernetes.io/component: files
     app.kubernetes.io/managed-by: ansible
     git.branch: {{ SCHULCLOUD_SERVER_BRANCH_NAME }}
     git.repo: {{ SCHULCLOUD_SERVER_REPO_NAME }}

diff --git a/ansible/roles/schulcloud-server-ldapsync/templates/api-ldap-sync-full-cronjob.yml.j2 b/ansible/roles/schulcloud-server-ldapsync/templates/api-ldap-sync-full-cronjob.yml.j2
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/part-of: schulcloud-verbund
     app.kubernetes.io/version: {{ SCHULCLOUD_SERVER_IMAGE_TAG }}
     app.kubernetes.io/name: api-ldapsync-cronjob
-    app.kubernetes.io/component: ldap
+    app.kubernetes.io/component: sync
     app.kubernetes.io/managed-by: ansible
     git.branch: {{ SCHULCLOUD_SERVER_BRANCH_NAME }}
     git.repo: {{ SCHULCLOUD_SERVER_REPO_NAME }}
@@ -21,7 +21,7 @@ spec:
       app.kubernetes.io/part-of: schulcloud-verbund
       app.kubernetes.io/version: {{ SCHULCLOUD_SERVER_IMAGE_TAG }}
       app.kubernetes.io/name: api-ldapsync-cronjob
-      app.kubernetes.io/component: ldap
+      app.kubernetes.io/component: sync
       app.kubernetes.io/managed-by: ansible
       git.branch: {{ SCHULCLOUD_SERVER_BRANCH_NAME }}
       git.repo: {{ SCHULCLOUD_SERVER_REPO_NAME }}

diff --git a/ansible/roles/schulcloud-server-ldapsync/templates/api-ldap-worker-deployment.yml.j2 b/ansible/roles/schulcloud-server-ldapsync/templates/api-ldap-worker-deployment.yml.j2
@@ -8,7 +8,7 @@ metadata:
     app.kubernetes.io/part-of: schulcloud-verbund
     app.kubernetes.io/version: {{ SCHULCLOUD_SERVER_IMAGE_TAG }}
     app.kubernetes.io/name: api-worker
-    app.kubernetes.io/component: ldap
+    app.kubernetes.io/component: sync
     app.kubernetes.io/managed-by: ansible
     git.branch: {{ SCHULCLOUD_SERVER_BRANCH_NAME }}
     git.repo: {{ SCHULCLOUD_SERVER_REPO_NAME }}
@@ -31,7 +31,7 @@ spec:
         app.kubernetes.io/part-of: schulcloud-verbund
         app.kubernetes.io/version: {{ SCHULCLOUD_SERVER_IMAGE_TAG }}
         app.kubernetes.io/name: api-worker
-        app.kubernetes.io/component: ldap
+        app.kubernetes.io/component: sync
         app.kubernetes.io/managed-by: ansible
         git.branch: {{ SCHULCLOUD_SERVER_BRANCH_NAME }}
         git.repo: {{ SCHULCLOUD_SERVER_REPO_NAME }}

diff --git a/ansible/roles/schulcloud-server-tspsync/templates/api-tsp-sync-base-cronjob.yml.j2 b/ansible/roles/schulcloud-server-tspsync/templates/api-tsp-sync-base-cronjob.yml.j2
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/part-of: schulcloud-verbund
     app.kubernetes.io/version: {{ SCHULCLOUD_SERVER_IMAGE_TAG }}
     app.kubernetes.io/name: api-tsp-sync-cronjob
-    app.kubernetes.io/component: tsp
+    app.kubernetes.io/component: sync
     app.kubernetes.io/managed-by: ansible
     git.branch: {{ SCHULCLOUD_SERVER_BRANCH_NAME }}
     git.repo: {{ SCHULCLOUD_SERVER_REPO_NAME }}
@@ -23,7 +23,7 @@ spec:
             app.kubernetes.io/part-of: schulcloud-verbund
             app.kubernetes.io/version: {{ SCHULCLOUD_SERVER_IMAGE_TAG }}
             app.kubernetes.io/name: api-tsp-sync-cronjob
-            app.kubernetes.io/component: tsp
+            app.kubernetes.io/component: sync
             app.kubernetes.io/managed-by: ansible
             git.branch: {{ SCHULCLOUD_SERVER_BRANCH_NAME }}
             git.repo: {{ SCHULCLOUD_SERVER_REPO_NAME }}

diff --git a/ansible/roles/schulcloud-server-tspsync/templates/api-tsp-sync-deployment.yml.j2 b/ansible/roles/schulcloud-server-tspsync/templates/api-tsp-sync-deployment.yml.j2
@@ -8,7 +8,7 @@ metadata:
     app.kubernetes.io/part-of: schulcloud-verbund
     app.kubernetes.io/version: {{ SCHULCLOUD_SERVER_IMAGE_TAG }}
     app.kubernetes.io/name: api-tsp-sync
-    app.kubernetes.io/component: tsp
+    app.kubernetes.io/component: sync
     app.kubernetes.io/managed-by: ansible
     git.branch: {{ SCHULCLOUD_SERVER_BRANCH_NAME }}
     git.repo: {{ SCHULCLOUD_SERVER_REPO_NAME }}
@@ -31,7 +31,7 @@ spec:
         app.kubernetes.io/part-of: schulcloud-verbund
         app.kubernetes.io/version: {{ SCHULCLOUD_SERVER_IMAGE_TAG }}
         app.kubernetes.io/name: api-tsp-sync
-        app.kubernetes.io/component: tsp
+        app.kubernetes.io/component: sync
         app.kubernetes.io/managed-by: ansible
         git.branch: {{ SCHULCLOUD_SERVER_BRANCH_NAME }}
         git.repo: {{ SCHULCLOUD_SERVER_REPO_NAME }}

diff --git a/ansible/roles/schulcloud-server-tspsync/templates/api-tsp-sync-school-cronjob.yml.j2 b/ansible/roles/schulcloud-server-tspsync/templates/api-tsp-sync-school-cronjob.yml.j2
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/part-of: schulcloud-verbund
     app.kubernetes.io/version: {{ SCHULCLOUD_SERVER_IMAGE_TAG }}
     app.kubernetes.io/name: api-tsp-sync-cronjob
-    app.kubernetes.io/component: tsp
+    app.kubernetes.io/component: sync
     app.kubernetes.io/managed-by: ansible
     git.branch: {{ SCHULCLOUD_SERVER_BRANCH_NAME }}
     git.repo: {{ SCHULCLOUD_SERVER_REPO_NAME }}
@@ -23,7 +23,7 @@ spec:
             app.kubernetes.io/part-of: schulcloud-verbund
             app.kubernetes.io/version: {{ SCHULCLOUD_SERVER_IMAGE_TAG }}
             app.kubernetes.io/name: api-tsp-sync-cronjob
-            app.kubernetes.io/component: tsp
+            app.kubernetes.io/component: sync
             app.kubernetes.io/managed-by: ansible
             git.branch: {{ SCHULCLOUD_SERVER_BRANCH_NAME }}
             git.repo: {{ SCHULCLOUD_SERVER_REPO_NAME }}