Merge pull request #322 from shiftstack/merge-bot-release-4.18

OCPBUGS-57800: Rebase release-4.18 onto release-1.31

Author: openshift-merge-bot[bot]

.github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/bug_report.md.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:

Dockerfile

@@ -14,22 +14,22 @@
 ##                               BUILD ARGS                                   ##
 ################################################################################
 # This build arg allows the specification of a custom Golang image.
-ARG GOLANG_IMAGE=golang:1.22.2
+ARG GOLANG_IMAGE=golang:1.23.11
 
 # The distroless image on which the CPI manager image is built.
 #
 # Please do not use "latest". Explicit tags should be used to provide
 # deterministic builds. Follow what kubernetes uses to build
 # kube-controller-manager, for example for 1.27.x:
 # https://github.com/kubernetes/kubernetes/blob/release-1.27/build/common.sh#L99
-ARG DISTROLESS_IMAGE=registry.k8s.io/build-image/go-runner:v2.3.1-go1.22.2-bookworm.0
+ARG DISTROLESS_IMAGE=registry.k8s.io/build-image/go-runner:v2.4.0-go1.23.11-bookworm.0
 
 # We use Alpine as the source for default CA certificates and some output
 # images
-ARG ALPINE_IMAGE=alpine:3.17.5
+ARG ALPINE_IMAGE=alpine:3.17.10
 
 # cinder-csi-plugin uses Debian as a base image
-ARG DEBIAN_IMAGE=registry.k8s.io/build-image/debian-base:bullseye-v1.4.3
+ARG DEBIAN_IMAGE=registry.k8s.io/build-image/debian-base:bookworm-v1.0.4
 
 ################################################################################
 ##                              BUILD STAGE                                   ##

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.3
+appVersion: v1.31.4
 description: Cinder CSI Chart for OpenStack
 name: openstack-cinder-csi
-version: 2.31.7
+version: 2.31.8
 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.3
+appVersion: v1.31.4
 description: Manila CSI Chart for OpenStack
 name: openstack-manila-csi
-version: 2.31.3
+version: 2.31.5
 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.3
+appVersion: v1.31.4
 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.31.3
+version: 2.31.4
 maintainers:
   - name: eumel8
     email: [email protected]

cloudbuild.yaml

@@ -9,7 +9,7 @@ options:
   substitution_option: ALLOW_LOOSE
   machineType: 'N1_HIGHCPU_8'
 steps:
-  - name: gcr.io/k8s-testimages/gcb-docker-gcloud
+  - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud
     entrypoint: bash
     env:
     # default cloudbuild has HOME=/builder/home and docker buildx is in /root/.docker/cli-plugins/docker-buildx

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

@@ -162,7 +162,7 @@ spec:
       - name: liveness-probe
         ...
       - name: cinder-csi-plugin
-        image: docker.io/k8scloudprovider/cinder-csi-plugin:v1.31.3
+        image: docker.io/k8scloudprovider/cinder-csi-plugin:v1.31.4
         args:
         - /bin/cinder-csi-plugin
         - --endpoint=$(CSI_ENDPOINT)
@@ -212,7 +212,7 @@ spec:
       - name: liveness-probe
         ...
       - name: cinder-csi-plugin
-        image: docker.io/k8scloudprovider/cinder-csi-plugin:v1.31.3
+        image: docker.io/k8scloudprovider/cinder-csi-plugin:v1.31.4
         args:
         - /bin/cinder-csi-plugin
         - --endpoint=$(CSI_ENDPOINT)
@@ -278,7 +278,7 @@ spec:
         - Topology=true
         ...
       - name: cinder-csi-plugin
-        image: docker.io/k8scloudprovider/cinder-csi-plugin:v1.31.3
+        image: docker.io/k8scloudprovider/cinder-csi-plugin:v1.31.4
         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.3`
+  `registry.k8s.io/provider-os/k8s-keystone-auth:v1.31.4`
 - 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