[CN-1038] Refactor charts to clean up duplications (#402)

hazelcast · Nov 15, 2023 · 8640222 · 8640222
1 parent 1434558
commit 8640222
Show file tree

Hide file tree

Showing 30 changed files with 60 additions and 134 deletions.
diff --git a/stable/hazelcast-enterprise/Chart.yaml b/stable/hazelcast-enterprise/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: hazelcast-enterprise
-version: 5.10.10
+version: 5.10.11
 appVersion: "5.3.6"
 kubeVersion: ">=1.19.0-0"
 description: Hazelcast is a streaming and memory-first application platform for fast, stateful, data-intensive workloads on-premises, at the edge or as a fully managed cloud service.

diff --git a/stable/hazelcast-enterprise/templates/config.yaml b/stable/hazelcast-enterprise/templates/config.yaml
@@ -11,11 +11,9 @@ metadata:
     {{- range $key, $value := .Values.commonLabels }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
-  {{- if .Values.commonAnnotations }}
+  {{- with .Values.commonAnnotations }}
   annotations:
-    {{- range $key, $val := .Values.commonAnnotations }}
-    {{ $key }}: {{ $val | quote }}
-    {{- end }}
+    {{- toYaml . | nindent 4 }}
   {{- end }}
 data:
 {{- range $key, $val := .Values.hazelcast.configurationFiles }}

diff --git a/stable/hazelcast-enterprise/templates/mancenter-config.yaml b/stable/hazelcast-enterprise/templates/mancenter-config.yaml
@@ -11,11 +11,9 @@ metadata:
     {{- range $key, $value := .Values.commonLabels }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
-  {{- if .Values.commonAnnotations }}
+  {{- with .Values.commonAnnotations }}
   annotations:
-    {{- range $key, $val := .Values.commonAnnotations }}
-    {{ $key }}: {{ $val | quote }}
-    {{- end }}
+    {{- toYaml . | nindent 4 }}
   {{- end }}
 data:
   hazelcast-client.yaml: |-

diff --git a/stable/hazelcast-enterprise/templates/mancenter-ingress.yaml b/stable/hazelcast-enterprise/templates/mancenter-ingress.yaml
@@ -13,9 +13,7 @@ metadata:
     {{- end }}
   {{- if or .Values.mancenter.ingress.annotations .Values.commonAnnotations }}
   annotations:
-    {{- range $key, $val := (merge nil .Values.mancenter.ingress.annotations .Values.commonAnnotations) }}
-    {{ $key }}: {{ $val | quote }}
-    {{- end }}
+    {{- merge nil .Values.mancenter.ingress.annotations .Values.commonAnnotations | toYaml | nindent 4 }}
   {{- end }}
 spec:
   ingressClassName: {{ .Values.mancenter.ingress.className }}

diff --git a/stable/hazelcast-enterprise/templates/mancenter-service.yaml b/stable/hazelcast-enterprise/templates/mancenter-service.yaml
@@ -15,11 +15,9 @@ metadata:
     {{- range $key, $value := (merge nil .Values.mancenter.service.labels .Values.commonLabels) }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
-  {{- if .Values.commonAnnotations }}
+  {{- with .Values.commonAnnotations }}
   annotations:
-    {{- range $key, $val := .Values.commonAnnotations }}
-    {{ $key }}: {{ $val | quote }}
-    {{- end }}
+    {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
   type: {{ .Values.mancenter.service.type }}

diff --git a/stable/hazelcast-enterprise/templates/mancenter-statefulset.yaml b/stable/hazelcast-enterprise/templates/mancenter-statefulset.yaml
@@ -11,11 +11,9 @@ metadata:
     {{- range $key, $value := (merge nil .Values.mancenter.labels .Values.commonLabels) }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
-  {{- if .Values.commonAnnotations }}
+  {{- with .Values.commonAnnotations }}
   annotations:
-    {{- range $key, $val := .Values.commonAnnotations }}
-    {{ $key }}: {{ $val | quote }}
-    {{- end }}
+    {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
   serviceName: {{ template "mancenter.fullname" . }}
@@ -33,16 +31,12 @@ spec:
         app.kubernetes.io/instance: "{{ .Release.Name }}"
         app.kubernetes.io/managed-by: "{{ .Release.Service }}"
         role: mancenter
-        {{- if or .Values.mancenter.podLabels .Values.commonLabels }}
         {{- range $key, $val := (merge nil .Values.mancenter.podLabels .Values.commonLabels) }}
         {{ $key }}: {{ $val | quote }}
         {{- end }}
-        {{- end }}
       {{- if or .Values.mancenter.annotations .Values.commonAnnotations }}
       annotations:
-        {{- range $key, $val := (merge nil .Values.mancenter.annotations .Values.commonAnnotations) }}
-        {{ $key }}: {{ $val | quote }}
-        {{- end }}
+        {{- merge nil .Values.mancenter.annotations .Values.commonAnnotations | toYaml | nindent 8 }}
       {{- end }}
     spec:
       {{- if .Values.mancenter.image.pullSecrets }}
@@ -242,11 +236,9 @@ spec:
         {{- range $key, $value := .Values.commonLabels }}
         {{ $key }}: {{ $value | quote }}
         {{- end }}
-      {{- if .Values.commonAnnotations }}
+      {{- with .Values.commonAnnotations }}
       annotations:
-        {{- range $key, $val := .Values.commonAnnotations }}
-        {{ $key }}: {{ $val | quote }}
-        {{- end }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}
     spec:
       accessModes:

diff --git a/stable/hazelcast-enterprise/templates/metrics-service.yaml b/stable/hazelcast-enterprise/templates/metrics-service.yaml
@@ -15,9 +15,7 @@ metadata:
     {{- end }}
   {{- if or .Values.metrics.service.annotations .Values.commonAnnotations }}
   annotations:
-    {{- range $key, $val := (merge nil .Values.metrics.service.annotations .Values.commonAnnotations) }}
-    {{ $key }}: {{ $val | quote }}
-    {{- end }}
+    {{- merge nil .Values.metrics.service.annotations .Values.commonAnnotations | toYaml | nindent 4 }}
   {{- end }}
 spec:
   type: {{ .Values.metrics.service.type }}

diff --git a/stable/hazelcast-enterprise/templates/poddisruptionbudget.yaml b/stable/hazelcast-enterprise/templates/poddisruptionbudget.yaml
@@ -11,11 +11,9 @@ metadata:
     {{- range $key, $value := .Values.commonLabels }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
-  {{- if .Values.commonAnnotations }}
+  {{- with .Values.commonAnnotations }}
   annotations:
-    {{- range $key, $val := .Values.commonAnnotations }}
-    {{ $key }}: {{ $val | quote }}
-    {{- end }}
+    {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
 {{ toYaml .Values.podDisruptionBudget | indent 2 }}

diff --git a/stable/hazelcast-enterprise/templates/prometheusrule.yaml b/stable/hazelcast-enterprise/templates/prometheusrule.yaml
@@ -12,11 +12,9 @@ metadata:
     {{- range $key, $val := (merge nil .Values.metrics.prometheusRule.labels .Values.commonLabels) }}
     {{ $key }}: {{ $val | quote }}
     {{- end }}
-  {{- if .Values.commonAnnotations }}
+  {{- with .Values.commonAnnotations }}
   annotations:
-    {{- range $key, $val := .Values.commonAnnotations }}
-    {{ $key }}: {{ $val | quote }}
-    {{- end }}
+    {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
   groups:

diff --git a/stable/hazelcast-enterprise/templates/role.yaml b/stable/hazelcast-enterprise/templates/role.yaml
@@ -15,11 +15,9 @@ metadata:
     {{- range $key, $value := .Values.commonLabels }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
-  {{- if .Values.commonAnnotations }}
+  {{- with .Values.commonAnnotations }}
   annotations:
-    {{- range $key, $val := .Values.commonAnnotations }}
-    {{ $key }}: {{ $val | quote }}
-    {{- end }}
+    {{- toYaml . | nindent 4 }}
   {{- end }}
 rules:
 - apiGroups:

diff --git a/stable/hazelcast-enterprise/templates/rolebinding.yaml b/stable/hazelcast-enterprise/templates/rolebinding.yaml
@@ -15,11 +15,9 @@ metadata:
     {{- range $key, $value := .Values.commonLabels }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
-  {{- if .Values.commonAnnotations }}
+  {{- with .Values.commonAnnotations }}
   annotations:
-    {{- range $key, $val := .Values.commonAnnotations }}
-    {{ $key }}: {{ $val | quote }}
-    {{- end }}
+    {{- toYaml . | nindent 4 }}
   {{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io

diff --git a/stable/hazelcast-enterprise/templates/service.yaml b/stable/hazelcast-enterprise/templates/service.yaml
@@ -15,11 +15,9 @@ metadata:
     {{- range $key, $value := (merge nil .Values.service.labels .Values.commonLabels) }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
-  {{- if .Values.commonAnnotations }}
+  {{- with .Values.commonAnnotations }}
   annotations:
-    {{- range $key, $val := .Values.commonAnnotations }}
-    {{ $key }}: {{ $val | quote }}
-    {{- end }}
+    {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
   type: {{ .Values.service.type }}

diff --git a/stable/hazelcast-enterprise/templates/serviceaccount.yaml b/stable/hazelcast-enterprise/templates/serviceaccount.yaml
@@ -11,10 +11,8 @@ metadata:
     {{- range $key, $value := .Values.commonLabels }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
-  {{- if .Values.commonAnnotations }}
+  {{- with .Values.commonAnnotations }}
   annotations:
-    {{- range $key, $val := .Values.commonAnnotations }}
-    {{ $key }}: {{ $val | quote }}
-    {{- end }}
+    {{- toYaml . | nindent 4 }}
   {{- end }}
 {{- end -}}
diff --git a/stable/hazelcast-enterprise/templates/servicemonitor.yaml b/stable/hazelcast-enterprise/templates/servicemonitor.yaml
@@ -12,11 +12,9 @@ metadata:
     {{- range $key, $val := (merge nil .Values.metrics.serviceMonitor.labels .Values.commonLabels) }}
     {{ $key }}: {{ $val | quote }}
     {{- end }}
-  {{- if .Values.commonAnnotations }}
+  {{- with .Values.commonAnnotations }}
   annotations:
-    {{- range $key, $val := .Values.commonAnnotations }}
-    {{ $key }}: {{ $val | quote }}
-    {{- end }}
+    {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
   endpoints:

diff --git a/stable/hazelcast-enterprise/templates/statefulset.yaml b/stable/hazelcast-enterprise/templates/statefulset.yaml
@@ -13,9 +13,7 @@ metadata:
     {{- end }}
   {{- if or .Values.annotations .Values.commonAnnotations }}
   annotations:
-    {{- range $key, $val := (merge nil .Values.annotations .Values.commonAnnotations) }}
-    {{ $key }}: {{ $val | quote }}
-    {{- end }}
+    {{- merge nil .Values.annotations .Values.commonAnnotations | toYaml | nindent 4 }}
   {{- end }}
 spec:
   serviceName: {{ template "hazelcast.fullname" . }}
@@ -33,11 +31,9 @@ spec:
         app.kubernetes.io/instance: "{{ .Release.Name }}"
         app.kubernetes.io/managed-by: "{{ .Release.Service }}"
         role: hazelcast
-        {{- if or .Values.podLabels .Values.commonLabels }}
         {{- range $key, $val := (merge nil .Values.podLabels .Values.commonLabels) }}
         {{ $key }}: {{ $val | quote }}
         {{- end }}
-        {{- end }}
       annotations:
         checksum/hazelcast-config: {{ toYaml .Values.hazelcast.yaml | sha256sum }}
         {{- range $key, $val := (merge nil .Values.annotations .Values.commonAnnotations) }}
@@ -246,11 +242,9 @@ spec:
         {{- range $key, $value := .Values.commonLabels }}
         {{ $key }}: {{ $value | quote }}
         {{- end }}
-      {{- if .Values.commonAnnotations }}
+      {{- with .Values.commonAnnotations }}
       annotations:
-        {{- range $key, $val := .Values.commonAnnotations }}
-        {{ $key }}: {{ $val | quote }}
-        {{- end }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}
     spec:
       accessModes:

diff --git a/stable/hazelcast/Chart.yaml b/stable/hazelcast/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: hazelcast
-version: 5.8.11
+version: 5.8.12
 appVersion: "5.3.6"
 kubeVersion: ">=1.19.0-0"
 description: Hazelcast is a streaming and memory-first application platform for fast, stateful, data-intensive workloads on-premises, at the edge or as a fully managed cloud service.

diff --git a/stable/hazelcast/templates/config.yaml b/stable/hazelcast/templates/config.yaml
@@ -11,11 +11,9 @@ metadata:
     {{- range $key, $value := .Values.commonLabels }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
-  {{- if .Values.commonAnnotations }}
+  {{- with .Values.commonAnnotations }}
   annotations:
-    {{- range $key, $val := .Values.commonAnnotations }}
-    {{ $key }}: {{ $val | quote }}
-    {{- end }}
+    {{- toYaml . | nindent 4 }}
   {{- end }}
 data:
 {{- range $key, $val := .Values.hazelcast.configurationFiles }}

diff --git a/stable/hazelcast/templates/mancenter-config.yaml b/stable/hazelcast/templates/mancenter-config.yaml
@@ -11,11 +11,9 @@ metadata:
     {{- range $key, $value := .Values.commonLabels }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
-  {{- if .Values.commonAnnotations }}
+  {{- with .Values.commonAnnotations }}
   annotations:
-    {{- range $key, $val := .Values.commonAnnotations }}
-    {{ $key }}: {{ $val | quote }}
-    {{- end }}
+    {{- toYaml . | nindent 4 }}
   {{- end }}
 data:
   hazelcast-client.yaml: |-

diff --git a/stable/hazelcast/templates/mancenter-ingress.yaml b/stable/hazelcast/templates/mancenter-ingress.yaml
@@ -13,9 +13,7 @@ metadata:
     {{- end }}
   {{- if or .Values.mancenter.ingress.annotations .Values.commonAnnotations }}
   annotations:
-    {{- range $key, $val := (merge nil .Values.mancenter.ingress.annotations .Values.commonAnnotations) }}
-    {{ $key }}: {{ $val | quote }}
-    {{- end }}
+    {{- merge nil .Values.mancenter.ingress.annotations .Values.commonAnnotations | toYaml | nindent 4 }}
   {{- end }}
 spec:
   ingressClassName: {{ .Values.mancenter.ingress.className }}

diff --git a/stable/hazelcast/templates/mancenter-service.yaml b/stable/hazelcast/templates/mancenter-service.yaml
@@ -15,11 +15,9 @@ metadata:
     {{- range $key, $value := (merge nil .Values.mancenter.service.labels .Values.commonLabels) }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
-  {{- if .Values.commonAnnotations }}
+  {{- with .Values.commonAnnotations }}
   annotations:
-    {{- range $key, $val := .Values.commonAnnotations }}
-    {{ $key }}: {{ $val | quote }}
-    {{- end }}
+    {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
   type: {{ .Values.mancenter.service.type }}

diff --git a/stable/hazelcast/templates/mancenter-statefulset.yaml b/stable/hazelcast/templates/mancenter-statefulset.yaml
@@ -11,11 +11,9 @@ metadata:
     {{- range $key, $value := (merge nil .Values.mancenter.labels .Values.commonLabels) }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
-  {{- if .Values.commonAnnotations }}
+  {{- with .Values.commonAnnotations }}
   annotations:
-    {{- range $key, $val := .Values.commonAnnotations }}
-    {{ $key }}: {{ $val | quote }}
-    {{- end }}
+    {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
   serviceName: {{ template "mancenter.fullname" . }}
@@ -33,16 +31,12 @@ spec:
         app.kubernetes.io/instance: "{{ .Release.Name }}"
         app.kubernetes.io/managed-by: "{{ .Release.Service }}"
         role: mancenter
-        {{- if or .Values.mancenter.podLabels .Values.commonLabels }}
         {{- range $key, $val := (merge nil .Values.mancenter.podLabels .Values.commonLabels) }}
         {{ $key }}: {{ $val | quote }}
         {{- end }}
-        {{- end }}
       {{- if or .Values.mancenter.annotations .Values.commonAnnotations }}
       annotations:
-        {{- range $key, $val := (merge nil .Values.mancenter.annotations .Values.commonAnnotations) }}
-        {{ $key }}: {{ $val | quote }}
-        {{- end }}
+        {{- merge nil .Values.mancenter.annotations .Values.commonAnnotations | toYaml | nindent 8 }}
       {{- end }}
     spec:
       {{- if .Values.mancenter.image.pullSecrets }}
@@ -233,11 +227,9 @@ spec:
         {{- range $key, $value := .Values.commonLabels }}
         {{ $key }}: {{ $value | quote }}
         {{- end }}
-      {{- if .Values.commonAnnotations }}
+      {{- with .Values.commonAnnotations }}
       annotations:
-        {{- range $key, $val := .Values.commonAnnotations }}
-        {{ $key }}: {{ $val | quote }}
-        {{- end }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}
     spec:
       accessModes:

diff --git a/stable/hazelcast/templates/metrics-service.yaml b/stable/hazelcast/templates/metrics-service.yaml
@@ -15,9 +15,7 @@ metadata:
     {{- end }}
   {{- if or .Values.metrics.service.annotations .Values.commonAnnotations }}
   annotations:
-    {{- range $key, $val := (merge nil .Values.metrics.service.annotations .Values.commonAnnotations) }}
-    {{ $key }}: {{ $val | quote }}
-    {{- end }}
+    {{- merge nil .Values.metrics.service.annotations .Values.commonAnnotations | toYaml | nindent 4 }}
   {{- end }}
 spec:
   type: {{ .Values.metrics.service.type }}

diff --git a/stable/hazelcast/templates/poddisruptionbudget.yaml b/stable/hazelcast/templates/poddisruptionbudget.yaml
@@ -11,11 +11,9 @@ metadata:
     {{- range $key, $value := .Values.commonLabels }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
-  {{- if .Values.commonAnnotations }}
+  {{- with .Values.commonAnnotations }}
   annotations:
-    {{- range $key, $val := .Values.commonAnnotations }}
-    {{ $key }}: {{ $val | quote }}
-    {{- end }}
+    {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
 {{ toYaml .Values.podDisruptionBudget | indent 2 }}

diff --git a/stable/hazelcast/templates/prometheusrule.yaml b/stable/hazelcast/templates/prometheusrule.yaml
@@ -12,11 +12,9 @@ metadata:
     {{- range $key, $val := (merge nil .Values.metrics.prometheusRule.labels .Values.commonLabels) }}
     {{ $key }}: {{ $val | quote }}
     {{- end }}
-  {{- if .Values.commonAnnotations }}
+  {{- with .Values.commonAnnotations }}
   annotations:
-    {{- range $key, $val := .Values.commonAnnotations }}
-    {{ $key }}: {{ $val | quote }}
-    {{- end }}
+    {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
   groups: