OCPBUGS-83587: Merge https://github.com/IBM-Cloud/cloud-provider-ibm:release-1.36 (e91b23b) into main

.github/dependabot.yml

@@ -9,6 +9,18 @@ updates:
   # Update the "github-actions" for each of the branches
   # ------------------------------------------------------------------------------------------------------------
 
+  - package-ecosystem: "github-actions"
+    directory: "/" # location of your .github/workflows directory
+    schedule:
+      interval: "cron"
+      cronjob: "36 11 * * *" # Run at 11:36 UTC daily
+    open-pull-requests-limit: 99
+    labels:
+      - "dependencies"
+      - "github-actions"
+      - "release-1.36"
+    target-branch: "release-1.36"
+
   - package-ecosystem: "github-actions"
     directory: "/" # location of your .github/workflows directory
     schedule:
@@ -97,6 +109,35 @@ updates:
   # Update the go modules for each of the branches
   # ------------------------------------------------------------------------------------------------------------
 
+  - package-ecosystem: "gomod" # Specifies the Go modules package ecosystem
+    directory: "/" # Location of your go.mod file
+    schedule:
+      interval: "cron"
+      cronjob: "36 10 * * *" # Run at 10:36 UTC daily
+    ignore:
+      - dependency-name: "k8s.io/api"
+        update-types: ["version-update:semver-minor"]
+      - dependency-name: "k8s.io/apimachinery"
+        update-types: ["version-update:semver-minor"]
+      - dependency-name: "k8s.io/client-go"
+        update-types: ["version-update:semver-minor"]
+      - dependency-name: "k8s.io/cloud-provider"
+        update-types: ["version-update:semver-minor"]
+      - dependency-name: "k8s.io/component-base"
+        update-types: ["version-update:semver-minor"]
+      - dependency-name: "k8s.io/component-helpers"
+        update-types: ["version-update:semver-minor"]
+    open-pull-requests-limit: 99
+    groups:
+      kubernetes-1.36:
+        patterns:
+          - "k8s.io/*"
+    labels:
+      - "dependencies"
+      - "go"
+      - "release-1.36"
+    target-branch: "release-1.36"
+
   - package-ecosystem: "gomod" # Specifies the Go modules package ecosystem
     directory: "/" # Location of your go.mod file
     schedule:

.github/workflows/dispatch-pr-create.yml

@@ -26,15 +26,7 @@ jobs:
         with:
           go-version: ${{ steps.get-ver.outputs.go_version }}
 
-      - name: Install golangci-lint v1
-        if: startsWith(steps.get-ver.outputs.golangci_version, 'v1')
-        uses: golangci/golangci-lint-action@v6 # v8 available, but only supports >= v2.1.0
-        with:
-          args: --disable-all --timeout 5m # disable linting, initialize cache
-          version: ${{ steps.get-ver.outputs.golangci_version }}
-
       - name: Install golangci-lint v2
-        if: startsWith(steps.get-ver.outputs.golangci_version, 'v2')
         uses: golangci/golangci-lint-action@v9
         with:
           version: ${{ steps.get-ver.outputs.golangci_version }}

.github/workflows/gatekeeper.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Wait for all other workflows
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         with:
           script: |
             const owner = context.repo.owner;

.github/workflows/go-mod-tidy.yml

@@ -0,0 +1,49 @@
+# This workflow checks that go.mod and go.sum are tidy
+# It runs "go mod tidy" and fails if there are any changes
+
+name: Go Mod Tidy
+
+on:
+  push:
+    paths:
+      - "**.go"
+      - "go.mod"
+      - "go.sum"
+      - ".github/workflows/go-mod-tidy.yml"
+  pull_request:
+    types: [opened, synchronize, reopened]
+    paths:
+      - "**.go"
+      - "go.mod"
+      - "go.sum"
+      - ".github/workflows/go-mod-tidy.yml"
+  workflow_dispatch: # Allow manual triggering
+
+jobs:
+  go-mod-tidy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+
+      - name: Extract Go version
+        id: get-ver
+        run: |
+          echo "go_version=$(grep '^go ' go.mod | awk '{ print $2 }')" >> "$GITHUB_OUTPUT"
+
+      - name: Set up Go
+        uses: actions/setup-go@v6
+        with:
+          go-version: ${{ steps.get-ver.outputs.go_version }}
+
+      - name: Run go mod tidy
+        run: go mod tidy
+
+      - name: Check for changes
+        run: |
+          if ! git diff --exit-code go.mod go.sum; then
+            echo "Error: go.mod or go.sum has changes after running 'go mod tidy'"
+            echo "Please run 'go mod tidy' locally and commit the changes"
+            exit 1
+          fi
+          echo "go.mod and go.sum are tidy"

.github/workflows/golangci-update.yml

@@ -20,6 +20,7 @@ jobs:
             release-1.33,
             release-1.34,
             release-1.35,
+            release-1.36,
           ]
     steps:
       - name: Set up Git config

.github/workflows/kube-update.yml

@@ -33,7 +33,14 @@ jobs:
       fail-fast: false
       max-parallel: 1
       matrix:
-        branch: [release-1.31, release-1.32, release-1.33, release-1.34, release-1.35]
+        branch:
+          [
+            release-1.32,
+            release-1.33,
+            release-1.34,
+            release-1.35,
+            release-1.36,
+          ]
     steps:
       - name: Set up Git config
         run: |

.github/workflows/markdown.yml

@@ -21,6 +21,6 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v6
 
-      - uses: DavidAnson/markdownlint-cli2-action@v22
+      - uses: DavidAnson/markdownlint-cli2-action@v23
         with:
           globs: '**/*.md'

Makefile

@@ -22,10 +22,10 @@ export
 GOPACKAGES=$(shell go list ./...)
 SHFILES=$(shell find . -type f -name '*.sh')
 
-GOLANGCI_LINT_VERSION := 2.10.1
+GOLANGCI_LINT_VERSION := 2.12.2
 GOLANGCI_LINT_EXISTS := $(shell golangci-lint --version 2>/dev/null)
 
-TAG ?= v1.35.2
+TAG ?= v1.36.0
 
 .PHONY: all
 all: fmt lint lint-sh vet test ccm

README.md

@@ -7,7 +7,7 @@ infrastructure node and load balancer support to
 [Kubernetes](https://kubernetes.io/docs/home/) or
 [OpenShift](https://docs.openshift.com/) clusters running on
 [IBM Cloud](https://cloud.ibm.com/docs). This repository branch is based on
-[Kubernetes version v1.35.2](https://github.com/kubernetes/kubernetes/tree/v1.35.2).
+[Kubernetes version v1.36.0](https://github.com/kubernetes/kubernetes/tree/v1.36.0).
 
 See [CONTRIBUTING.md](./CONTRIBUTING.md) for contribution guidelines.
 

go.mod

@@ -1,24 +1,24 @@
 module cloud.ibm.com/cloud-provider-ibm
 
-go 1.25.7
+go 1.26.0
 
 require (
 	github.com/IBM/go-sdk-core/v5 v5.21.2
-	github.com/IBM/platform-services-go-sdk v0.95.0
-	github.com/IBM/vpc-go-sdk v0.80.0
-	github.com/fsnotify/fsnotify v1.9.0
-	github.com/go-openapi/strfmt v0.25.0
+	github.com/IBM/platform-services-go-sdk v0.97.4
+	github.com/IBM/vpc-go-sdk v0.83.2
+	github.com/fsnotify/fsnotify v1.10.1
+	github.com/go-openapi/strfmt v0.26.2
 	github.com/spf13/cobra v1.10.2
 	github.com/spf13/pflag v1.0.10
 	github.com/stretchr/testify v1.11.1
 	gopkg.in/gcfg.v1 v1.2.3
-	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/component-base v0.35.2
-	k8s.io/component-helpers v0.35.2
-	k8s.io/klog/v2 v2.130.1
+	k8s.io/api v0.36.0
+	k8s.io/apimachinery v0.36.0
+	k8s.io/client-go v0.36.0
+	k8s.io/cloud-provider v0.36.0
+	k8s.io/component-base v0.36.0
+	k8s.io/component-helpers v0.36.0
+	k8s.io/klog/v2 v2.140.0
 )
 
 require (
@@ -39,7 +39,7 @@ require (
 	github.com/gabriel-vasile/mimetype v1.4.13 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-openapi/errors v0.22.6 // indirect
+	github.com/go-openapi/errors v0.22.7 // indirect
 	github.com/go-openapi/jsonpointer v0.22.4 // indirect
 	github.com/go-openapi/jsonreference v0.21.4 // indirect
 	github.com/go-openapi/swag v0.25.4 // indirect
@@ -54,18 +54,18 @@ require (
 	github.com/go-openapi/swag/stringutils v0.25.4 // indirect
 	github.com/go-openapi/swag/typeutils v0.25.4 // indirect
 	github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
+	github.com/go-openapi/testify/enable/yaml/v2 v2.4.1 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.30.1 // indirect
 	github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/btree v1.1.3 // indirect
 	github.com/google/cel-go v0.27.0 // indirect
 	github.com/google/gnostic-models v0.7.1 // indirect
-	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
+	github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 // indirect
+	github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.3 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
@@ -77,7 +77,7 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/oklog/ulid v1.3.1 // indirect
+	github.com/oklog/ulid/v2 v2.1.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/client_golang v1.23.2 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
@@ -87,47 +87,49 @@ require (
 	go.etcd.io/etcd/api/v3 v3.6.8 // indirect
 	go.etcd.io/etcd/client/pkg/v3 v3.6.8 // indirect
 	go.etcd.io/etcd/client/v3 v3.6.8 // indirect
-	go.mongodb.org/mongo-driver v1.17.9 // indirect
 	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.65.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 // indirect
-	go.opentelemetry.io/otel v1.40.0 // indirect
+	go.opentelemetry.io/otel v1.43.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.40.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.40.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/otel/metric v1.43.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.43.0 // indirect
+	go.opentelemetry.io/otel/trace v1.43.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.9.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.1 // indirect
 	go.yaml.in/yaml/v2 v2.4.3 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
-	golang.org/x/crypto v0.48.0 // indirect
+	golang.org/x/crypto v0.50.0 // indirect
 	golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa // indirect
-	golang.org/x/net v0.50.0 // indirect
+	golang.org/x/net v0.53.0 // indirect
 	golang.org/x/oauth2 v0.35.0 // indirect
-	golang.org/x/sync v0.19.0 // indirect
-	golang.org/x/sys v0.41.0 // indirect
-	golang.org/x/term v0.40.0 // indirect
-	golang.org/x/text v0.34.0 // indirect
+	golang.org/x/sync v0.20.0 // indirect
+	golang.org/x/sys v0.43.0 // indirect
+	golang.org/x/term v0.42.0 // indirect
+	golang.org/x/text v0.36.0 // indirect
 	golang.org/x/time v0.14.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20260223185530-2f722ef697dc // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20260223185530-2f722ef697dc // indirect
-	google.golang.org/grpc v1.79.1 // indirect
-	google.golang.org/protobuf v1.36.11 // indirect
+	google.golang.org/grpc v1.79.3 // indirect
+	google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af // 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/apiserver v0.35.2 // indirect
-	k8s.io/controller-manager v0.35.2 // 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
+	k8s.io/apiserver v0.36.0 // indirect
+	k8s.io/controller-manager v0.36.0 // indirect
+	k8s.io/kms v0.36.0 // indirect
+	k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a // indirect
+	k8s.io/streaming v0.36.0 // indirect
+	k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2 // indirect
+	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 // indirect
 	sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
 	sigs.k8s.io/randfill v1.0.0 // indirect
-	sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v6 v6.3.2 // indirect
 	sigs.k8s.io/yaml v1.6.0 // indirect
 )
+
+exclude github.com/go-openapi/testify/enable/yaml/v2 v2.0.2