diff --git a/Makefile b/Makefile index 5bf5948aba..8734eede2b 100755 --- a/Makefile +++ b/Makefile @@ -179,6 +179,11 @@ container-windows-hostprocess: docker buildx build --pull --output=type=$(OUTPUT_TYPE) --platform="windows/$(ARCH)" --provenance=false --sbom=false \ -t $(CSI_IMAGE_TAG)-windows-hp -f ./pkg/azurefileplugin/WindowsHostProcess.Dockerfile . +.PHONY: container-windows-hostprocess-latest +container-windows-hostprocess-latest: + docker buildx build --pull --output=type=$(OUTPUT_TYPE) --platform="windows/$(ARCH)" --provenance=false --sbom=false \ + -t $(CSI_IMAGE_TAG_LATEST)-windows-hp -f ./pkg/azurefileplugin/WindowsHostProcess.Dockerfile . + .PHONY: container-all container-all: azurefile-windows docker buildx rm container-builder || true @@ -220,7 +225,7 @@ ifdef PUBLISH done; \ done docker manifest inspect $(CSI_IMAGE_TAG_LATEST) - docker manifest create --amend $(CSI_IMAGE_TAG_LATEST)-windows-hp $(CSI_IMAGE_TAG)-windows-hp + docker manifest create --amend $(CSI_IMAGE_TAG_LATEST)-windows-hp $(CSI_IMAGE_TAG_LATEST)-windows-hp docker manifest inspect $(CSI_IMAGE_TAG_LATEST)-windows-hp endif diff --git a/charts/latest/azurefile-csi-driver-v0.0.0.tgz b/charts/latest/azurefile-csi-driver-v0.0.0.tgz index 4d7840616b..bccae8edc3 100644 Binary files a/charts/latest/azurefile-csi-driver-v0.0.0.tgz and b/charts/latest/azurefile-csi-driver-v0.0.0.tgz differ diff --git a/charts/latest/azurefile-csi-driver/templates/csi-azurefile-node-windows-hostprocess.yaml b/charts/latest/azurefile-csi-driver/templates/csi-azurefile-node-windows-hostprocess.yaml index fdb226e6a5..6d18432678 100644 --- a/charts/latest/azurefile-csi-driver/templates/csi-azurefile-node-windows-hostprocess.yaml +++ b/charts/latest/azurefile-csi-driver/templates/csi-azurefile-node-windows-hostprocess.yaml @@ -73,12 +73,7 @@ spec: command: - "powershell.exe" - "-c" - - "New-Item" - - "-ItemType" - - "Directory" - - "-Path" - - "C:\\var\\lib\\kubelet\\plugins\\{{ .Values.driver.name }}\\" - - "-Force" + - "New-Item -ItemType Directory -Path C:\\var\\lib\\kubelet\\plugins\\{{ .Values.driver.name }}\\ -Force" containers: - name: node-driver-registrar {{- if hasPrefix "/" .Values.image.nodeDriverRegistrar.repository }} diff --git a/deploy/csi-azurefile-node-windows-hostprocess.yaml b/deploy/csi-azurefile-node-windows-hostprocess.yaml index bc8c81f5e4..3ca6921856 100644 --- a/deploy/csi-azurefile-node-windows-hostprocess.yaml +++ b/deploy/csi-azurefile-node-windows-hostprocess.yaml @@ -46,12 +46,7 @@ spec: command: - "powershell.exe" - "-c" - - "New-Item" - - "-ItemType" - - "Directory" - - "-Path" - - "C:\\var\\lib\\kubelet\\plugins\\{{ .Values.driver.name }}\\" - - "-Force" + - "New-Item -ItemType Directory -Path C:\\var\\lib\\kubelet\\plugins\\file.csi.azure.com\\ -Force" containers: - name: node-driver-registrar image: mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.8.0 diff --git a/hack/release-image.sh b/hack/release-image.sh index 89f8074d96..9f083921d2 100755 --- a/hack/release-image.sh +++ b/hack/release-image.sh @@ -28,7 +28,7 @@ export CI=1 export PUBLISH=1 az acr login --name $REGISTRY_NAME -make container-all push-manifest push-latest +make container-all container-windows-hostprocess-latest push-manifest push-latest echo "sleep 60s ..." sleep 60