Helm charts: Fixed more broken labels

Signed-off-by: Lalith Kota <[email protected]>
OpenG2P · Jun 24, 2024 · 7650d41 · 7650d41
1 parent 9682fe1
commit 7650d41
Show file tree

Hide file tree

Showing 19 changed files with 50 additions and 95 deletions.
diff --git a/charts/debezium/templates/clusterrolebinding.yaml b/charts/debezium/templates/clusterrolebinding.yaml
@@ -1,11 +1,8 @@
 kind: ClusterRoleBinding
 apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
 metadata:
- labels: {{- include "common.labels.standard" . | nindent 4 }}
- {{- if .Values.commonLabels }}
- {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
- {{- end }}
  name: {{ template "common.names.fullname" . }}
+ labels: {{- include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" $) | nindent 4 }}
  {{- if .Values.commonAnnotations }}
  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
  {{- end }}

diff --git a/charts/debezium/templates/deployment.yaml b/charts/debezium/templates/deployment.yaml
@@ -1,15 +1,11 @@
 apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
 kind: Deployment
 metadata:
- labels: {{- include "common.labels.standard" . | nindent 4 }}
- {{- if .Values.commonLabels }}
- {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
- {{- end }}
  name: {{ template "common.names.fullname" . }}
- annotations:
-  {{- if .Values.commonAnnotations }}
-   {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
+ labels: {{- include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" $) | nindent 4 }}
+ {{- if .Values.commonAnnotations }}
+ annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+ {{- end }}
 spec:
  replicas: {{ .Values.replicaCount }}
  {{- if .Values.updateStrategy }}
@@ -19,14 +15,10 @@ spec:
  matchLabels: {{- include "common.labels.matchLabels" (dict "customLabels" .Values.podLabels "context" $) | nindent 6 }}
  template:
  metadata:
- annotations:
- {{- if or .Values.podAnnotations .Values.metrics.enabled }}
- {{- include "debezium.podAnnotations" . | nindent 8 }}
- {{- end }}
- labels: {{- include "common.labels.standard" . | nindent 8 }}
- {{- if .Values.podLabels }}
- {{- include "common.tplvalues.render" (dict "value" .Values.podLabels "context" $) | nindent 8 }}
- {{- end }}
+ labels: {{- include "common.labels.standard" (dict "customLabels" .Values.podLabels "context" $) | nindent 8 }}
+ {{- if or .Values.podAnnotations .Values.metrics.enabled }}
+ annotations: {{- include "debezium.podAnnotations" . | nindent 8 }}
+ {{- end }}
  spec:
  serviceAccountName: {{ default (include "common.names.fullname" .) .Values.serviceAccount.name }}
  {{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) | nindent 6 }}

diff --git a/charts/debezium/templates/service-account.yaml b/charts/debezium/templates/service-account.yaml
@@ -2,10 +2,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
  name: {{ default (include "common.names.fullname" .) .Values.serviceAccount.name }}
- labels: {{- include "common.labels.standard" . | nindent 4 }}
- {{- if .Values.commonLabels }}
- {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
- {{- end }}
+ labels: {{- include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" $) | nindent 4 }}
  {{- if .Values.commonAnnotations }}
  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
  {{- end }}
diff --git a/charts/debezium/templates/service.yaml b/charts/debezium/templates/service.yaml
@@ -1,15 +1,11 @@
 apiVersion: v1
 kind: Service
 metadata:
- labels: {{- include "common.labels.standard" . | nindent 4 }}
- {{- if .Values.commonLabels }}
- {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
- {{- end }}
  name: {{ template "common.names.fullname" . }}
- annotations:
-  {{- if .Values.commonAnnotations }}
-   {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
+ labels: {{- include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" $) | nindent 4 }}
+ {{- if .Values.commonAnnotations }}
+ annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+ {{- end }}
 spec:
  type: {{ .Values.service.type }}
  {{- if (or (eq .Values.service.type "LoadBalancer") (eq .Values.service.type "NodePort")) }}

diff --git a/charts/debezium/templates/servicemonitor.yaml b/charts/debezium/templates/servicemonitor.yaml
@@ -6,10 +6,10 @@ metadata:
  {{- if .Values.metrics.serviceMonitor.namespace }}
  namespace: {{ .Values.metrics.serviceMonitor.namespace }}
  {{- end }}
- labels: {{- include "common.labels.standard" . | nindent 4 }}
-  {{- if .Values.metrics.serviceMonitor.additionalLabels }}
-  {{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.additionalLabels "context" $) | nindent 4 }}
-  {{- end }}
+ labels: {{- include "common.labels.standard" (dict "customLabels" .Values.metrics.serviceMonitor.additionalLabels "context" $) | nindent 4 }}
+ {{- if .Values.commonAnnotations }}
+ annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+ {{- end }}
 spec:
  endpoints:
  - port: http-metrics

diff --git a/charts/opensearch-kafka-connector/templates/clusterrolebinding.yaml b/charts/opensearch-kafka-connector/templates/clusterrolebinding.yaml
@@ -1,11 +1,8 @@
 kind: ClusterRoleBinding
 apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
 metadata:
- labels: {{- include "common.labels.standard" . | nindent 4 }}
- {{- if .Values.commonLabels }}
- {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
- {{- end }}
  name: {{ template "common.names.fullname" . }}
+ labels: {{- include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" $) | nindent 4 }}
  {{- if .Values.commonAnnotations }}
  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
  {{- end }}

diff --git a/charts/opensearch-kafka-connector/templates/configmap.yaml b/charts/opensearch-kafka-connector/templates/configmap.yaml
@@ -2,9 +2,9 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
  name: {{ include "common.names.fullname" . }}-properties
- labels: {{ include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" $) | nindent 4 }}
+ labels: {{- include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" $) | nindent 4 }}
  {{- if .Values.commonAnnotations }}
- annotations: {{ include "common.tplvalues.render" (dict "value" .Values.commonAnnotations "context" $) | nindent 4 }}
+ annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
  {{- end }}
 data:
  connect-distributed.properties: |-

diff --git a/charts/opensearch-kafka-connector/templates/deployment.yaml b/charts/opensearch-kafka-connector/templates/deployment.yaml
@@ -1,15 +1,11 @@
 apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
 kind: Deployment
 metadata:
- labels: {{- include "common.labels.standard" . | nindent 4 }}
- {{- if .Values.commonLabels }}
- {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
- {{- end }}
  name: {{ template "common.names.fullname" . }}
- annotations:
-  {{- if .Values.commonAnnotations }}
-   {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
+ labels: {{- include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" $) | nindent 4 }}
+ {{- if .Values.commonAnnotations }}
+ annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+ {{- end }}
 spec:
  replicas: {{ .Values.replicaCount }}
  {{- if .Values.updateStrategy }}
@@ -19,14 +15,10 @@ spec:
  matchLabels: {{- include "common.labels.matchLabels" (dict "customLabels" .Values.podLabels "context" $) | nindent 6 }}
  template:
  metadata:
- annotations:
- {{- if or .Values.podAnnotations .Values.metrics.enabled }}
- {{- include "opensearch-kafka-connector.podAnnotations" . | nindent 8 }}
- {{- end }}
- labels: {{- include "common.labels.standard" . | nindent 8 }}
- {{- if .Values.podLabels }}
- {{- include "common.tplvalues.render" (dict "value" .Values.podLabels "context" $) | nindent 8 }}
- {{- end }}
+ labels: {{- include "common.labels.standard" (dict "customLabels" .Values.podLabels "context" $) | nindent 8 }}
+ {{- if or .Values.podAnnotations .Values.metrics.enabled }}
+ annotations: {{- include "opensearch-kafka-connector.podAnnotations" . | nindent 8 }}
+ {{- end }}
  spec:
  serviceAccountName: {{ default (include "common.names.fullname" .) .Values.serviceAccount.name }}
  {{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) | nindent 6 }}

diff --git a/charts/opensearch-kafka-connector/templates/service-account.yaml b/charts/opensearch-kafka-connector/templates/service-account.yaml
@@ -2,10 +2,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
  name: {{ default (include "common.names.fullname" .) .Values.serviceAccount.name }}
- labels: {{- include "common.labels.standard" . | nindent 4 }}
- {{- if .Values.commonLabels }}
- {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
- {{- end }}
+ labels: {{- include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" $) | nindent 4 }}
  {{- if .Values.commonAnnotations }}
  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
  {{- end }}
diff --git a/charts/opensearch-kafka-connector/templates/service.yaml b/charts/opensearch-kafka-connector/templates/service.yaml
@@ -1,15 +1,11 @@
 apiVersion: v1
 kind: Service
 metadata:
- labels: {{- include "common.labels.standard" . | nindent 4 }}
- {{- if .Values.commonLabels }}
- {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
- {{- end }}
  name: {{ template "common.names.fullname" . }}
- annotations:
-  {{- if .Values.commonAnnotations }}
-   {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
+ labels: {{- include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" $) | nindent 4 }}
+ {{- if .Values.commonAnnotations }}
+ annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+ {{- end }}
 spec:
  type: {{ .Values.service.type }}
  {{- if (or (eq .Values.service.type "LoadBalancer") (eq .Values.service.type "NodePort")) }}

diff --git a/charts/opensearch-kafka-connector/templates/servicemonitor.yaml b/charts/opensearch-kafka-connector/templates/servicemonitor.yaml
@@ -6,10 +6,10 @@ metadata:
  {{- if .Values.metrics.serviceMonitor.namespace }}
  namespace: {{ .Values.metrics.serviceMonitor.namespace }}
  {{- end }}
- labels: {{- include "common.labels.standard" . | nindent 4 }}
-  {{- if .Values.metrics.serviceMonitor.additionalLabels }}
-  {{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.additionalLabels "context" $) | nindent 4 }}
-  {{- end }}
+ labels: {{- include "common.labels.standard" (dict "customLabels" .Values.metrics.serviceMonitor.additionalLabels "context" $) | nindent 4 }}
+ {{- if .Values.commonAnnotations }}
+ annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+ {{- end }}
 spec:
  endpoints:
  - port: http-metrics

diff --git a/charts/reporting-init/templates/configmap-startup.yaml b/charts/reporting-init/templates/configmap-startup.yaml
@@ -3,12 +3,9 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
  name: {{ template "common.names.fullname" . }}-startup
- labels: {{- include "common.labels.standard" . | nindent 4 }}
- {{- if .Values.commonLabels }}
- {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
- {{- end }}
+ labels: {{ include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" .) | nindent 4 }}
  {{- if .Values.commonAnnotations }}
- annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+ annotations: {{ include "common.tplvalues.render" (dict "value" .Values.commonAnnotations "context" $) | nindent 4 }}
  {{- end }}
 data:
  startup-command.sh: |-

diff --git a/charts/reporting-init/templates/job.yaml b/charts/reporting-init/templates/job.yaml
@@ -2,10 +2,7 @@ apiVersion: batch/v1
 kind: Job
 metadata:
  name: {{ template "common.names.fullname" . }}
- labels: {{- include "common.labels.standard" . | nindent 4 }}
- {{- if .Values.commonLabels }}
- {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
- {{- end }}
+ labels: {{ include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" .) | nindent 4 }}
  annotations:
  "helm.sh/hook": post-install,post-upgrade
  "helm.sh/hook-weight": "0"

diff --git a/charts/reporting-init/templates/secret-git-config.yaml b/charts/reporting-init/templates/secret-git-config.yaml
@@ -3,10 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
  name: {{ template "common.names.fullname" . }}-git-config
- labels: {{- include "common.labels.standard" . | nindent 4 }}
- {{- if .Values.commonLabels }}
- {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
- {{- end }}
+ labels: {{ include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" .) | nindent 4 }}
  {{- if .Values.commonAnnotations }}
  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
  {{- end }}

diff --git a/charts/reporting/templates/kafka-ui/configmap.yaml b/charts/reporting/templates/kafka-ui/configmap.yaml
@@ -5,7 +5,7 @@ kind: ConfigMap
 metadata:
  name: {{ include "common.names.fullname" .Subcharts.kafka }}-ui
  labels: {{ include "common.labels.standard" (dict "customLabels" .Values.kafkaUi.commonLabels "context" .Subcharts.kafka) | nindent 4 }}
- {{- if .Values.kafka.commonAnnotations }}
+ {{- if .Values.kafkaUi.commonAnnotations }}
  annotations: {{ include "common.tplvalues.render" (dict "value" .Values.kafkaUi.commonAnnotations "context" $) | nindent 4 }}
  {{- end }}
 data:

diff --git a/charts/reporting/templates/kafka-ui/deployment.yaml b/charts/reporting/templates/kafka-ui/deployment.yaml
@@ -5,7 +5,7 @@ kind: Deployment
 metadata:
  name: {{ include "common.names.fullname" .Subcharts.kafka }}-ui
  labels: {{ include "common.labels.standard" (dict "customLabels" .Values.kafkaUi.commonLabels "context" .Subcharts.kafka) | nindent 4 }}
- {{- if .Values.kafka.commonAnnotations }}
+ {{- if .Values.kafkaUi.commonAnnotations }}
  annotations: {{ include "common.tplvalues.render" (dict "value" .Values.kafkaUi.commonAnnotations "context" $) | nindent 4 }}
  {{- end }}
 spec:
@@ -14,11 +14,11 @@ spec:
  strategy: {{- toYaml .Values.kafkaUi.updateStrategy | nindent 4 }}
  {{- end }}
  selector:
- matchLabels: {{- include "common.labels.matchLabels" (dict "customLabels" .Values.kafkaUi.podLabels "context" $) | nindent 6 }}
+ matchLabels: {{- include "common.labels.matchLabels" (dict "customLabels" .Values.kafkaUi.podLabels "context" .Subcharts.kafka) | nindent 6 }}
  template:
  metadata:
  labels: {{ include "common.labels.standard" (dict "customLabels" .Values.kafkaUi.podLabels "context" .Subcharts.kafka) | nindent 8 }}
- {{- if .Values.kafkaUi.commonAnnotations }}
+ {{- if .Values.kafkaUi.podAnnotations }}
  annotations: {{ include "common.tplvalues.render" (dict "value" .Values.kafkaUi.podAnnotations "context" $) | nindent 8 }}
  {{- end }}
  spec:

diff --git a/charts/reporting/templates/kafka-ui/gateway.yaml b/charts/reporting/templates/kafka-ui/gateway.yaml
@@ -7,7 +7,7 @@ kind: Gateway
 metadata:
  name: {{ include "common.names.fullname" .Subcharts.kafka }}-ui
  labels: {{ include "common.labels.standard" (dict "customLabels" .Values.kafkaUi.commonLabels "context" .Subcharts.kafka) | nindent 4 }}
- {{- if .Values.kafka.commonAnnotations }}
+ {{- if .Values.kafkaUi.commonAnnotations }}
  annotations: {{ include "common.tplvalues.render" (dict "value" .Values.kafkaUi.commonAnnotations "context" $) | nindent 4 }}
  {{- end }}
 spec:

diff --git a/charts/reporting/templates/kafka-ui/service.yaml b/charts/reporting/templates/kafka-ui/service.yaml
@@ -5,7 +5,7 @@ kind: Service
 metadata:
  name: {{ include "common.names.fullname" .Subcharts.kafka }}-ui
  labels: {{ include "common.labels.standard" (dict "customLabels" .Values.kafkaUi.commonLabels "context" .Subcharts.kafka) | nindent 4 }}
- {{- if .Values.kafka.commonAnnotations }}
+ {{- if .Values.kafkaUi.commonAnnotations }}
  annotations: {{ include "common.tplvalues.render" (dict "value" .Values.kafkaUi.commonAnnotations "context" $) | nindent 4 }}
  {{- end }}
 spec:
@@ -24,6 +24,6 @@ spec:
  port: {{ .Values.kafkaUi.service.port }}
  protocol: TCP
  targetPort: {{ .Values.kafkaUi.containerPort }}
- selector: {{- include "common.labels.matchLabels" (dict "customLabels" .Values.kafkaUi.podLabels "context" $) | nindent 4 }}
+ selector: {{- include "common.labels.matchLabels" (dict "customLabels" .Values.kafkaUi.podLabels "context" .Subcharts.kafka) | nindent 4 }}
 {{- end }}
 {{- end }}
diff --git a/charts/reporting/templates/kafka-ui/virtualservice.yaml b/charts/reporting/templates/kafka-ui/virtualservice.yaml
@@ -7,7 +7,7 @@ kind: VirtualService
 metadata:
  name: {{ include "common.names.fullname" .Subcharts.kafka }}-ui
  labels: {{ include "common.labels.standard" (dict "customLabels" .Values.kafkaUi.commonLabels "context" .Subcharts.kafka) | nindent 4 }}
- {{- if .Values.kafka.commonAnnotations }}
+ {{- if .Values.kafkaUi.commonAnnotations }}
  annotations: {{ include "common.tplvalues.render" (dict "value" .Values.kafkaUi.commonAnnotations "context" $) | nindent 4 }}
  {{- end }}
 spec: