openshift · cloud-team-rebase-bot · Oct 20, 2025 · Nov 20, 2025 · Nov 20, 2025 · Nov 18, 2025
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -77,13 +77,13 @@ updates:
 # release branch N
 # ##################
 # GitHub Actions
-- target-branch: release-1.34
+- target-branch: release-1.35
   package-ecosystem: "github-actions"
   directory: "/"
   schedule:
     interval: "weekly"
   commit-message:
-    prefix: ":seedling: (chore)[release-1.34]"
+    prefix: ":seedling: (chore)[release-1.35]"
   labels:
     - "ok-to-test"
     - "area/ci"
@@ -97,7 +97,7 @@ updates:
         - "version-update:semver-minor"
 
 # Main Go module
-- target-branch: release-1.34
+- target-branch: release-1.35
   package-ecosystem: "gomod"
   directory: "/"
   schedule:
@@ -108,7 +108,7 @@ updates:
     kubernetes:
       patterns: [ "k8s.io/*" ]
   commit-message:
-    prefix: ":seedling: (chore)[release-1.34]"
+    prefix: ":seedling: (chore)[release-1.35]"
   labels:
     - "ok-to-test"
   open-pull-requests-limit: 5
@@ -119,13 +119,13 @@ updates:
         - "version-update:semver-minor"
 
 ## Update dockerfile
-- target-branch: release-1.34
+- target-branch: release-1.35
   package-ecosystem: docker
   directory: "/cluster/images/controller-manager"
   schedule:
     interval: weekly
   commit-message:
-    prefix: ":seedling: (chore)[release-1.34]"
+    prefix: ":seedling: (chore)[release-1.35]"
   labels:
     - "ok-to-test"
   ignore:
@@ -138,7 +138,7 @@ updates:
       patterns: [ "*" ]
 
 # Test Go module
-- target-branch: release-1.34
+- target-branch: release-1.35
   package-ecosystem: "gomod"
   directory: "/test/e2e"
   schedule:
@@ -153,7 +153,7 @@ updates:
     onsi:
       patterns: [ "github.com/onsi/*" ]
   commit-message:
-    prefix: ":seedling: (chore)[release-1.34]"
+    prefix: ":seedling: (chore)[release-1.35]"
   labels:
     - "ok-to-test"
   ignore:
@@ -166,13 +166,13 @@ updates:
 # release branch N-1
 # ################
 # GitHub Actions
-- target-branch: release-1.33
+- target-branch: release-1.34
   package-ecosystem: "github-actions"
   directory: "/"
   schedule:
     interval: "weekly"
   commit-message:
-    prefix: ":seedling: (chore)[release-1.33]"
+    prefix: ":seedling: (chore)[release-1.34]"
   labels:
     - "ok-to-test"
     - "area/ci"
@@ -186,7 +186,7 @@ updates:
         - "version-update:semver-minor"
 
 # Main Go module
-- target-branch: release-1.33
+- target-branch: release-1.34
   package-ecosystem: "gomod"
   directory: "/"
   schedule:
@@ -197,7 +197,7 @@ updates:
     kubernetes:
       patterns: [ "k8s.io/*" ]
   commit-message:
-    prefix: ":seedling: (chore)[release-1.33]"
+    prefix: ":seedling: (chore)[release-1.34]"
   labels:
     - "ok-to-test"
   open-pull-requests-limit: 5
@@ -208,13 +208,13 @@ updates:
         - "version-update:semver-minor"
 
 ## Update dockerfile
-- target-branch: release-1.33
+- target-branch: release-1.34
   package-ecosystem: docker
   directory: "/cluster/images/controller-manager"
   schedule:
     interval: weekly
   commit-message:
-    prefix: ":seedling: (chore)[release-1.33]"
+    prefix: ":seedling: (chore)[release-1.34]"
   labels:
     - "ok-to-test"
   ignore:
@@ -227,7 +227,7 @@ updates:
       patterns: [ "*" ]
 
 # Test Go module
-- target-branch: release-1.33
+- target-branch: release-1.34
   package-ecosystem: "gomod"
   directory: "/test/e2e"
   schedule:
@@ -242,7 +242,7 @@ updates:
     onsi:
       patterns: [ "github.com/onsi/*" ]
   commit-message:
-    prefix: ":seedling: (chore)[release-1.33]"
+    prefix: ":seedling: (chore)[release-1.34]"
   labels:
     - "ok-to-test"
   ignore:
@@ -255,13 +255,13 @@ updates:
 # release branch N-2
 # ##################
 # GitHub Actions
-- target-branch: release-1.32
+- target-branch: release-1.33
   package-ecosystem: "github-actions"
   directory: "/"
   schedule:
     interval: "weekly"
   commit-message:
-    prefix: ":seedling: (chore)[release-1.32]"
+    prefix: ":seedling: (chore)[release-1.33]"
   labels:
     - "ok-to-test"
     - "area/ci"
@@ -275,7 +275,7 @@ updates:
         - "version-update:semver-minor"
 
 # Main Go module
-- target-branch: release-1.32
+- target-branch: release-1.33
   package-ecosystem: "gomod"
   directory: "/"
   schedule:
@@ -286,7 +286,7 @@ updates:
     kubernetes:
       patterns: [ "k8s.io/*" ]
   commit-message:
-    prefix: ":seedling: (chore)[release-1.32]"
+    prefix: ":seedling: (chore)[release-1.33]"
   labels:
     - "ok-to-test"
   open-pull-requests-limit: 5
@@ -297,13 +297,13 @@ updates:
         - "version-update:semver-minor"
 
 ## Update dockerfile
-- target-branch: release-1.32
+- target-branch: release-1.33
   package-ecosystem: docker
   directory: "/cluster/images/controller-manager"
   schedule:
     interval: weekly
   commit-message:
-    prefix: ":seedling: (chore)[release-1.32]"
+    prefix: ":seedling: (chore)[release-1.33]"
   labels:
     - "ok-to-test"
   ignore:
@@ -316,7 +316,7 @@ updates:
       patterns: [ "*" ]
 
 # Test Go module
-- target-branch: release-1.32
+- target-branch: release-1.33
   package-ecosystem: "gomod"
   directory: "/test/e2e"
   schedule:
@@ -331,7 +331,7 @@ updates:
     onsi:
       patterns: [ "github.com/onsi/*" ]
   commit-message:
-    prefix: ":seedling: (chore)[release-1.32]"
+    prefix: ":seedling: (chore)[release-1.33]"
   labels:
     - "ok-to-test"
   ignore:

diff --git a/.github/workflows/auto-sync-gh-pages.yml b/.github/workflows/auto-sync-gh-pages.yml
@@ -18,7 +18,7 @@ jobs:
     steps:
       # This step uses Github's checkout-action: https://github.com/actions/checkout
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6.0.1
         with:
           fetch-depth: 0
 

diff --git a/.github/workflows/bump-k8s-dep.yml b/.github/workflows/bump-k8s-dep.yml
@@ -15,10 +15,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6.0.1
 
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version-file: 'go.mod'
 

diff --git a/.github/workflows/bump-test-k8s-dep.yml b/.github/workflows/bump-test-k8s-dep.yml
@@ -15,10 +15,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6.0.1
 
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version-file: 'test/e2e/go.mod'
 

diff --git a/.github/workflows/generate-release-notes.yml b/.github/workflows/generate-release-notes.yml
@@ -18,7 +18,7 @@ jobs:
     steps:
       # This step uses Github's checkout-action: https://github.com/actions/checkout
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6.0.1
         with:
           fetch-depth: 0
 
@@ -29,7 +29,7 @@ jobs:
           git config user.email "[email protected]"
 
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version-file: 'go.mod'
 

diff --git a/.github/workflows/weekly-security-scan.yaml b/.github/workflows/weekly-security-scan.yaml
@@ -13,19 +13,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branch: [ master, release-1.34, release-1.33, release-1.32 ]
+        branch: [ master, release-1.35, release-1.34, release-1.33 ]
     name: Trivy
     runs-on: ubuntu-latest
     steps:
     - name: Check out code
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4.2.2
+      uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # tag=v4.2.2
       with:
         ref: ${{ matrix.branch }}
     - name: Calculate go version
       id: vars
       run: echo "go_version=$(make go-version)" >> $GITHUB_OUTPUT
     - name: Set up Go
-      uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # tag=v5.1.0
+      uses: actions/setup-go@c0137caad775660c0844396c52da96e560aba63d # tag=v5.1.0
       with:
         go-version: ${{ steps.vars.outputs.go_version }}
     - name: Run verify security target

diff --git a/README.md b/README.md
@@ -25,6 +25,7 @@ Version matrix:
 
 | Kubernetes Version | vSphere Cloud Provider Release Version | Cloud Provider Branch |
 |--------------------|----------------------------------------|-----------------------|
+| v1.35.X            | v1.35.X                                | release-1.35          |
 | v1.34.X            | v1.34.X                                | release-1.34          |
 | v1.33.X            | v1.33.X                                | release-1.33          |
 | v1.32.X            | v1.32.X                                | release-1.32          |

diff --git a/charts/vsphere-cpi-1.35.0.tgz b/charts/vsphere-cpi-1.35.0.tgz
diff --git a/charts/vsphere-cpi/Chart.yaml b/charts/vsphere-cpi/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: 1.34.0
+appVersion: 1.35.0
 description: A Helm chart for vSphere Cloud Provider Interface Manager (CPI)
 name: vsphere-cpi
-version: 1.34.0
+version: 1.35.0
 keywords:
   - vsphere
   - vmware

diff --git a/charts/vsphere-cpi/values.yaml b/charts/vsphere-cpi/values.yaml
@@ -50,7 +50,7 @@ serviceAccount:
 daemonset:
   annotations: {}
   image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere
-  tag: v1.34.0
+  tag: v1.35.0
   pullPolicy: IfNotPresent
   dnsPolicy: ClusterFirst
   cmdline:

diff --git a/cluster/images/controller-manager/Dockerfile b/cluster/images/controller-manager/Dockerfile
@@ -14,7 +14,7 @@
 ##                               BUILD ARGS                                   ##
 ################################################################################
 # This build arg allows the specification of a custom Golang image.
-ARG GOLANG_IMAGE=golang:1.24.6
+ARG GOLANG_IMAGE=golang:1.25.0
 
 # The distroless image on which the CPI manager image is built.
 ARG DISTROLESS_IMAGE=gcr.io/distroless/static-debian11:latest
@@ -27,7 +27,7 @@ ARG DISTROLESS_IMAGE=gcr.io/distroless/static-debian11:latest
 FROM ${GOLANG_IMAGE} as builder
 
 # This build arg is the version to embed in the CPI binary
-ARG VERSION=1.34.0
+ARG VERSION=1.35.0
 
 # This build arg controls the GOPROXY setting
 ARG GOPROXY
@@ -45,7 +45,7 @@ RUN go build -a -ldflags="-w -s -extldflags=static -X main.version=${VERSION}" -
 ################################################################################
 # Copy the manager into the distroless image.
 FROM ${DISTROLESS_IMAGE}
-LABEL maintainer="Gong Zhang <gong.zhang@broadcom.com>"
+LABEL maintainer="Danqing Hou <danqing.hou@broadcom.com>"
 
 USER nobody
 

diff --git a/docs/book/tutorials/disable-node-deletion.yaml b/docs/book/tutorials/disable-node-deletion.yaml
@@ -233,7 +233,7 @@ spec:
       priorityClassName: system-node-critical
       containers:
         - name: vsphere-cloud-controller-manager
-          image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:v1.34.0
+          image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:v1.35.0
           args:
             - --cloud-provider=vsphere
             - --v=2