Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
8 changes: 8 additions & 0 deletions manifests/charts/istio-cni/templates/daemonset.yaml
Expand Up @@ -17,6 +17,10 @@ metadata:
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.deploymentLabels }}
# Custom Labels
{{ toYaml .Values.cni.deploymentLabels | indent 4 }}
{{- end }}
spec:
selector:
matchLabels:
Expand All @@ -30,6 +34,10 @@ spec:
labels:
k8s-app: istio-cni-node
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
Expand Down
6 changes: 6 additions & 0 deletions manifests/charts/istio-cni/values.yaml
Expand Up @@ -32,6 +32,12 @@ defaults:
# Allows user to set custom affinity for the DaemonSet
affinity: {}

# Custom labels on Deployment level, if you need them
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't a Deployment so the naming is kind of weird?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That was a typo. Fixed it

deploymentLabels: {}

# Custom labels on Pod level, if you need them
podLabels: {}

# Custom annotations on pod level, if you need them
podAnnotations: {}

Expand Down