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.labels }}
+    # Custom Labels
+{{ toYaml .Values.cni.labels | indent 4 }}
+    {{- end }}
 spec:
   selector:
     matchLabels:
@@ -29,8 +34,13 @@ spec:
     metadata:
       labels:
         k8s-app: istio-cni-node
+        app: istio-cni
         sidecar.istio.io/inject: "false"
         istio.io/dataplane-mode: none
+        {{- if .Values.cni.podLabels }}
+        # Custom Labels
+{{ toYaml .Values.cni.podLabels | indent 8 }}
+        {{- end }}        
       annotations:
         sidecar.istio.io/inject: "false"
         # Add Prometheus Scrape annotations

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
+    labels: {}
+      # 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: {}
 

releasenotes/notes/cni-custom-labels.yaml

@@ -0,0 +1,8 @@
+apiVersion: release-notes/v2
+kind: feature
+area: installation
+issue:
+- https://github.com/istio/istio/issues/50372
+releaseNotes:
+- |
+  **Added** labels and podLabels fields to istio-cni chart