From 986e9fa79d991d0e2341b8a30f1b31420943886b Mon Sep 17 00:00:00 2001
From: Felix Reichenbach <felix.reichenbach@mgm-tp.com>
Date: Fri, 28 Mar 2025 15:19:41 +0100
Subject: [PATCH] OZG-7906 adjust naming in helm chart
---
.../src/main/helm/Chart.yaml | 4 +--
.../src/main/helm/templates/_helpers.tpl | 2 +-
.../src/main/helm/templates/cronjob.yaml | 6 ++--
.../main/helm/templates/network_policy.yaml | 4 +--
.../src/main/helm/templates/service.yaml | 4 +--
.../main/helm/templates/service_monitor.yaml | 4 +--
.../src/main/helm/values.yaml | 30 +++++++++----------
.../helm/configmap_bindings_type_test.yaml | 30 +++++++++----------
.../src/test/helm/cronjob_database_test.yaml | 4 +--
.../helm/cronjob_defaults_labels_test.yaml | 22 +++++++-------
.../helm/cronjob_service_account_test.yaml | 8 ++---
.../src/test/helm/cronjob_test.yaml | 8 ++---
.../src/test/helm/cronjob_volume_test.yaml | 2 +-
.../src/test/helm/network_policy_test.yaml | 8 ++---
.../src/test/helm/service_account_test.yaml | 6 ++--
.../src/test/helm/service_monitor_test.yaml | 24 +++++++--------
.../src/test/helm/service_test.yaml | 18 +++++------
17 files changed, 92 insertions(+), 92 deletions(-)
diff --git a/aggregation-manager-job/src/main/helm/Chart.yaml b/aggregation-manager-job/src/main/helm/Chart.yaml
index 83d7d42..4dbc8ee 100644
--- a/aggregation-manager-job/src/main/helm/Chart.yaml
+++ b/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
diff --git a/aggregation-manager-job/src/main/helm/templates/_helpers.tpl b/aggregation-manager-job/src/main/helm/templates/_helpers.tpl
index 599e662..88c452b 100644
--- a/aggregation-manager-job/src/main/helm/templates/_helpers.tpl
+++ b/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" . }}
diff --git a/aggregation-manager-job/src/main/helm/templates/cronjob.yaml b/aggregation-manager-job/src/main/helm/templates/cronjob.yaml
index 9dc8532..c320cf7 100644
--- a/aggregation-manager-job/src/main/helm/templates/cronjob.yaml
+++ b/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
+ containers:
+ - name: aggregation-manager-job
image: "{{ .Values.image.repo }}/{{ .Values.image.name }}:{{ .Values.image.tag }}"
imagePullPolicy: Always
env:
diff --git a/aggregation-manager-job/src/main/helm/templates/network_policy.yaml b/aggregation-manager-job/src/main/helm/templates/network_policy.yaml
index 459e7e3..03efd10 100644
--- a/aggregation-manager-job/src/main/helm/templates/network_policy.yaml
+++ b/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
diff --git a/aggregation-manager-job/src/main/helm/templates/service.yaml b/aggregation-manager-job/src/main/helm/templates/service.yaml
index 4e92320..d8f6db4 100644
--- a/aggregation-manager-job/src/main/helm/templates/service.yaml
+++ b/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
diff --git a/aggregation-manager-job/src/main/helm/templates/service_monitor.yaml b/aggregation-manager-job/src/main/helm/templates/service_monitor.yaml
index 9911109..5274cc4 100644
--- a/aggregation-manager-job/src/main/helm/templates/service_monitor.yaml
+++ b/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
\ No newline at end of file
+ component: aggregation-manager-job-service
\ No newline at end of file
diff --git a/aggregation-manager-job/src/main/helm/values.yaml b/aggregation-manager-job/src/main/helm/values.yaml
index 1800799..366ab52 100644
--- a/aggregation-manager-job/src/main/helm/values.yaml
+++ b/aggregation-manager-job/src/main/helm/values.yaml
@@ -24,33 +24,33 @@
image:
repo: docker.ozg-sh.de
- name: aggregation-manager
+ name: aggregation-manager-job
tag: latest
ozgcloud:
environment:
database:
- useExternal: false
- databaseName: aggregation-manager-database
- secretName: ozg-mongodb-admin-aggregation-manager-user
- tls:
- enabled: false
- secretName: ozg-mongodb-tls-cert
+ useExternal: false
+ databaseName: aggregation-manager-database
+ secretName: ozg-mongodb-admin-aggregation-manager-user
+ tls:
+ enabled: false
+ secretName: ozg-mongodb-tls-cert
vorgangManager:
- grpcClientNegotiationType: PLAINTEXT
+ grpcClientNegotiationType: PLAINTEXT
cronjob:
- schedule: "0 0 * * *"
- successfulJobsHistoryLimit: 3
- failedJobsHistoryLimit: 3
- concurrencyPolicy: Forbid
- startingDeadlineSeconds: 120
+ schedule: "0 0 * * *"
+ successfulJobsHistoryLimit: 3
+ failedJobsHistoryLimit: 3
+ concurrencyPolicy: Forbid
+ startingDeadlineSeconds: 120
serviceAccount:
- create: true
- name: aggregation-manager-service-account
+ create: true
+ name: aggregation-manager-job-service-account
imagePullSecret: ""
diff --git a/aggregation-manager-job/src/test/helm/configmap_bindings_type_test.yaml b/aggregation-manager-job/src/test/helm/configmap_bindings_type_test.yaml
index e641ab0..4ad5fad 100644
--- a/aggregation-manager-job/src/test/helm/configmap_bindings_type_test.yaml
+++ b/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
@@ -32,23 +32,23 @@ tests:
- it: configMap should not exists
asserts:
- hasDocuments:
- count: 0
+ count: 0
- it: should have configmap if database tls is enabled
set:
database:
tls:
enabled: true
asserts:
- - isKind:
- of: ConfigMap
- - isAPIVersion:
- of: v1
- - equal:
- path: metadata.name
- value: aggregation-manager-bindings-type
- - equal:
- path: metadata.namespace
- value: sh-helm-test
- - equal:
- path: data.type
- value: "ca-certificates"
\ No newline at end of file
+ - isKind:
+ of: ConfigMap
+ - isAPIVersion:
+ of: v1
+ - equal:
+ path: metadata.name
+ value: aggregation-manager-bindings-type
+ - equal:
+ path: metadata.namespace
+ value: sh-helm-test
+ - equal:
+ path: data.type
+ value: "ca-certificates"
diff --git a/aggregation-manager-job/src/test/helm/cronjob_database_test.yaml b/aggregation-manager-job/src/test/helm/cronjob_database_test.yaml
index be7ef61..38ad6f7 100644
--- a/aggregation-manager-job/src/test/helm/cronjob_database_test.yaml
+++ b/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
@@ -100,4 +100,4 @@ tests:
enabled: false
asserts:
- isEmpty:
- path: spec.jobTemplate.spec.template.spec.volumes
\ No newline at end of file
+ path: spec.jobTemplate.spec.template.spec.volumes
diff --git a/aggregation-manager-job/src/test/helm/cronjob_defaults_labels_test.yaml b/aggregation-manager-job/src/test/helm/cronjob_defaults_labels_test.yaml
index f1e1382..73dcd9d 100644
--- a/aggregation-manager-job/src/test/helm/cronjob_defaults_labels_test.yaml
+++ b/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
@@ -36,27 +36,27 @@ tests:
asserts:
- equal:
path: metadata.labels
- value:
- app.kubernetes.io/instance: aggregation-manager
+ value:
+ 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
asserts:
- equal:
path: spec.jobTemplate.spec.template.metadata.labels
- value:
- app.kubernetes.io/instance: aggregation-manager
+ value:
+ 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
- ozgcloud-mongodb-client: "true"
\ No newline at end of file
+ component: aggregation-manager-job
+ helm.sh/chart: aggregation-manager-job-0.0.0-MANAGED-BY-JENKINS
+ ozgcloud-mongodb-client: "true"
diff --git a/aggregation-manager-job/src/test/helm/cronjob_service_account_test.yaml b/aggregation-manager-job/src/test/helm/cronjob_service_account_test.yaml
index a975232..3325660 100644
--- a/aggregation-manager-job/src/test/helm/cronjob_service_account_test.yaml
+++ b/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:
@@ -51,4 +51,4 @@ tests:
create: false
asserts:
- isNull:
- path: spec.jobTemplate.spec.template.spec.serviceAccountName
\ No newline at end of file
+ path: spec.jobTemplate.spec.template.spec.serviceAccountName
diff --git a/aggregation-manager-job/src/test/helm/cronjob_test.yaml b/aggregation-manager-job/src/test/helm/cronjob_test.yaml
index 291b202..b0540ad 100644
--- a/aggregation-manager-job/src/test/helm/cronjob_test.yaml
+++ b/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"
diff --git a/aggregation-manager-job/src/test/helm/cronjob_volume_test.yaml b/aggregation-manager-job/src/test/helm/cronjob_volume_test.yaml
index 43f3876..e80b135 100644
--- a/aggregation-manager-job/src/test/helm/cronjob_volume_test.yaml
+++ b/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:
diff --git a/aggregation-manager-job/src/test/helm/network_policy_test.yaml b/aggregation-manager-job/src/test/helm/network_policy_test.yaml
index 29891cf..726b2d3 100644
--- a/aggregation-manager-job/src/test/helm/network_policy_test.yaml
+++ b/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
diff --git a/aggregation-manager-job/src/test/helm/service_account_test.yaml b/aggregation-manager-job/src/test/helm/service_account_test.yaml
index af9a14b..7cd967b 100644
--- a/aggregation-manager-job/src/test/helm/service_account_test.yaml
+++ b/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
@@ -60,4 +60,4 @@ tests:
create: false
asserts:
- hasDocuments:
- count: 0
\ No newline at end of file
+ count: 0
diff --git a/aggregation-manager-job/src/test/helm/service_monitor_test.yaml b/aggregation-manager-job/src/test/helm/service_monitor_test.yaml
index ecf7e14..de007a9 100644
--- a/aggregation-manager-job/src/test/helm/service_monitor_test.yaml
+++ b/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
@@ -78,7 +78,7 @@ tests:
asserts:
- equal:
path: spec.selector.matchLabels
- value:
- app.kubernetes.io/name: aggregation-manager
+ value:
+ app.kubernetes.io/name: aggregation-manager-job
app.kubernetes.io/namespace: sh-helm-test
- component: aggregation-manager-service
+ component: aggregation-manager-job-service
diff --git a/aggregation-manager-job/src/test/helm/service_test.yaml b/aggregation-manager-job/src/test/helm/service_test.yaml
index 2c8b527..5965925 100644
--- a/aggregation-manager-job/src/test/helm/service_test.yaml
+++ b/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
- ozgcloud-mongodb-client: "true"
\ No newline at end of file
+ component: aggregation-manager-job-service
+ helm.sh/chart: aggregation-manager-job-0.0.0-MANAGED-BY-JENKINS
+ ozgcloud-mongodb-client: "true"
--
GitLab