Merge pull request #1358 from andyzhangx/fix-runOnMaster

fix: incorrect runOnMaster config
kubernetes-sigs · May 29, 2022 · 7d115ab · 7d115ab
2 parents 8b97465 + 641b26f
commit 7d115ab
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -123,6 +123,7 @@ ifdef TEST_WINDOWS
 		--set windows.useHostProcessContainers=${WINDOWS_USE_HOST_PROCESS_CONTAINERS} \
 		--set linux.enabled=false \
 		--set controller.replicas=1 \
+		--set controller.runOnMaster=true \
 		--set controller.logLevel=6 \
 		--set node.logLevel=6 \
 		--set cloud=$(CLOUD)

diff --git a/charts/latest/azuredisk-csi-driver-v1.19.0.tgz b/charts/latest/azuredisk-csi-driver-v1.19.0.tgz
diff --git a/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml b/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
@@ -26,7 +26,7 @@ spec:
       nodeSelector:
         kubernetes.io/os: linux
         {{- if .Values.controller.runOnMaster}}
-        kubernetes.io/role: master
+        node-role.kubernetes.io/master: ""
         {{- end}}
       priorityClassName: system-cluster-critical
 {{- with .Values.controller.tolerations }}

diff --git a/test/external-e2e/run.sh b/test/external-e2e/run.sh
@@ -34,7 +34,7 @@ setup_e2e_binaries() {
     tar -xvf e2e-tests.tar.gz && rm e2e-tests.tar.gz
 
     # test on alternative driver name
-    export EXTRA_HELM_OPTIONS="--set controller.disableAvailabilitySetNodes=true --set controller.replicas=1 --set driver.name=$DRIVER.csi.azure.com --set controller.name=csi-$DRIVER-controller --set linux.dsName=csi-$DRIVER-node --set windows.dsName=csi-$DRIVER-node-win --set controller.vmssCacheTTLInSeconds=60"
+    export EXTRA_HELM_OPTIONS="--set controller.disableAvailabilitySetNodes=true --set controller.replicas=1 --set driver.name=$DRIVER.csi.azure.com --set controller.name=csi-$DRIVER-controller --set linux.dsName=csi-$DRIVER-node --set windows.dsName=csi-$DRIVER-node-win --set controller.vmssCacheTTLInSeconds=60  --set controller.runOnMaster=true"
     # install the azuredisk-csi-driver driver
     make e2e-bootstrap
     sed -i "s/csi-azuredisk-controller/csi-$DRIVER-controller/g" deploy/example/metrics/csi-azuredisk-controller-svc.yaml