From f0ccaf3b25ff792abce69bf9a01d74bf77adc66f Mon Sep 17 00:00:00 2001
From: Arvind Iyengar <arvind.iyengar@rancher.com>
Date: Thu, 17 Mar 2022 18:54:46 -0700
Subject: [PATCH] Fix nodeSelectors and tolerations

---
 charts/aks-operator/templates/deployment.yaml | 14 +++++++-------
 charts/aks-operator/values.yaml               |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/charts/aks-operator/templates/deployment.yaml b/charts/aks-operator/templates/deployment.yaml
index 69ab9982..2366d9f3 100644
--- 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
index 9803bf08..72c68763 100644
--- 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/
 ##