|
14 | 14 |
|
15 | 15 | PKG = sigs.k8s.io/azurefile-csi-driver |
16 | 16 | GIT_COMMIT ?= $(shell git rev-parse HEAD) |
17 | | -REGISTRY ?= andyzhangx |
| 17 | +REGISTRY = mcr.microsoft.com/oss/v2/kubernetes-csi |
18 | 18 | REGISTRY_NAME ?= $(shell echo $(REGISTRY) | sed "s/.azurecr.io//g") |
19 | 19 | IMAGE_NAME ?= azurefile-csi |
20 | | -IMAGE_VERSION ?= v1.36.0 |
| 20 | +IMAGE_VERSION = v1.35.0 |
21 | 21 | # Use a custom version for E2E tests if we are testing in CI |
22 | 22 | ifdef CI |
23 | 23 | ifndef PUBLISH |
24 | | -override IMAGE_VERSION := e2e-$(GIT_COMMIT) |
| 24 | +override IMAGE_VERSION := $(IMAGE_VERSION) |
25 | 25 | endif |
26 | 26 | endif |
| 27 | +ifdef WINDOWS_USE_HOST_PROCESS_CONTAINERS |
| 28 | +override IMAGE_VERSION = v1.35.0 |
| 29 | +endif |
27 | 30 | CSI_IMAGE_TAG ?= $(REGISTRY)/$(IMAGE_NAME):$(IMAGE_VERSION) |
28 | 31 | CSI_IMAGE_TAG_LATEST = $(REGISTRY)/$(IMAGE_NAME):latest |
29 | 32 | BUILD_DATE ?= $(shell date -u +"%Y-%m-%dT%H:%M:%SZ") |
30 | 33 | 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'" |
31 | | -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 |
| 34 | +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.enabled=true --set node.azurefileProxy.installAznfsMount=true |
32 | 35 | E2E_HELM_OPTIONS += ${EXTRA_HELM_OPTIONS} |
33 | 36 | ifdef KUBERNETES_VERSION # disable kubelet-registration-probe on capz cluster testing |
34 | 37 | E2E_HELM_OPTIONS += --set linux.enableRegistrationProbe=false --set windows.enableRegistrationProbe=false |
@@ -95,11 +98,6 @@ e2e-test: |
95 | 98 |
|
96 | 99 | .PHONY: e2e-bootstrap |
97 | 100 | e2e-bootstrap: install-helm |
98 | | -ifdef WINDOWS_USE_HOST_PROCESS_CONTAINERS |
99 | | - (docker pull $(CSI_IMAGE_TAG) && docker pull $(CSI_IMAGE_TAG)-windows-hp) || make container-all push-manifest |
100 | | -else |
101 | | - docker pull $(CSI_IMAGE_TAG) || make container-all push-manifest |
102 | | -endif |
103 | 101 | ifdef TEST_WINDOWS |
104 | 102 | helm install azurefile-csi-driver charts/latest/azurefile-csi-driver --namespace kube-system --wait --timeout=15m -v=5 --debug \ |
105 | 103 | ${E2E_HELM_OPTIONS} \ |
|
0 commit comments