Fix rancher-istio/rancher-tracing nodeSelector and tolerations

packages/rancher-istio/rancher-tracing/charts/templates/_helpers.tpl

@@ -30,3 +30,18 @@ If release name contains chart name it will be used as a full name.
 {{- end -}}
 {{- end -}}
 {{- end -}}
+
+{{/*
+Windows cluster will add default taint for linux nodes,
+add below linux tolerations to workloads could be scheduled to those linux nodes
+*/}}
+{{- define "linux-node-tolerations" -}}
+- key: "cattle.io/os"
+  value: "linux"
+  effect: "NoSchedule"
+  operator: "Equal"
+{{- end -}}
+
+{{- define "linux-node-selector" -}}
+kubernetes.io/os: linux
+{{- end -}}

packages/rancher-istio/rancher-tracing/charts/templates/deployment.yaml

@@ -74,9 +74,13 @@ spec:
         runAsUser: 1000
       serviceAccountName: {{ include "tracing.fullname" . }}
       {{- end }}
-      {{- with .Values.tolerations }}
+      nodeSelector: {{ include "linux-node-selector" . | nindent 8 }}
-      tolerations:
+{{- if .Values.nodeSelector }}
-        {{- toYaml . | nindent 8 }}
+{{ toYaml .Values.nodeSelector | indent 8 }}
+{{- end }}
+      tolerations: {{ include "linux-node-tolerations" . | nindent 8 }}
+{{- if .Values.tolerations }}
+{{ toYaml .Values.tolerations | indent 8 }}
 {{- end }}
 {{- if eq .Values.jaeger.spanStorageType "badger" }}
       volumes:

packages/rancher-istio/rancher-tracing/charts/values.yaml

@@ -1,12 +1,11 @@
 provider: jaeger
 contextPath: ""
-nodeSelector:
+## Node labels for pod assignment
-  kubernetes.io/os: linux
+## Ref: https://kubernetes.io/docs/user-guide/node-selection/
-tolerations:
+##
-  - key: cattle.io/os
+nodeSelector: {}
-    operator: "Equal"
+## List of node taints to tolerate (requires Kubernetes >= 1.6)
-    value: "linux"
+tolerations: []
-    effect: NoSchedule
 podAntiAffinityLabelSelector: []
 podAntiAffinityTermLabelSelector: []
 nameOverride: ""