From 4cf7f7d688c8c1d99b7b22095d6050cbf31e7bc0 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Sat, 28 May 2022 14:58:56 +0000 Subject: [PATCH] fix: incorrect runOnMaster config run on master for e2e test --- Makefile | 2 +- charts/latest/csi-driver-nfs-v4.1.0.tgz | Bin 3617 -> 3613 bytes .../templates/csi-nfs-controller.yaml | 2 +- test/external-e2e/run.sh | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b227d383..0656ea59 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,7 @@ REGISTRY_NAME ?= $(shell echo $(REGISTRY) | sed "s/.azurecr.io//g") IMAGE_TAG = $(REGISTRY)/$(IMAGENAME):$(IMAGE_VERSION) IMAGE_TAG_LATEST = $(REGISTRY)/$(IMAGENAME):latest -E2E_HELM_OPTIONS ?= --set image.nfs.repository=$(REGISTRY)/$(IMAGENAME) --set image.nfs.tag=$(IMAGE_VERSION) --set image.nfs.pullPolicy=Always --set feature.enableInlineVolume=true +E2E_HELM_OPTIONS ?= --set image.nfs.repository=$(REGISTRY)/$(IMAGENAME) --set image.nfs.tag=$(IMAGE_VERSION) --set image.nfs.pullPolicy=Always --set feature.enableInlineVolume=true --set controller.runOnMaster=true E2E_HELM_OPTIONS += ${EXTRA_HELM_OPTIONS} # Output type of docker buildx build diff --git a/charts/latest/csi-driver-nfs-v4.1.0.tgz b/charts/latest/csi-driver-nfs-v4.1.0.tgz index cdd4f01b206d892d74da2d3bd32bb4a2f85f3952..c0cf52a3e296b25d242a10b4a83b15a41b094e71 100644 GIT binary patch delta 3469 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 eVr+l2-r%*ome=w0RR7#6}LbDSO5U6&Dk;l diff --git a/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml b/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml index 1c070d5d..349ca95b 100644 --- a/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml +++ b/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml @@ -25,7 +25,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 index fc66718e..d5737abe 100644 --- a/test/external-e2e/run.sh +++ b/test/external-e2e/run.sh @@ -29,7 +29,7 @@ setup_e2e_binaries() { curl -sL https://storage.googleapis.com/kubernetes-release/release/v1.24.0/kubernetes-test-linux-amd64.tar.gz --output e2e-tests.tar.gz tar -xvf e2e-tests.tar.gz && rm e2e-tests.tar.gz - export EXTRA_HELM_OPTIONS="--set driver.name=$DRIVER.csi.k8s.io --set controller.name=csi-$DRIVER-controller --set node.name=csi-$DRIVER-node --set feature.enableInlineVolume=true" + export EXTRA_HELM_OPTIONS="--set driver.name=$DRIVER.csi.k8s.io --set controller.name=csi-$DRIVER-controller --set node.name=csi-$DRIVER-node --set feature.enableInlineVolume=true --set controller.runOnMaster=true" # test on alternative driver name sed -i "s/nfs.csi.k8s.io/$DRIVER.csi.k8s.io/g" deploy/example/storageclass-nfs.yaml