Merge branch 'kubernetes:master' into feat-support-of-one-storageClass

Author: Boston01

.github/ISSUE_TEMPLATE.md renamed to .github/ISSUE_TEMPLATE/bug_report.md

@@ -1,3 +1,12 @@
+---
+name: Bug report
+about: Bug report
+title: ''
+labels: ''
+assignees: ''
+
+---
+
 <!--
 Please add the affected binary name in the title unless multiple binaries are affected, e.g.
 [cinder-csi-plugin] Cannot delete PV
@@ -14,12 +23,7 @@ All the currently maintained binaries are:
 * barbican-kms-plugin
 -->
 
-**Is this a BUG REPORT or FEATURE REQUEST?**:
-
-> Uncomment only one, leave it on its own line: 
->
-> /kind bug
-> /kind feature
+/kind bug
 
 **What happened**:
 

.github/ISSUE_TEMPLATE/feature_report.md

@@ -0,0 +1,43 @@
+---
+name: Feature report
+about: Feature report
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!--
+Please add the affected binary name in the title unless multiple binaries are affected, e.g.
+[cinder-csi-plugin] Cannot delete PV
+For openstack-cloud-controller-manager, you can use [occm] for short.
+
+All the currently maintained binaries are:
+* openstack-cloud-controller-manager (occm)
+* cinder-csi-plugin
+* manila-csi-plugin
+* k8s-keystone-auth
+* client-keystone-auth
+* octavia-ingress-controller
+* magnum-auto-healer
+* barbican-kms-plugin
+-->
+
+/kind feature
+
+**What happened**:
+
+
+**What you expected to happen**:
+
+
+**How to reproduce it**:
+
+
+**Anything else we need to know?**:
+
+
+**Environment**:
+- openstack-cloud-controller-manager(or other related binary) version:
+- OpenStack version:
+- Others:

Makefile

@@ -81,7 +81,7 @@ $(BUILD_CMDS): $(SOURCES)
 test: unit functional
 
 check: work
-	go run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.61.0 run --timeout=20m ./...
+	go run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.63.4 run --timeout=20m ./...
 
 unit: work
 	go test -tags=unit $(shell go list ./... | sed -e '/sanity/ { N; d; }' | sed -e '/tests/ {N; d;}') $(TESTARGS)

charts/cinder-csi-plugin/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
-appVersion: v1.31.2
+appVersion: v1.32.0
 description: Cinder CSI Chart for OpenStack
 name: openstack-cinder-csi
-version: 2.32.0-alpha.0
+version: 2.33.0-alpha.0
 home: https://github.com/kubernetes/cloud-provider-openstack
 icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png
 maintainers:

charts/manila-csi-plugin/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
-appVersion: v1.31.2
+appVersion: v1.32.0
 description: Manila CSI Chart for OpenStack
 name: openstack-manila-csi
-version: 2.32.0-alpha.0
+version: 2.33.0-alpha.0
 home: http://github.com/kubernetes/cloud-provider-openstack
 icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png
 maintainers:

charts/openstack-cloud-controller-manager/Chart.yaml

@@ -1,10 +1,10 @@
 apiVersion: v2
-appVersion: v1.31.2
+appVersion: v1.32.0
 description: Openstack Cloud Controller Manager Helm Chart
 icon: https://object-storage-ca-ymq-1.vexxhost.net/swift/v1/6e4619c416ff4bd19e1c087f27a43eea/www-images-prod/openstack-logo/OpenStack-Logo-Vertical.png
 home: https://github.com/kubernetes/cloud-provider-openstack
 name: openstack-cloud-controller-manager
-version: 2.32.0-alpha.0
+version: 2.33.0-alpha.0
 maintainers:
   - name: eumel8
     email: [email protected]

docs/cinder-csi-plugin/multi-region-clouds.md

@@ -101,7 +101,7 @@ spec:
       - name: liveness-probe
         ...
       - name: cinder-csi-plugin
-        image: docker.io/k8scloudprovider/cinder-csi-plugin:v1.31.2
+        image: docker.io/k8scloudprovider/cinder-csi-plugin:v1.32.0
         args:
         - /bin/cinder-csi-plugin
         - --endpoint=$(CSI_ENDPOINT)
@@ -151,7 +151,7 @@ spec:
       - name: liveness-probe
         ...
       - name: cinder-csi-plugin
-        image: docker.io/k8scloudprovider/cinder-csi-plugin:v1.31.2
+        image: docker.io/k8scloudprovider/cinder-csi-plugin:v1.32.0
         args:
         - /bin/cinder-csi-plugin
         - --endpoint=$(CSI_ENDPOINT)
@@ -217,7 +217,7 @@ spec:
         - Topology=true
         ...
       - name: cinder-csi-plugin
-        image: docker.io/k8scloudprovider/cinder-csi-plugin:v1.31.2
+        image: docker.io/k8scloudprovider/cinder-csi-plugin:v1.32.0
         args:
         - /bin/cinder-csi-plugin
         - --endpoint=$(CSI_ENDPOINT)

docs/keystone-auth/using-keystone-webhook-authenticator-and-authorizer.md

@@ -252,7 +252,7 @@ it as a service. There are several things we need to notice in the
 deployment manifest:
 
 - We are using image
-  `registry.k8s.io/provider-os/k8s-keystone-auth:v1.31.2`
+  `registry.k8s.io/provider-os/k8s-keystone-auth:v1.32.0`
 - We use `k8s-auth-policy` configmap created above.
 - The pod uses service account `keystone-auth` created above.
 - We use `keystone-auth-certs` secret created above to inject the

docs/magnum-auto-healer/using-magnum-auto-healer.md

@@ -73,7 +73,7 @@ user_id=ceb61464a3d341ebabdf97d1d4b97099
 user_project_id=b23a5e41d1af4c20974bf58b4dff8e5a
 password=password
 region=RegionOne
-image=registry.k8s.io/provider-os/magnum-auto-healer:v1.31.2
+image=registry.k8s.io/provider-os/magnum-auto-healer:v1.32.0
 
 cat <<EOF | kubectl apply -f -
 ---

docs/octavia-ingress-controller/using-octavia-ingress-controller.md

@@ -172,7 +172,7 @@ Here are several other config options are not included in the example configurat
 ### Deploy octavia-ingress-controller
 
 ```shell
-image="registry.k8s.io/provider-os/octavia-ingress-controller:v1.31.2"
+image="registry.k8s.io/provider-os/octavia-ingress-controller:v1.32.0"
 
 cat <<EOF > /etc/kubernetes/octavia-ingress-controller/deployment.yaml
 ---