chore: add common labels and annotations to pods (#51)

* chore: add common labels and annotations to pods

* update prometheusrule and servicemonitor

* update trivy ignore file

.trivyignore

@@ -0,0 +1,2 @@
+# com.google.protobuf:protobuf-java
+CVE-2024-7254 exp:2024-10-31

helm/templates/prometheusrules.yaml

@@ -1,4 +1,5 @@
-{{- if and ( .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" ) ( .Values.prometheusrule.enabled ) }}
+{{- if .Values.prometheusrule.enabled }}
+{{- if .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" }}
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
@@ -92,3 +93,4 @@ spec:
             summary: "One or more Kafka containers restarted too often"
             message: "One or more Kafka containers were restarted too often within the last 5 minutes"
 {{- end }}
+{{- end }}

helm/templates/servicemonitor.yaml

@@ -1,4 +1,6 @@
-{{- if and ( .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" ) ( .Values.servicemonitor.enabled ) ( .Values.prometheus.jmx.enabled ) }}
+{{- if .Values.servicemonitor.enabled }}
+{{- if .Values.prometheus.jmx.enabled }}
+{{- if .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" }}
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
@@ -32,3 +34,5 @@ spec:
     matchNames:
       - {{ .Release.Namespace }}
 {{- end }}
+{{- end }}
+{{- end }}

helm/templates/statefulset.yaml

@@ -20,12 +20,12 @@ spec:
       labels:
         app: {{ include "kafka.name" . }}
         release: {{ .Release.Name }}
-      {{- with .Values.podLabels }}
+        {{- with merge .Values.podLabels .Values.commonPodLabels }}
         {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- if .Values.podAnnotations }}
+        {{- end }}
+      {{- with merge .Values.podAnnotations .Values.commonPodAnnotations }}
       annotations:
-        {{- toYaml .Values.podAnnotations | nindent 8 }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}
     spec:
       serviceAccountName: {{ template "kafka.serviceAccountName" . }}

helm/values.yaml

@@ -23,6 +23,10 @@ podLabels: {}
 
 podAnnotations: {}
 
+commonPodLabels: {}
+
+commonPodAnnotations: {}
+
 serviceAccount:
   create: true
   name: ""