NO-JIRA: Merge https://github.com/kubernetes/cloud-provider-vsphere:release-1.35 (93af0f7) into main

.github/dependabot.yml

@@ -38,6 +38,11 @@ updates:
   labels:
     - "ok-to-test"
   open-pull-requests-limit: 10
+  ignore:
+    # Ignore k8s modules as they are upgraded manually following the
+    # Kubernetes release cycle.
+    - dependency-name: "k8s.io/*"
+      update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
 
 ## Update dockerfile
 - target-branch: master
@@ -72,6 +77,9 @@ updates:
     prefix: ":seedling: (chore)"
   labels:
     - "ok-to-test"
+  ignore:
+    - dependency-name: "k8s.io/*"
+      update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
 
 # ##################
 # release branch N
@@ -113,6 +121,10 @@ updates:
     - "ok-to-test"
   open-pull-requests-limit: 5
   ignore:
+    # Fully ignore k8s modules on release branches. All k8s dependency
+    # updates are done manually following the Kubernetes patch release
+    # schedule.
+    - dependency-name: "k8s.io/*"
     - dependency-name: "*"
       update-types:
         - "version-update:semver-major"
@@ -157,6 +169,7 @@ updates:
   labels:
     - "ok-to-test"
   ignore:
+    - dependency-name: "k8s.io/*"
     - dependency-name: "*"
       update-types:
         - "version-update:semver-major"
@@ -202,6 +215,7 @@ updates:
     - "ok-to-test"
   open-pull-requests-limit: 5
   ignore:
+    - dependency-name: "k8s.io/*"
     - dependency-name: "*"
       update-types:
         - "version-update:semver-major"
@@ -246,6 +260,7 @@ updates:
   labels:
     - "ok-to-test"
   ignore:
+    - dependency-name: "k8s.io/*"
     - dependency-name: "*"
       update-types:
         - "version-update:semver-major"
@@ -291,6 +306,7 @@ updates:
     - "ok-to-test"
   open-pull-requests-limit: 5
   ignore:
+    - dependency-name: "k8s.io/*"
     - dependency-name: "*"
       update-types:
         - "version-update:semver-major"
@@ -335,6 +351,7 @@ updates:
   labels:
     - "ok-to-test"
   ignore:
+    - dependency-name: "k8s.io/*"
     - dependency-name: "*"
       update-types:
         - "version-update:semver-major"

.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@v6.0.2
+        uses: actions/checkout@v6.0.1
         with:
           fetch-depth: 0
 

.github/workflows/bump-k8s-dep.yml

@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6.0.2
+        uses: actions/checkout@v6.0.1
 
       - name: Set up Go
         uses: actions/setup-go@v6

.github/workflows/bump-test-k8s-dep.yml

@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6.0.2
+        uses: actions/checkout@v6.0.1
 
       - name: Set up Go
         uses: actions/setup-go@v6

.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@v6.0.2
+        uses: actions/checkout@v6.0.1
         with:
           fetch-depth: 0
 

.github/workflows/weekly-security-scan.yaml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Check out code
-      uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98 # tag=v4.2.2
+      uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # tag=v4.2.2
       with:
         ref: ${{ matrix.branch }}
     - name: Calculate go version

README.md

@@ -100,7 +100,7 @@ registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:v1.30.1
 Official releases of the vSphere Cloud Controller Manager container image can be found at:
 
 ```bash
-registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:v1.33.0 # <== latest version
+registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:v1.35.1 # <== latest version
 ```
 
 The very latest builds from the tip of master, which may not be stable, can be found at:

charts/vsphere-cpi/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: 1.35.0
+appVersion: 1.35.1
 description: A Helm chart for vSphere Cloud Provider Interface Manager (CPI)
 name: vsphere-cpi
-version: 1.35.0
+version: 1.35.1
 keywords:
   - vsphere
   - vmware

charts/vsphere-cpi/README.md

@@ -153,7 +153,7 @@ helm repo add vsphere-cpi https://kubernetes.github.io/cloud-provider-vsphere
 helm repo update
 
 # Package CPI Chart
-VERSION=1.30.1
+VERSION=1.35.1
 cd charts
 helm package vsphere-cpi --version $VERSION --app-version $VERSION
 

charts/vsphere-cpi/values.yaml

@@ -50,7 +50,7 @@ serviceAccount:
 daemonset:
   annotations: {}
   image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere
-  tag: v1.35.0
+  tag: v1.35.1
   pullPolicy: IfNotPresent
   dnsPolicy: ClusterFirst
   cmdline:

cluster/images/controller-manager/Dockerfile

@@ -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.35.0
+ARG VERSION=1.35.1
 
 # This build arg controls the GOPROXY setting
 ARG GOPROXY

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.35.0
+          image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:v1.35.1
           args:
             - --cloud-provider=vsphere
             - --v=2

go.mod

@@ -16,25 +16,25 @@ require (
 	github.com/vmware-tanzu/nsx-operator/pkg/apis v0.0.0-20240827061921-8f0982975508
 	github.com/vmware-tanzu/nsx-operator/pkg/client v0.0.0-20240827061921-8f0982975508
 	github.com/vmware-tanzu/vm-operator/api v1.8.6
-	github.com/vmware/govmomi v0.53.0
+	github.com/vmware/govmomi v0.52.0
 	github.com/vmware/vsphere-automation-sdk-go/lib v0.7.0
 	github.com/vmware/vsphere-automation-sdk-go/runtime v0.7.0
 	github.com/vmware/vsphere-automation-sdk-go/services/nsxt v0.12.0
-	golang.org/x/net v0.49.0
+	golang.org/x/net v0.48.0
 	gopkg.in/gcfg.v1 v1.2.3
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/api v0.36.0-alpha.0
-	k8s.io/apimachinery v0.36.0-alpha.0
-	k8s.io/client-go v0.36.0-alpha.0
-	k8s.io/cloud-provider v0.35.0
-	k8s.io/code-generator v0.35.0
-	k8s.io/component-base v0.36.0-alpha.0
+	k8s.io/api v0.35.2
+	k8s.io/apimachinery v0.35.2
+	k8s.io/client-go v0.35.2
+	k8s.io/cloud-provider v0.35.2
+	k8s.io/code-generator v0.35.2
+	k8s.io/component-base v0.35.2
 	k8s.io/klog/v2 v2.130.1
 	sigs.k8s.io/yaml v1.6.0
 )
 
 require (
-	cel.dev/expr v0.24.0 // indirect
+	cel.dev/expr v0.25.1 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
 	github.com/NYTimes/gziphandler v1.1.1 // indirect
 	github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
@@ -84,46 +84,46 @@ require (
 	go.etcd.io/etcd/api/v3 v3.6.5 // indirect
 	go.etcd.io/etcd/client/pkg/v3 v3.6.5 // indirect
 	go.etcd.io/etcd/client/v3 v3.6.5 // indirect
-	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
+	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
-	go.opentelemetry.io/otel v1.36.0 // indirect
+	go.opentelemetry.io/otel v1.40.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
-	go.opentelemetry.io/otel/metric v1.36.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.36.0 // indirect
-	go.opentelemetry.io/otel/trace v1.36.0 // indirect
+	go.opentelemetry.io/otel/metric v1.40.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.40.0 // indirect
+	go.opentelemetry.io/otel/trace v1.40.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.5.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.3 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
-	golang.org/x/crypto v0.47.0 // indirect
+	golang.org/x/crypto v0.46.0 // indirect
 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
-	golang.org/x/mod v0.32.0 // indirect
-	golang.org/x/oauth2 v0.30.0 // indirect
+	golang.org/x/mod v0.30.0 // indirect
+	golang.org/x/oauth2 v0.34.0 // indirect
 	golang.org/x/sync v0.19.0 // indirect
 	golang.org/x/sys v0.40.0 // indirect
-	golang.org/x/term v0.39.0 // indirect
-	golang.org/x/text v0.34.0 // indirect
+	golang.org/x/term v0.38.0 // indirect
+	golang.org/x/text v0.32.0 // indirect
 	golang.org/x/time v0.9.0 // indirect
-	golang.org/x/tools v0.41.0 // indirect
+	golang.org/x/tools v0.39.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
-	google.golang.org/grpc v1.72.2 // indirect
-	google.golang.org/protobuf v1.36.8 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
+	google.golang.org/grpc v1.79.3 // indirect
+	google.golang.org/protobuf v1.36.10 // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiextensions-apiserver v0.31.0-alpha.3 // indirect
-	k8s.io/apiserver v0.36.0-alpha.0 // indirect
-	k8s.io/component-helpers v0.36.0-alpha.0 // indirect
-	k8s.io/controller-manager v0.36.0-alpha.0 // indirect
+	k8s.io/apiextensions-apiserver v0.35.2 // indirect
+	k8s.io/apiserver v0.35.2 // indirect
+	k8s.io/component-helpers v0.35.2 // indirect
+	k8s.io/controller-manager v0.35.2 // indirect
 	k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b // indirect
-	k8s.io/kms v0.36.0-alpha.0 // indirect
+	k8s.io/kms v0.35.2 // indirect
 	k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
 	k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
 	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect