File tree Expand file tree Collapse file tree 1 file changed +6
-8
lines changed
Expand file tree Collapse file tree 1 file changed +6
-8
lines changed Original file line number Diff line number Diff line change 1414
1515PKG = sigs.k8s.io/azurefile-csi-driver
1616GIT_COMMIT ?= $(shell git rev-parse HEAD)
17- REGISTRY ?= andyzhangx
17+ REGISTRY = mcr.microsoft.com/oss/v2/kubernetes-csi
1818REGISTRY_NAME ?= $(shell echo $(REGISTRY ) | sed "s/.azurecr.io//g")
1919IMAGE_NAME ?= azurefile-csi
2020IMAGE_VERSION ?= v1.33.6
2121# Use a custom version for E2E tests if we are testing in CI
2222ifdef CI
2323ifndef PUBLISH
24- override IMAGE_VERSION := e2e- $( GIT_COMMIT )
24+ override IMAGE_VERSION := $( IMAGE_VERSION )
2525endif
2626endif
27+ ifdef WINDOWS_USE_HOST_PROCESS_CONTAINERS
28+ override IMAGE_VERSION = v1.33.6
29+ endif
2730CSI_IMAGE_TAG ?= $(REGISTRY ) /$(IMAGE_NAME ) :$(IMAGE_VERSION )
2831CSI_IMAGE_TAG_LATEST = $(REGISTRY ) /$(IMAGE_NAME ) :latest
2932BUILD_DATE ?= $(shell date -u +"% Y-% m-% dT% H:% M:% SZ")
@@ -93,11 +96,6 @@ e2e-test:
9396
9497.PHONY : e2e-bootstrap
9598e2e-bootstrap : install-helm
96- ifdef WINDOWS_USE_HOST_PROCESS_CONTAINERS
97- (docker pull $(CSI_IMAGE_TAG) && docker pull $(CSI_IMAGE_TAG)-windows-hp) || make container-all push-manifest
98- else
99- docker pull $(CSI_IMAGE_TAG) || make container-all push-manifest
100- endif
10199ifdef TEST_WINDOWS
102100 helm install azurefile-csi-driver charts/latest/azurefile-csi-driver --namespace kube-system --wait --timeout=15m -v=5 --debug \
103101 ${E2E_HELM_OPTIONS} \
@@ -244,4 +242,4 @@ endif
244242
245243.PHONY : azurefile-proxy
246244azurefile-proxy :
247- CGO_ENABLED=0 GOOS=linux GOARCH=$(ARCH ) go build -mod vendor -ldflags=" -s -w" -o _output/${ARCH} /azurefile-proxy ./pkg/azurefile-proxy
245+ CGO_ENABLED=0 GOOS=linux GOARCH=$(ARCH ) go build -mod vendor -ldflags=" -s -w" -o _output/${ARCH} /azurefile-proxy ./pkg/azurefile-proxy
You can’t perform that action at this time.
0 commit comments