linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add missing tolerations in linkerd-cni helm chart (#5368) (#5369) 

The linkerd-cni helm chart is missing tolerations on the daemonset. This
prevents the linkerd-cni daemonset from being installed on all intended
nodes.

We use the same template partial as used in the main linkerd helm chart
to add tolerations if specified to the linkerd-cni daemonset spec.

Fixes #5368

Signed-off-by: Rishabh Jain <rishabh@onesignal.com>
This commit is contained in:
rish-onesignal 2020-12-17 07:12:31 -08:00 committed by GitHub
parent 578d4a19e9
commit 146cd1301d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
charts/linkerd2-cni/templates/cni-plugin.yaml
View File

@ -184,6 +184,9 @@ spec:
annotations: annotations:
{{.Values.createdByAnnotation}}: {{default (printf "linkerd/helm %s" .Values.cniPluginVersion) .Values.cliVersion}} {{.Values.createdByAnnotation}}: {{default (printf "linkerd/helm %s" .Values.cniPluginVersion) .Values.cliVersion}}
spec: spec:
{{- if .Values.tolerations }}
{{- include "linkerd.tolerations" . | nindent 6 }}
{{- end }}
nodeSelector: nodeSelector:
beta.kubernetes.io/os: linux beta.kubernetes.io/os: linux
hostNetwork: true hostNetwork: true

5
charts/linkerd2-cni/values.yaml
View File

@ -41,6 +41,11 @@ priorityClassName: ""
proxyInjectAnnotation: linkerd.io/inject proxyInjectAnnotation: linkerd.io/inject
proxyInjectDisabled: disabled proxyInjectDisabled: disabled
# -|- Tolerations section, See the
# [K8S documentation](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/)
# for more information
#tolerations:
# #
## For Private docker registries, authentication is needed. ## For Private docker registries, authentication is needed.
# If the control plane service images are pulled from a # If the control plane service images are pulled from a