From 1331337ac739f558a52522561fef334913cc3a3f Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Mon, 16 Dec 2024 14:04:14 +0000 Subject: [PATCH] fix: runOnControlPlane chart config --- Makefile | 5 ++- charts/latest/blob-csi-driver-v0.0.0.tgz | Bin 6182 -> 6265 bytes .../templates/csi-blob-controller.yaml | 31 ++++++++++++------ 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index d96d7bacd..a3c0afce0 100644 --- a/Makefile +++ b/Makefile @@ -29,10 +29,9 @@ CSI_IMAGE_TAG ?= $(REGISTRY)/$(IMAGE_NAME):$(IMAGE_VERSION) CSI_IMAGE_TAG_LATEST = $(REGISTRY)/$(IMAGE_NAME):latest BUILD_DATE ?= $(shell date -u +"%Y-%m-%dT%H:%M:%SZ") LDFLAGS ?= "-X ${PKG}/pkg/blob.driverVersion=${IMAGE_VERSION} -X ${PKG}/pkg/blob.gitCommit=${GIT_COMMIT} -X ${PKG}/pkg/blob.buildDate=${BUILD_DATE} -s -w -extldflags '-static'" +E2E_HELM_OPTIONS ?= --set image.blob.pullPolicy=Always --set image.blob.repository=$(REGISTRY)/$(IMAGE_NAME) --set image.blob.tag=$(IMAGE_VERSION) --set driver.userAgentSuffix="e2e-test" --set node.blobfuseProxy.migrateK8sRepo=true --set controller.runOnControlPlane=true ifdef ENABLE_BLOBFUSE_PROXY -E2E_HELM_OPTIONS ?= --set image.blob.pullPolicy=Always --set image.blob.repository=$(REGISTRY)/$(IMAGE_NAME) --set image.blob.tag=$(IMAGE_VERSION) --set driver.userAgentSuffix="e2e-test" --set controller.logLevel=6 --set node.logLevel=6 --set node.enableBlobfuseProxy=true --set node.blobfuseProxy.migrateK8sRepo=true -else -E2E_HELM_OPTIONS ?= --set image.blob.pullPolicy=Always --set image.blob.repository=$(REGISTRY)/$(IMAGE_NAME) --set image.blob.tag=$(IMAGE_VERSION) --set driver.userAgentSuffix="e2e-test" --set node.blobfuseProxy.migrateK8sRepo=true +E2E_HELM_OPTIONS += --set node.enableBlobfuseProxy=true --set image.blob.pullPolicy=Always --set controller.logLevel=6 --set node.logLevel=6 endif E2E_HELM_OPTIONS += ${EXTRA_HELM_OPTIONS} GO111MODULE = on diff --git a/charts/latest/blob-csi-driver-v0.0.0.tgz b/charts/latest/blob-csi-driver-v0.0.0.tgz index 1fb0e5bda3089221477e9141635e5fe64e94955d..0b7cc20dae08ca99f7b30a379c45167f9254d137 100644 GIT binary patch delta 6246 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 Q2LJ&7|H!pii2$$w04k7X6#xJL delta 6163 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 diff --git a/charts/latest/blob-csi-driver/templates/csi-blob-controller.yaml b/charts/latest/blob-csi-driver/templates/csi-blob-controller.yaml index 194f7399d..12e917225 100644 --- a/charts/latest/blob-csi-driver/templates/csi-blob-controller.yaml +++ b/charts/latest/blob-csi-driver/templates/csi-blob-controller.yaml @@ -28,10 +28,6 @@ spec: {{ toYaml .Values.podAnnotations | indent 8 }} {{- end }} spec: -{{- with .Values.controller.affinity }} - affinity: -{{ toYaml . | indent 8 }} -{{- end }} {{- if .Values.imagePullSecrets }} imagePullSecrets: {{ toYaml .Values.imagePullSecrets | indent 8 }} @@ -40,12 +36,27 @@ spec: serviceAccountName: {{ .Values.serviceAccount.controller }} nodeSelector: kubernetes.io/os: linux - {{- if .Values.controller.runOnMaster}} - node-role.kubernetes.io/master: "" - {{- end}} - {{- if .Values.controller.runOnControlPlane}} - node-role.kubernetes.io/control-plane: "" - {{- end}} + # runOnControlPlane=true or runOnMaster=true only takes effect if affinity is not set + {{- if contains (tpl "{{ .Values.controller.affinity }}" .) "nodeSelectorTerms" }} + {{- with .Values.controller.affinity }} + affinity: + {{ toYaml . | indent 8 }} + {{- end }} + {{- else if or .Values.controller.runOnControlPlane .Values.controller.runOnMaster}} + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + {{- if .Values.controller.runOnControlPlane}} + - key: node-role.kubernetes.io/control-plane + operator: Exists + {{- end}} + {{- if .Values.controller.runOnMaster}} + - key: node-role.kubernetes.io/master + operator: Exists + {{- end}} + {{- end }} {{- with .Values.controller.nodeSelector }} {{ toYaml . | indent 8 }} {{- end }}