Merge pull request #53 from phillipsj/feature/annotations-selectors-t…

…olerations-chart-updates Changes required to support mixed workload clusters.
rancher · Feb 18, 2022 · 20612fc · 20612fc
2 parents 3f5c5cf + 2e7956b
commit 20612fc
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 0 deletions.
diff --git a/charts/aks-operator-crd/Chart.yaml b/charts/aks-operator-crd/Chart.yaml
@@ -9,3 +9,5 @@ annotations:
   catalog.cattle.io/hidden: "true"
   catalog.cattle.io/release-name: rancher-aks-operator-crd
   catalog.cattle.io/os: linux
+  catalog.cattle.io/permits-os: linux,windows
+
diff --git a/charts/aks-operator/Chart.yaml b/charts/aks-operator/Chart.yaml
@@ -13,7 +13,9 @@ annotations:
   catalog.cattle.io/kube-version: ">= 1.18.0-0"
   catalog.cattle.io/namespace: cattle-system
   catalog.cattle.io/os: linux
+  catalog.cattle.io/permits-os: linux,windows
   catalog.cattle.io/provides-gvr: aksclusterconfigs.aks.cattle.io/v1
   catalog.cattle.io/rancher-version: ">= 2.6.0-alpha"
   catalog.cattle.io/release-name: rancher-aks-operator
   catalog.cattle.io/scope: management
+
diff --git a/charts/aks-operator/templates/_helpers.tpl b/charts/aks-operator/templates/_helpers.tpl
@@ -7,3 +7,19 @@
 {{- "" -}}
 {{- 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 -}}
+
diff --git a/charts/aks-operator/templates/deployment.yaml b/charts/aks-operator/templates/deployment.yaml
@@ -13,6 +13,14 @@ spec:
       labels:
         ke.cattle.io/operator: aks
     spec:
+      nodeSelector: {{ include "linux-node-selector" . | nindent 8 }}
+      {{- if .Values.nodeSelector }}
+      {{ toYaml .Values.nodeSelector | indent 8 }}
+      {{- end }}
+      tolerations: {{ include "linux-node-tolerations" . | nindent 6}}
+      {{- if .Values.tolerations }}
+      {{ toYaml .Values.tolerations | indent 6 }}
+      {{- end }}
       serviceAccountName: aks-operator
       securityContext:
         fsGroup: 1007

diff --git a/charts/aks-operator/values.yaml b/charts/aks-operator/values.yaml
@@ -11,3 +11,10 @@ httpProxy: ""
 httpsProxy: ""
 noProxy: ""
 additionalTrustedCAs: false
+## Node labels for pod assignment
+## Ref: https://kubernetes.io/docs/user-guide/node-selection/
+##
+nodeSelector: {}
+## List of node taints to tolerate (requires Kubernetes >= 1.6)
+tolerations: []
+