OZG-7906 adjust naming in helm chart

aggregation-manager-job/src/main/helm/Chart.yaml

@@ -24,7 +24,7 @@
 
 apiVersion: v1
 appVersion: "1.0"
-description: OZG-Cloud Helm chart for aggregation-manager
-name: aggregation-manager
+description: OZG-Cloud Helm chart for aggregation-manager-job
+name: aggregation-manager-job
 version: 0.0.0-MANAGED-BY-JENKINS
 icon: https://simpleicons.org/icons/helm.svg

aggregation-manager-job/src/main/helm/templates/_helpers.tpl

@@ -51,7 +51,7 @@
 
 {{/* Default Labels: Helm recommended best-practice labels https://helm.sh/docs/chart_best_practices/labels/ */}}
 {{- define "app.defaultLabels" }}
-app.kubernetes.io/instance: aggregation-manager
+app.kubernetes.io/instance: aggregation-manager-job
 app.kubernetes.io/managed-by: {{ include "app.managedBy" . }}
 app.kubernetes.io/name: {{ .Release.Name }}
 app.kubernetes.io/namespace: {{ include "app.namespace" . }}

aggregation-manager-job/src/main/helm/templates/cronjob.yaml

@@ -42,14 +42,14 @@ spec:
         metadata:
           labels:
             {{- include "app.defaultLabels" . | indent 12 }}
-            component: aggregation-manager
+            component: aggregation-manager-job
         spec:
           {{- if (.Values.serviceAccount).create }}
           serviceAccountName: {{ .Values.serviceAccount.name }}
           {{- end }}
           restartPolicy: "Never"
           containers:
-          - name: aggregation-manager
+          - name: aggregation-manager-job
             image: "{{ .Values.image.repo }}/{{ .Values.image.name }}:{{ .Values.image.tag }}"
             imagePullPolicy: Always
             env:

aggregation-manager-job/src/main/helm/templates/network_policy.yaml

@@ -26,12 +26,12 @@
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
-  name: network-policy-aggregation-manager
+  name: network-policy-aggregation-manager-job
   namespace: {{ include "app.namespace" . }}
 spec:
   podSelector:
     matchLabels:
-      component: aggregation-manager
+      component: aggregation-manager-job
   policyTypes:
     - Ingress
     - Egress

aggregation-manager-job/src/main/helm/templates/service.yaml

@@ -29,7 +29,7 @@ metadata:
   namespace: {{ include "app.namespace" . }}
   labels:
     {{- include "app.defaultLabels" . | indent 4 }}
-    component: aggregation-manager-service
+    component: aggregation-manager-job-service
 spec:
   type: ClusterIP
   ports:
@@ -38,4 +38,4 @@ spec:
       protocol: TCP
   selector:
     {{- include "app.matchLabels" . | indent 4 }}
-    component: aggregation-manager
+    component: aggregation-manager-job

aggregation-manager-job/src/main/helm/templates/service_monitor.yaml

@@ -29,7 +29,7 @@ metadata:
   namespace: {{ include "app.namespace" . }}
   labels:
     {{- include "app.defaultLabels" . | indent 4 }}
-    component: aggregation-manager-service-monitor
+    component: aggregation-manager-job-service-monitor
 spec:
   endpoints:
   - port: metrics
@@ -40,4 +40,4 @@ spec:
   selector:
     matchLabels:
       {{- include "app.matchLabels" . | indent 6 }}
-      component: aggregation-manager-service
+      component: aggregation-manager-job-service
\ No newline at end of file

aggregation-manager-job/src/main/helm/values.yaml

@@ -24,7 +24,7 @@
 
 image:
   repo: docker.ozg-sh.de
-  name: aggregation-manager
+  name: aggregation-manager-job
   tag: latest
 
 ozgcloud:
@@ -50,7 +50,7 @@ cronjob:
 
 serviceAccount:
   create: true
-   name: aggregation-manager-service-account
+  name: aggregation-manager-job-service-account
 
 imagePullSecret: ""
 

aggregation-manager-job/src/test/helm/configmap_bindings_type_test.yaml

@@ -24,7 +24,7 @@
 
 suite: configmap_bindings_type
 release:
-  name: aggregation-manager
+  name: aggregation-manager-job
   namespace: sh-helm-test
 templates:
   - templates/configmap_bindings_type.yaml

aggregation-manager-job/src/test/helm/cronjob_database_test.yaml

@@ -24,7 +24,7 @@
 
 suite: cronjob database
 release:
-  name: aggregation-manager
+  name: aggregation-manager-job
   namespace: sh-helm-test
 templates:
   - templates/cronjob.yaml

aggregation-manager-job/src/test/helm/cronjob_defaults_labels_test.yaml

@@ -24,7 +24,7 @@
 
 suite: test cronjob default labels
 release:
-  name: aggregation-manager
+  name: aggregation-manager-job
   namespace: sh-helm-test
 templates:
   - templates/cronjob.yaml
@@ -37,13 +37,13 @@ tests:
       - equal:
           path: metadata.labels
           value:
-            app.kubernetes.io/instance: aggregation-manager
+            app.kubernetes.io/instance: aggregation-manager-job
             app.kubernetes.io/managed-by: Helm
-            app.kubernetes.io/name: aggregation-manager
+            app.kubernetes.io/name: aggregation-manager-job
             app.kubernetes.io/namespace: sh-helm-test
             app.kubernetes.io/part-of: ozgcloud
             app.kubernetes.io/version: 0.0.0-MANAGED-BY-JENKINS
-            helm.sh/chart: aggregation-manager-0.0.0-MANAGED-BY-JENKINS
+            helm.sh/chart: aggregation-manager-job-0.0.0-MANAGED-BY-JENKINS
             ozgcloud-mongodb-client: "true"
 
   - it: should have correct deyploment spec.template.metadata.labels
@@ -51,12 +51,12 @@ tests:
       - equal:
           path: spec.jobTemplate.spec.template.metadata.labels
           value:
-            app.kubernetes.io/instance: aggregation-manager
+            app.kubernetes.io/instance: aggregation-manager-job
             app.kubernetes.io/managed-by: Helm
-            app.kubernetes.io/name: aggregation-manager
+            app.kubernetes.io/name: aggregation-manager-job
             app.kubernetes.io/namespace: sh-helm-test
             app.kubernetes.io/part-of: ozgcloud
             app.kubernetes.io/version: 0.0.0-MANAGED-BY-JENKINS
-            component: aggregation-manager
-            helm.sh/chart: aggregation-manager-0.0.0-MANAGED-BY-JENKINS
+            component: aggregation-manager-job
+            helm.sh/chart: aggregation-manager-job-0.0.0-MANAGED-BY-JENKINS
             ozgcloud-mongodb-client: "true"

aggregation-manager-job/src/test/helm/cronjob_service_account_test.yaml

@@ -24,7 +24,7 @@
 
 suite: cronjob service account
 release:
-  name: aggregation-manager
+  name: aggregation-manager-job
   namespace: by-helm-test
 templates:
   - templates/cronjob.yaml
@@ -32,11 +32,11 @@ set:
   ozgcloud:
     environment: dev
 tests:
-  - it: should use aggregation-manager service account
+  - it: should use aggregation-manager-job service account
     asserts:
       - equal:
           path: spec.jobTemplate.spec.template.spec.serviceAccountName
-          value: aggregation-manager-service-account
+          value: aggregation-manager-job-service-account
   - it: should set service account name
     set:
       serviceAccount:

aggregation-manager-job/src/test/helm/cronjob_test.yaml

@@ -24,7 +24,7 @@
 
 suite: cronjob test
 release:
-  name: aggregation-manager
+  name: aggregation-manager-job
   namespace: sh-helm-test
 templates:
   - templates/cronjob.yaml
@@ -40,7 +40,7 @@ tests:
           of: batch/v1
       - equal:
           path: metadata.name
-          value: "aggregation-manager"
+          value: "aggregation-manager-job"
       - equal:
           path: metadata.namespace
           value: "sh-helm-test"
@@ -90,10 +90,10 @@ tests:
     asserts:
       - equal:
           path: spec.jobTemplate.spec.template.spec.containers[0].name
-          value: "aggregation-manager"
+          value: "aggregation-manager-job"
       - equal:
           path: spec.jobTemplate.spec.template.spec.containers[0].image
-          value: "docker.ozg-sh.de/aggregation-manager:latest"
+          value: "docker.ozg-sh.de/aggregation-manager-job:latest"
       - equal:
           path: spec.jobTemplate.spec.template.spec.containers[0].imagePullPolicy
           value: "Always"

aggregation-manager-job/src/test/helm/cronjob_volume_test.yaml

@@ -24,7 +24,7 @@
 
 suite: cronjob volumes tests
 release:
-  name: aggregation-manager
+  name: aggregation-manager-job
 templates:
   - templates/cronjob.yaml
 set:

aggregation-manager-job/src/test/helm/network_policy_test.yaml

@@ -22,9 +22,9 @@
 # unter der Lizenz sind dem Lizenztext zu entnehmen.
 #
 
-suite: network policy aggregation-manager test
+suite: network policy aggregation-manager-job test
 release:
-  name: aggregation-manager
+  name: aggregation-manager-job
   namespace: by-helm-test
 templates:
   - templates/network_policy.yaml
@@ -52,7 +52,7 @@ tests:
       - equal:
           path: metadata
           value:
-            name: network-policy-aggregation-manager
+            name: network-policy-aggregation-manager-job
             namespace: by-helm-test
   - it: validate spec
     set:
@@ -107,7 +107,7 @@ tests:
                     protocol: TCP
             podSelector:
               matchLabels:
-                component: aggregation-manager
+                component: aggregation-manager-job
             policyTypes:
               - Ingress
               - Egress

aggregation-manager-job/src/test/helm/service_account_test.yaml

@@ -24,7 +24,7 @@
 
 suite: test service account
 release:
-  name: aggregation-manager
+  name: aggregation-manager-job
   namespace: sh-helm-test
 templates:
   - templates/service_account.yaml
@@ -37,7 +37,7 @@ tests:
           of: v1
       - equal:
           path: metadata.name
-          value: aggregation-manager-service-account
+          value: aggregation-manager-job-service-account
       - equal:
           path: metadata.namespace
           value: sh-helm-test

aggregation-manager-job/src/test/helm/service_monitor_test.yaml

@@ -24,12 +24,12 @@
 
 suite: test service_monitor
 release:
-  name: aggregation-manager
+  name: aggregation-manager-job
   namespace: sh-helm-test
 templates:
   - templates/service_monitor.yaml
 tests:
-  - it: should have basic info and the label component with value aggregation-manager-service-monitor attached
+  - it: should have basic info and the label component with value aggregation-manager-job-service-monitor attached
     asserts:
       - isKind:
           of: ServiceMonitor
@@ -37,27 +37,27 @@ tests:
           of: monitoring.coreos.com/v1
       - equal:
           path: metadata.name
-          value: aggregation-manager
+          value: aggregation-manager-job
       - equal:
           path: metadata.namespace
           value: sh-helm-test
       - equal:
           path: metadata.labels["component"]
-          value: aggregation-manager-service-monitor
+          value: aggregation-manager-job-service-monitor
 
   - it: should contain default lables and component lables
     asserts:
       - equal:
           path: metadata.labels
           value:
-            app.kubernetes.io/instance: aggregation-manager
+            app.kubernetes.io/instance: aggregation-manager-job
             app.kubernetes.io/managed-by: Helm
-            app.kubernetes.io/name: aggregation-manager
+            app.kubernetes.io/name: aggregation-manager-job
             app.kubernetes.io/namespace: sh-helm-test
             app.kubernetes.io/part-of: ozgcloud
             app.kubernetes.io/version: 0.0.0-MANAGED-BY-JENKINS
-            component: aggregation-manager-service-monitor
-            helm.sh/chart: aggregation-manager-0.0.0-MANAGED-BY-JENKINS
+            component: aggregation-manager-job-service-monitor
+            helm.sh/chart: aggregation-manager-job-0.0.0-MANAGED-BY-JENKINS
             ozgcloud-mongodb-client: "true"
 
   - it: should have the metrics endpoint configured by default
@@ -79,6 +79,6 @@ tests:
       - equal:
           path: spec.selector.matchLabels
           value:
-            app.kubernetes.io/name: aggregation-manager
+            app.kubernetes.io/name: aggregation-manager-job
             app.kubernetes.io/namespace: sh-helm-test
-            component: aggregation-manager-service
+            component: aggregation-manager-job-service

aggregation-manager-job/src/test/helm/service_test.yaml

@@ -27,7 +27,7 @@ suite: service
 templates:
   - templates/service.yaml
 release:
-  name: aggregation-manager
+  name: aggregation-manager-job
   namespace: helm-test
 
 tests:
@@ -36,7 +36,7 @@ tests:
       - containsDocument:
           kind: Service
           apiVersion: v1
-          name: aggregation-manager
+          name: aggregation-manager-job
           namespace: helm-test
   - it: should be of type ClusterIP
     asserts:
@@ -56,7 +56,7 @@ tests:
     asserts:
       - equal:
           path: spec.selector["app.kubernetes.io/name"]
-          value: aggregation-manager
+          value: aggregation-manager-job
       - equal:
           path: spec.selector["app.kubernetes.io/namespace"]
           value: helm-test
@@ -64,18 +64,18 @@ tests:
     asserts:
       - equal:
           path: spec.selector.component
-          value: aggregation-manager
+          value: aggregation-manager-job
   - it: should contain default lables and component lables
     asserts:
       - equal:
           path: metadata.labels
           value:
-            app.kubernetes.io/instance: aggregation-manager
+            app.kubernetes.io/instance: aggregation-manager-job
             app.kubernetes.io/managed-by: Helm
-            app.kubernetes.io/name: aggregation-manager
+            app.kubernetes.io/name: aggregation-manager-job
             app.kubernetes.io/namespace: helm-test
             app.kubernetes.io/part-of: ozgcloud
             app.kubernetes.io/version: 0.0.0-MANAGED-BY-JENKINS
-            component: aggregation-manager-service
-            helm.sh/chart: aggregation-manager-0.0.0-MANAGED-BY-JENKINS
+            component: aggregation-manager-job-service
+            helm.sh/chart: aggregation-manager-job-0.0.0-MANAGED-BY-JENKINS
             ozgcloud-mongodb-client: "true"