Skip to content

Commit 4e4a3b8

Browse files
authored
Merge pull request #3924 from chethanv28/topic/chethanv28/update-golang-1.26
Update GoLang to 1.26 & set list volume reconcile sync as 5m
2 parents 69b807d + 31a9450 commit 4e4a3b8

12 files changed

Lines changed: 13 additions & 8 deletions

File tree

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module sigs.k8s.io/vsphere-csi-driver/v3
22

3-
go 1.25.5
3+
go 1.26.1
44

55
require (
66
github.com/agiledragon/gomonkey/v2 v2.13.0

hack/cover-images.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ usage: ${0} [FLAGS]
5555
minimal Docker images. This approach is much faster than multi-stage Docker builds.
5656
5757
Prerequisites:
58-
- Go 1.25 or later
58+
- Go 1.26 or later
5959
- Docker (running)
6060
- Git
6161
- Network access to download Go dependencies
@@ -257,7 +257,7 @@ echo "Checking prerequisites..."
257257

258258
# Check if Go is installed
259259
if ! command -v go &> /dev/null; then
260-
fatal "Go is not installed. Please install Go 1.25 or later."
260+
fatal "Go is not installed. Please install Go 1.26 or later."
261261
fi
262262

263263
# Check Go version

hack/release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ BUILD_RELEASE_TYPE="${BUILD_RELEASE_TYPE:-}"
4949
# CUSTOM_REPO_FOR_GOLANG can be used to pass custom repository for golang builder image.
5050
# Please ensure it ends with a '/'.
5151
# Example: CUSTOM_REPO_FOR_GOLANG=<docker-registry>/dockerhub-proxy-cache/library/
52-
GOLANG_IMAGE=${CUSTOM_REPO_FOR_GOLANG:-}golang:1.25.5
52+
GOLANG_IMAGE=${CUSTOM_REPO_FOR_GOLANG:-}golang:1.26.1
5353

5454
ARCH=amd64
5555
OSVERSION=1809

images/ci/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
################################################################################
1818
# The golang image is used to create the project's module and build caches
1919
# and is also the image on which this image is based.
20-
ARG GOLANG_IMAGE=golang:1.25.5
20+
ARG GOLANG_IMAGE=golang:1.26.1
2121

2222
################################################################################
2323
## GO MOD CACHE STAGE ##

images/driver/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
## BUILD ARGS ##
1717
################################################################################
1818
# This build arg allows the specification of a custom Golang image.
19-
ARG GOLANG_IMAGE=golang:1.25.5
19+
ARG GOLANG_IMAGE=golang:1.26.1
2020

2121
# This build arg allows the specification of a custom base image.
2222
ARG BASE_IMAGE=photon:5.0

images/syncer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
## BUILD ARGS ##
1515
################################################################################
1616
# This build arg allows the specification of a custom Golang image.
17-
ARG GOLANG_IMAGE=golang:1.25.5
17+
ARG GOLANG_IMAGE=golang:1.26.1
1818

1919
# This build arg allows the specification of a custom base image.
2020
ARG BASE_IMAGE=photon:5.0

images/windows/driver/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
## BUILD ARGS ##
1717
################################################################################
1818
# This build arg allows the specification of a custom Golang image.
19-
ARG GOLANG_IMAGE=golang:1.25.5
19+
ARG GOLANG_IMAGE=golang:1.26.1
2020
ARG OSVERSION
2121
ARG ARCH=amd64
2222

manifests/supervisorcluster/1.30/cns-csi.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,7 @@ spec:
352352
- name: csi-attacher
353353
image: localhost:5000/vmware.io/csi-attacher:v4.10.0_vmware.1
354354
args:
355+
- "--reconcile-sync=5m"
355356
- "--v=4"
356357
- "--timeout=300s"
357358
- "--csi-address=$(ADDRESS)"

manifests/supervisorcluster/1.31/cns-csi.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,7 @@ spec:
352352
- name: csi-attacher
353353
image: localhost:5000/vmware.io/csi-attacher:v4.10.0_vmware.1
354354
args:
355+
- "--reconcile-sync=5m"
355356
- "--v=4"
356357
- "--timeout=300s"
357358
- "--csi-address=$(ADDRESS)"

manifests/supervisorcluster/1.32/cns-csi.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,7 @@ spec:
352352
- name: csi-attacher
353353
image: localhost:5000/vmware.io/csi-attacher:v4.10.0_vmware.1
354354
args:
355+
- "--reconcile-sync=5m"
355356
- "--v=4"
356357
- "--timeout=300s"
357358
- "--csi-address=$(ADDRESS)"

0 commit comments

Comments
 (0)