fix: Annotations needs to be on all resources

Otherwise sync wave will not include all resources required to deploy Kafka.
getditto · Nov 27, 2024 · 070e382 · 070e382
1 parent 0c472f4
commit 070e382
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 1 deletion.
diff --git a/charts/kafka/Chart.yaml b/charts/kafka/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: Setup a Kafka cluster using Strimzi operator
 name: kafka
-version: 0.3.1
+version: 0.3.2
 type: application
 dependencies: []
 keywords:

diff --git a/charts/kafka/templates/kafka-nodepool.yaml b/charts/kafka/templates/kafka-nodepool.yaml
@@ -5,6 +5,10 @@ kind: KafkaNodePool
 metadata:
   name: {{ include "kafka.fullname" . }}
   namespace: {{ .Release.Namespace }}
+{{- if .Values.additionalAnnotations }}
+  annotations:
+    {{ toYaml .Values.additionalAnnotations | nindent 4 }}
+{{- end }}
   labels:
     strimzi.io/cluster: {{ include "kafka.fullname" . }}
     {{- include "kafka.labels" . | nindent 4 }}
@@ -33,6 +37,10 @@ kind: KafkaNodePool
 metadata:
   name: {{ include "kafka.fullname" . }}-controller
   namespace: {{ .Release.Namespace }}
+{{- if .Values.additionalAnnotations }}
+  annotations:
+    {{ toYaml .Values.additionalAnnotations | nindent 4 }}
+{{- end }}
   labels:
     strimzi.io/cluster: {{ include "kafka.fullname" . }}
     {{- include "kafka.labels" . | nindent 4 }}
@@ -60,6 +68,10 @@ kind: KafkaNodePool
 metadata:
   name: {{ include "kafka.fullname" . }}-broker
   namespace: {{ .Release.Namespace }}
+{{- if .Values.additionalAnnotations }}
+  annotations:
+    {{ toYaml .Values.additionalAnnotations | nindent 4 }}
+{{- end }}
   labels:
     strimzi.io/cluster: {{ include "kafka.fullname" . }}
     {{- include "kafka.labels" . | nindent 4 }}

diff --git a/charts/kafka/templates/networkpolicy-egress-cruisecontrol.yaml b/charts/kafka/templates/networkpolicy-egress-cruisecontrol.yaml
@@ -5,6 +5,10 @@ kind: NetworkPolicy
 metadata:
   name: {{ include "kafka.fullname" . }}-egress-cruise-control
   namespace: {{ .Release.Namespace }}
+{{- if .Values.additionalAnnotations }}
+  annotations:
+    {{ toYaml .Values.additionalAnnotations | nindent 4 }}
+{{- end }}
   labels: {{ include "kafka.labels" . | nindent 4 }}
 spec:
   policyTypes:

diff --git a/charts/kafka/templates/networkpolicy-egress-kafka.yaml b/charts/kafka/templates/networkpolicy-egress-kafka.yaml
@@ -5,6 +5,10 @@ kind: NetworkPolicy
 metadata:
   name: {{ include "kafka.fullname" . }}-egress-kafka
   namespace: {{ .Release.Namespace }}
+{{- if .Values.additionalAnnotations }}
+  annotations:
+    {{ toYaml .Values.additionalAnnotations | nindent 4 }}
+{{- end }}
   labels: {{ include "kafka.labels" . | nindent 4 }}
 spec:
   policyTypes:

diff --git a/charts/kafka/templates/networkpolicy-egress-zookeeper.yaml b/charts/kafka/templates/networkpolicy-egress-zookeeper.yaml
@@ -5,6 +5,10 @@ kind: NetworkPolicy
 metadata:
   name: {{ include "kafka.fullname" . }}-egress-zookeeper
   namespace: {{ .Release.Namespace }}
+{{- if .Values.additionalAnnotations }}
+  annotations:
+    {{ toYaml .Values.additionalAnnotations | nindent 4 }}
+{{- end }}
   labels: {{ include "kafka.labels" . | nindent 4 }}
 spec:
   policyTypes:

diff --git a/charts/kafka/templates/networkpolicy-entity-operator-kube-api.yaml b/charts/kafka/templates/networkpolicy-entity-operator-kube-api.yaml
@@ -12,6 +12,10 @@ kind: CiliumNetworkPolicy
 metadata:
   name: {{ include "kafka.fullname" . }}-egress-entity-operator
   namespace: {{ .Release.Namespace }}
+{{- if .Values.additionalAnnotations }}
+  annotations:
+    {{ toYaml .Values.additionalAnnotations | nindent 4 }}
+{{- end }}
   labels: {{ include "kafka.labels" . | nindent 4 }}
 spec:
   endpointSelector:

diff --git a/charts/kafka/templates/networkpolicy-entity-operator.yaml b/charts/kafka/templates/networkpolicy-entity-operator.yaml
@@ -5,6 +5,10 @@ kind: NetworkPolicy
 metadata:
   name: {{ include "kafka.fullname" . }}-egress-entity-operator
   namespace: {{ .Release.Namespace }}
+{{- if .Values.additionalAnnotations }}
+  annotations:
+    {{ toYaml .Values.additionalAnnotations | nindent 4 }}
+{{- end }}
   labels: {{ include "kafka.labels" . | nindent 4 }}
 spec:
   policyTypes:

diff --git a/charts/kafka/templates/networkpolicy-kafka-exporter.yaml b/charts/kafka/templates/networkpolicy-kafka-exporter.yaml
@@ -5,6 +5,10 @@ kind: NetworkPolicy
 metadata:
   name: {{ include "kafka.fullname" . }}-egress-kafka-exporter
   namespace: {{ .Release.Namespace }}
+{{- if .Values.additionalAnnotations }}
+  annotations:
+    {{ toYaml .Values.additionalAnnotations | nindent 4 }}
+{{- end }}
   labels: {{ include "kafka.labels" . | nindent 4 }}
 spec:
   policyTypes: