Merge pull request #55 from aiyengar2/fix_node_selectors_and_tolerations

Fix nodeSelectors and tolerations
rancher · Mar 18, 2022 · 3693991 · 3693991
2 parents 7eec500 + f0ccaf3
commit 3693991
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/charts/aks-operator/templates/deployment.yaml b/charts/aks-operator/templates/deployment.yaml
@@ -14,13 +14,13 @@ spec:
         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 }}
+{{- if .Values.nodeSelector }}
+{{ toYaml .Values.nodeSelector | indent 8 }}
+{{- end }}
+      tolerations: {{ include "linux-node-tolerations" . | nindent 8 }}
+{{- if .Values.tolerations }}
+{{ toYaml .Values.tolerations | indent 8 }}
+{{- end }}
       serviceAccountName: aks-operator
       securityContext:
         fsGroup: 1007

diff --git a/charts/aks-operator/values.yaml b/charts/aks-operator/values.yaml
@@ -11,6 +11,7 @@ httpProxy: ""
 httpsProxy: ""
 noProxy: ""
 additionalTrustedCAs: false
+
 ## Node labels for pod assignment
 ## Ref: https://kubernetes.io/docs/user-guide/node-selection/
 ##