Merge pull request openshift#102 from gnufied/rebase-1-32

OCPBUGS-51376: Rebase against v1.32.0

Author: openshift-merge-bot[bot]

Makefile

@@ -19,7 +19,7 @@ REGISTRY_NAME ?= $(shell echo $(REGISTRY) | sed "s/.azurecr.io//g")
 IMAGE_NAME ?= azuredisk-csi
 ifneq ($(BUILD_V2), true)
 PLUGIN_NAME = azurediskplugin
-IMAGE_VERSION ?= v1.31.4
+IMAGE_VERSION ?= v1.32.0
 CHART_VERSION ?= latest
 else
 PLUGIN_NAME = azurediskpluginv2
@@ -198,6 +198,7 @@ container-windows:
 ifdef WINDOWS_USE_HOST_PROCESS_CONTAINERS
 ifeq ($(OSVERSION),ltsc2022)
 	$(MAKE) container-windows-hostprocess
+	$(MAKE) container-windows-hostprocess-latest
 endif
 endif
 
@@ -256,14 +257,18 @@ ifdef PUBLISH
 		done; \
 	done
 	docker manifest inspect $(CSI_IMAGE_TAG_LATEST)
+	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
 
 .PHONY: push-latest
 push-latest:
 ifdef CI
 	docker manifest push --purge $(CSI_IMAGE_TAG_LATEST)
+	docker manifest push --purge $(CSI_IMAGE_TAG_LATEST)-windows-hp
 else
 	docker push $(CSI_IMAGE_TAG_LATEST)
+	docker push $(CSI_IMAGE_TAG_LATEST)-windows-hp
 endif
 
 .PHONY: clean

README.md

@@ -17,10 +17,9 @@ Disclaimer: Deploying this driver manually is not an officially supported Micros
 |Driver Version  |Image                                                      | supported k8s version |
 |----------------|-----------------------------------------------------------|-----------------------|
 |`master` branch |mcr.microsoft.com/k8s/csi/azuredisk-csi:latest             | 1.21+                 |
-|v1.31.4         |mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.31.4 | 1.21+                 |
-|v1.30.3         |mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.30.3 | 1.21+                 |
-|v1.29.8         |mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.29.8 | 1.21+                 |
-|v1.28.10         |mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.28.10 | 1.21+                 |
+|v1.32.0         |mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.32.0 | 1.21+                 |
+|v1.31.2         |mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.31.2 | 1.21+                 |
+|v1.30.7         |mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.30.7 | 1.21+                 |
 
 ### Driver parameters
 

charts/README.md

@@ -32,7 +32,8 @@
   - `--set node.cloudConfigSecretName`
   - `--set node.cloudConfigSecretNamesapce`
 - switch to `mcr.azk8s.cn` repository in Azure China: `--set image.baseRepo=mcr.azk8s.cn`
-
+- Microk8s based kubernetes recommended settings:
+  - `--set linux.kubelet="/var/snap/microk8s/common/var/lib/kubelet"` - sets correct path to microk8s kubelet even though a user has a folder link to it.
 ---
 
 ## Helm Chart Repository Management
@@ -60,7 +61,7 @@ helm repo update azuredisk-csi-driver
 ### install a specific version
 
 ```console
-helm install azuredisk-csi-driver azuredisk-csi-driver/azuredisk-csi-driver --namespace kube-system --version v1.31.4
+helm install azuredisk-csi-driver azuredisk-csi-driver/azuredisk-csi-driver --namespace kube-system --version 1.31.2
 ```
 
 ### install on Azure Stack