Merge pull request #354 from openshift/sync-main-1.34

OSASINFRA-3954: Rebase main onto release-1.34

Author: openshift-merge-bot[bot]

.gitignore

@@ -5,12 +5,6 @@
 .idea
 .DS_Store
 
-# For konflux
-!vendor/github.com/google/gnostic-models/jsonschema/schema.json
-!vendor/github.com/google/gnostic-models/openapiv2/openapi-2.0.json
-!vendor/go.opentelemetry.io/otel/renovate.json
-!vendor/k8s.io/kubernetes/test/e2e/testing-manifests/kubectl/agnhost-primary-service.json
-
 # OSX leaves these everywhere on SMB shares
 ._*
 

.golangci.yaml

@@ -1,10 +1,30 @@
-run:
-  concurrency: 2
-  timeout: 10m0s
+version: "2"
+output:
+  formats:
+    text:
+      path: stdout
+      colors: false
+issues:
+  max-same-issues: 0
+  max-issues-per-linter: 0
 linters:
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
   enable:
     - gofmt
-output:
-  formats:
-    - format: line-number
-      path: stdout
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Dockerfile

@@ -14,22 +14,22 @@
 ##                               BUILD ARGS                                   ##
 ################################################################################
 # This build arg allows the specification of a custom Golang image.
-ARG GOLANG_IMAGE=golang:1.24.3
+ARG GOLANG_IMAGE=golang:1.25.1
 
 # 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.4.0-go1.24.3-bookworm.0
+ARG DISTROLESS_IMAGE=registry.k8s.io/build-image/go-runner:v2.4.0-go1.25.1-bookworm.0
 
 # We use Alpine as the source for default CA certificates and some output
 # images
-ARG ALPINE_IMAGE=alpine:3.21.2
+ARG ALPINE_IMAGE=alpine:3.22.1
 
 # cinder-csi-plugin uses Debian as a base image
-ARG DEBIAN_IMAGE=registry.k8s.io/build-image/debian-base:bookworm-v1.0.4
+ARG DEBIAN_IMAGE=registry.k8s.io/build-image/debian-base:bookworm-v1.0.6
 
 ################################################################################
 ##                              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.63.4 run --timeout=20m ./...
+	go run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.3.1 run --timeout=20m ./...
 
 unit: work
 	go test -tags=unit $(shell go list ./... | sed -e '/sanity/ { N; d; }' | sed -e '/tests/ {N; d;}') $(TESTARGS)
@@ -166,7 +166,7 @@ build-local-image-%:
 		.
 
 # Build all images locally
-build-local-images: $(addprefix build-image-,$(IMAGE_NAMES))
+build-local-images: $(addprefix build-local-image-,$(IMAGE_NAMES))
 
 # Build a single image for all architectures in ARCHS and push it to REGISTRY
 push-multiarch-image-%:

OWNERS

@@ -11,6 +11,5 @@ approvers:
 reviewers:
 - dulek
 - kayrus
-- mdbooth
 - stephenfin
 - zetaab

charts/cinder-csi-plugin/Chart.yaml

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

charts/cinder-csi-plugin/values.yaml

@@ -8,7 +8,7 @@ csi:
   attacher:
     image:
       repository: registry.k8s.io/sig-storage/csi-attacher
-      tag: v4.7.0
+      tag: v4.10.0
       pullPolicy: IfNotPresent
     resources: {}
     extraArgs: {}
@@ -17,15 +17,15 @@ csi:
     topology: "true"
     image:
       repository: registry.k8s.io/sig-storage/csi-provisioner
-      tag: v5.1.0
+      tag: v5.3.0
       pullPolicy: IfNotPresent
     resources: {}
     extraArgs: {}
     extraEnv: []
   snapshotter:
     image:
       repository: registry.k8s.io/sig-storage/csi-snapshotter
-      tag: v8.1.0
+      tag: v8.3.0
       pullPolicy: IfNotPresent
     resources: {}
     extraArgs: {}
@@ -41,7 +41,7 @@ csi:
   resizer:
     image:
       repository: registry.k8s.io/sig-storage/csi-resizer
-      tag: v1.12.0
+      tag: v1.14.0
       pullPolicy: IfNotPresent
     resources: {}
     extraArgs: {}
@@ -55,7 +55,7 @@ csi:
   livenessprobe:
     image:
       repository: registry.k8s.io/sig-storage/livenessprobe
-      tag: v2.14.0
+      tag: v2.17.0
       pullPolicy: IfNotPresent
     failureThreshold: 5
     initialDelaySeconds: 10
@@ -67,7 +67,7 @@ csi:
   nodeDriverRegistrar:
     image:
       repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
-      tag: v2.12.0
+      tag: v2.15.0
       pullPolicy: IfNotPresent
     resources: {}
     extraArgs: {}

charts/manila-csi-plugin/Chart.yaml

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

charts/manila-csi-plugin/values.yaml

@@ -60,7 +60,7 @@ nodeplugin:
   registrar:
     image:
       repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
-      tag: v2.12.0
+      tag: v2.15.0
       pullPolicy: IfNotPresent
     resources: {}
     extraEnv: []
@@ -90,7 +90,7 @@ controllerplugin:
   provisioner:
     image:
       repository: registry.k8s.io/sig-storage/csi-provisioner
-      tag: v5.1.0
+      tag: v5.3.0
       pullPolicy: IfNotPresent
     resources: {}
     extraEnv: []
@@ -100,15 +100,15 @@ controllerplugin:
   snapshotter:
     image:
       repository: registry.k8s.io/sig-storage/csi-snapshotter
-      tag: v8.1.0
+      tag: v8.3.0
       pullPolicy: IfNotPresent
     resources: {}
     extraEnv: []
   # CSI external-resizer container spec
   resizer:
     image:
       repository: registry.k8s.io/sig-storage/csi-resizer
-      tag: v1.12.0
+      tag: v1.14.0
       pullPolicy: IfNotPresent
     resources: {}
     extraEnv: []

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

@@ -1,10 +1,10 @@
 apiVersion: v2
-appVersion: v1.33.0
+appVersion: v1.34.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.33.0
+version: 2.34.0
 maintainers:
   - name: eumel8
     email: [email protected]