From b561628b44cd5e279c14a5dbd78499e1d2f5654b Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Thu, 7 Aug 2025 03:10:52 +0000 Subject: [PATCH 1/8] test dalec image v1.32.5 --- Makefile | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 1d970e86bb..e623fa1897 100755 --- a/Makefile +++ b/Makefile @@ -14,14 +14,14 @@ PKG = sigs.k8s.io/azurefile-csi-driver GIT_COMMIT ?= $(shell git rev-parse HEAD) -REGISTRY ?= andyzhangx +REGISTRY = mcr.microsoft.com/oss/v2/kubernetes-csi REGISTRY_NAME ?= $(shell echo $(REGISTRY) | sed "s/.azurecr.io//g") IMAGE_NAME ?= azurefile-csi -IMAGE_VERSION ?= v1.34.0 +IMAGE_VERSION = v1.32.5 # Use a custom version for E2E tests if we are testing in CI ifdef CI ifndef PUBLISH -override IMAGE_VERSION := e2e-$(GIT_COMMIT) +override IMAGE_VERSION := $(IMAGE_VERSION) endif endif CSI_IMAGE_TAG ?= $(REGISTRY)/$(IMAGE_NAME):$(IMAGE_VERSION) @@ -93,11 +93,6 @@ e2e-test: .PHONY: e2e-bootstrap e2e-bootstrap: install-helm -ifdef WINDOWS_USE_HOST_PROCESS_CONTAINERS - (docker pull $(CSI_IMAGE_TAG) && docker pull $(CSI_IMAGE_TAG)-windows-hp) || make container-all push-manifest -else - docker pull $(CSI_IMAGE_TAG) || make container-all push-manifest -endif ifdef TEST_WINDOWS helm install azurefile-csi-driver charts/latest/azurefile-csi-driver --namespace kube-system --wait --timeout=15m -v=5 --debug \ ${E2E_HELM_OPTIONS} \ From 35f422394597a86e5ae32846f419b9876359eec0 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Fri, 8 Aug 2025 03:37:13 +0000 Subject: [PATCH 2/8] test v1.33.3 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e623fa1897..f762ffecfe 100755 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ GIT_COMMIT ?= $(shell git rev-parse HEAD) REGISTRY = mcr.microsoft.com/oss/v2/kubernetes-csi REGISTRY_NAME ?= $(shell echo $(REGISTRY) | sed "s/.azurecr.io//g") IMAGE_NAME ?= azurefile-csi -IMAGE_VERSION = v1.32.5 +IMAGE_VERSION = v1.33.3 # Use a custom version for E2E tests if we are testing in CI ifdef CI ifndef PUBLISH From 5b1b96aa1a6193201c380795d3ee20a9fd6a154e Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Sat, 9 Aug 2025 01:22:34 +0000 Subject: [PATCH 3/8] test dalec image v1.33.2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f762ffecfe..d402124ff9 100755 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ GIT_COMMIT ?= $(shell git rev-parse HEAD) REGISTRY = mcr.microsoft.com/oss/v2/kubernetes-csi REGISTRY_NAME ?= $(shell echo $(REGISTRY) | sed "s/.azurecr.io//g") IMAGE_NAME ?= azurefile-csi -IMAGE_VERSION = v1.33.3 +IMAGE_VERSION = v1.33.2 # Use a custom version for E2E tests if we are testing in CI ifdef CI ifndef PUBLISH From d91dd745f997385932e286e68df4361345a38471 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Thu, 21 Aug 2025 14:40:52 +0000 Subject: [PATCH 4/8] 1.33.4 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d402124ff9..ccb5283189 100755 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ GIT_COMMIT ?= $(shell git rev-parse HEAD) REGISTRY = mcr.microsoft.com/oss/v2/kubernetes-csi REGISTRY_NAME ?= $(shell echo $(REGISTRY) | sed "s/.azurecr.io//g") IMAGE_NAME ?= azurefile-csi -IMAGE_VERSION = v1.33.2 +IMAGE_VERSION = v1.33.4 # Use a custom version for E2E tests if we are testing in CI ifdef CI ifndef PUBLISH From a1599ff5059afcb872ff16800150d38b722aed93 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Fri, 22 Aug 2025 15:38:43 +0000 Subject: [PATCH 5/8] 1.33.4-2 --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ccb5283189..206c427880 100755 --- a/Makefile +++ b/Makefile @@ -17,13 +17,16 @@ GIT_COMMIT ?= $(shell git rev-parse HEAD) REGISTRY = mcr.microsoft.com/oss/v2/kubernetes-csi REGISTRY_NAME ?= $(shell echo $(REGISTRY) | sed "s/.azurecr.io//g") IMAGE_NAME ?= azurefile-csi -IMAGE_VERSION = v1.33.4 +IMAGE_VERSION = v1.33.4-2 # Use a custom version for E2E tests if we are testing in CI ifdef CI ifndef PUBLISH override IMAGE_VERSION := $(IMAGE_VERSION) endif endif +ifdef WINDOWS_USE_HOST_PROCESS_CONTAINERS +IMAGE_VERSION = v1.33.4 +endif 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") From 09b357d46bbfb0370be6a11ae5bfc32db2925788 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Sat, 23 Aug 2025 01:00:01 +0000 Subject: [PATCH 6/8] fix windows test failure --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 206c427880..f69f7b3fba 100755 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ override IMAGE_VERSION := $(IMAGE_VERSION) endif endif ifdef WINDOWS_USE_HOST_PROCESS_CONTAINERS -IMAGE_VERSION = v1.33.4 +override IMAGE_VERSION = v1.33.4 endif CSI_IMAGE_TAG ?= $(REGISTRY)/$(IMAGE_NAME):$(IMAGE_VERSION) CSI_IMAGE_TAG_LATEST = $(REGISTRY)/$(IMAGE_NAME):latest From c5115bfcad2e9a15f26622cd1f545e470afb9725 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Wed, 3 Sep 2025 03:47:45 +0000 Subject: [PATCH 7/8] 1.32.6 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f69f7b3fba..478ad55e32 100755 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ GIT_COMMIT ?= $(shell git rev-parse HEAD) REGISTRY = mcr.microsoft.com/oss/v2/kubernetes-csi REGISTRY_NAME ?= $(shell echo $(REGISTRY) | sed "s/.azurecr.io//g") IMAGE_NAME ?= azurefile-csi -IMAGE_VERSION = v1.33.4-2 +IMAGE_VERSION = v1.32.6 # Use a custom version for E2E tests if we are testing in CI ifdef CI ifndef PUBLISH @@ -25,7 +25,7 @@ override IMAGE_VERSION := $(IMAGE_VERSION) endif endif ifdef WINDOWS_USE_HOST_PROCESS_CONTAINERS -override IMAGE_VERSION = v1.33.4 +override IMAGE_VERSION = v1.32.6 endif CSI_IMAGE_TAG ?= $(REGISTRY)/$(IMAGE_NAME):$(IMAGE_VERSION) CSI_IMAGE_TAG_LATEST = $(REGISTRY)/$(IMAGE_NAME):latest From 14f75a1e477836f28cf77fc24b74e5a4542c347f Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Wed, 3 Sep 2025 06:48:30 +0000 Subject: [PATCH 8/8] disable azurefileProxy and installAznfsMount --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 478ad55e32..b74112f07a 100755 --- a/Makefile +++ b/Makefile @@ -31,7 +31,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" --set controller.runOnControlPlane=true --set controller.replicas=1 --set snapshot.snapshotController.replicas=1 --set node.azurefileProxy.migrateK8sRepo=true --set node.azurefileProxy.enabled=true --set node.azurefileProxy.installAznfsMount=true +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 --set node.azurefileProxy.migrateK8sRepo=true --set node.azurefileProxy.enabled=false --set node.azurefileProxy.installAznfsMount=false 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