From d3a8a653dcda5285b1a6a8a21f969967b1510b02 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Tue, 17 Dec 2024 08:13:25 +0000 Subject: [PATCH] fix: runOnControlPlane chart config fix --- Makefile | 2 +- charts/latest/azurefile-csi-driver-1.31.0.tgz | Bin 13604 -> 13979 bytes .../templates/csi-azurefile-controller.yaml | 31 ++++++++++++------ .../templates/csi-snapshot-controller.yaml | 25 +++++++++++--- 4 files changed, 43 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 74856c5afe..82bf876c6f 100755 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ 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/azurefile.driverVersion=${IMAGE_VERSION} -X ${PKG}/pkg/azurefile.gitCommit=${GIT_COMMIT} -X ${PKG}/pkg/azurefile.buildDate=${BUILD_DATE} -s -w -extldflags '-static'" -E2E_HELM_OPTIONS ?= --set image.azurefile.repository=$(REGISTRY)/$(IMAGE_NAME) --set image.azurefile.tag=$(IMAGE_VERSION) --set node.enableKataCCMount=true --set linux.dnsPolicy=ClusterFirstWithHostNet --set driver.userAgentSuffix="e2e-test" +E2E_HELM_OPTIONS ?= --set image.azurefile.repository=$(REGISTRY)/$(IMAGE_NAME) --set image.azurefile.tag=$(IMAGE_VERSION) --set node.enableKataCCMount=true --set linux.dnsPolicy=ClusterFirstWithHostNet --set driver.userAgentSuffix="e2e-test" --set controller.runOnControlPlane=true --set controller.replicas=1 --set snapshot.snapshotController.replicas=1 E2E_HELM_OPTIONS += ${EXTRA_HELM_OPTIONS} ifdef KUBERNETES_VERSION # disable kubelet-registration-probe on capz cluster testing E2E_HELM_OPTIONS += --set linux.enableRegistrationProbe=false --set windows.enableRegistrationProbe=false diff --git a/charts/latest/azurefile-csi-driver-1.31.0.tgz b/charts/latest/azurefile-csi-driver-1.31.0.tgz index d3654bc2d2ba43ea185048f8221d5a08528312de..60d2169b075de29dafc4ee8732a7dc0531d92fdd 100644 GIT binary patch delta 13977 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

r4)-qFXPSGl|U*)0`CEH@LIK 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 V`uQH7{~G`R|No&x9rOU`0RWyQ*)aeB diff --git a/charts/latest/azurefile-csi-driver/templates/csi-azurefile-controller.yaml b/charts/latest/azurefile-csi-driver/templates/csi-azurefile-controller.yaml index 61cfa51470..0024ace83a 100644 --- a/charts/latest/azurefile-csi-driver/templates/csi-azurefile-controller.yaml +++ b/charts/latest/azurefile-csi-driver/templates/csi-azurefile-controller.yaml @@ -44,12 +44,27 @@ spec: {{- with .Values.controller.nodeSelector }} {{ toYaml . | indent 8 }} {{- end }} - {{- 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 }} priorityClassName: system-cluster-critical securityContext: seccompProfile: @@ -57,10 +72,6 @@ spec: {{- with .Values.controller.tolerations }} tolerations: {{ toYaml . | indent 8 }} -{{- end }} -{{- with .Values.controller.affinity }} - affinity: -{{ toYaml . | indent 8 }} {{- end }} {{- if .Values.imagePullSecrets }} imagePullSecrets: diff --git a/charts/latest/azurefile-csi-driver/templates/csi-snapshot-controller.yaml b/charts/latest/azurefile-csi-driver/templates/csi-snapshot-controller.yaml index b1ab6336ab..8b343c066b 100644 --- a/charts/latest/azurefile-csi-driver/templates/csi-snapshot-controller.yaml +++ b/charts/latest/azurefile-csi-driver/templates/csi-snapshot-controller.yaml @@ -45,6 +45,27 @@ spec: serviceAccountName: {{ .Values.serviceAccount.snapshotController }} nodeSelector: kubernetes.io/os: linux + # 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 }} priorityClassName: system-cluster-critical securityContext: seccompProfile: @@ -52,10 +73,6 @@ spec: {{- with .Values.controller.tolerations }} tolerations: {{ toYaml . | indent 8 }} -{{- end }} -{{- with .Values.controller.affinity }} - affinity: -{{ toYaml . | indent 8 }} {{- end }} {{- if .Values.imagePullSecrets }} imagePullSecrets: