Custom labels added for istio-cni deployment and pods in helm chart

manifests/charts/istio-cni/templates/daemonset.yaml

@@ -13,10 +13,15 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     k8s-app: istio-cni-node
+    app: istio-cni
     release: {{ .Release.Name }}
     istio.io/rev: {{ .Values.revision | default "default" }}
     install.operator.istio.io/owning-resource: {{ .Values.ownerName | default "unknown" }}
     operator.istio.io/component: "Cni"
+    {{- if .Values.cni.daemonSetLabels }}
+    # Custom Labels
+{{ toYaml .Values.cni.daemonSetLabels | indent 4 }}
+    {{- end }}
 spec:
   selector:
     matchLabels:
@@ -29,7 +34,12 @@ spec:
     metadata:
       labels:
         k8s-app: istio-cni-node
+        app: istio-cni
         sidecar.istio.io/inject: "false"
+        {{- if .Values.cni.podLabels }}
+        # Custom Labels
+{{ toYaml .Values.cni.podLabels | indent 8 }}
+        {{- end }}
       annotations:
         sidecar.istio.io/inject: "false"
         ambient.istio.io/redirection: disabled

manifests/charts/istio-cni/values.yaml

@@ -32,6 +32,14 @@ defaults:
     # Allows user to set custom affinity for the DaemonSet
     affinity: {}
 
+    # Custom labels on Daemonset level, for eg - FinOps/teams labels
+    daemonSetLabels: {}
+      # team-owner: finops
+
+    # Custom labels on Pod level, for eg - FinOps/teams labels
+    podLabels: {}
+      # team-owner: finops
+
     # Custom annotations on pod level, if you need them
     podAnnotations: {}