UPSTREAM-SYNC: Merge https://github.com/IBM-Cloud/cloud-provider-ibm:release-1.37 (27e0a17) 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: "37 11 * * *" # Run at 11:37 UTC daily
+    open-pull-requests-limit: 99
+    labels:
+      - "dependencies"
+      - "github-actions"
+      - "release-1.37"
+    target-branch: "release-1.37"
+
   - package-ecosystem: "github-actions"
     directory: "/" # location of your .github/workflows directory
     schedule:
@@ -93,21 +105,38 @@ updates:
       - "release-1.30"
     target-branch: "release-1.30"
 
-  - package-ecosystem: "github-actions"
-    directory: "/" # location of your .github/workflows directory
+  # ------------------------------------------------------------------------------------------------------------
+  # 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: "29 11 * * *" # Run at 11:29 UTC daily
+      cronjob: "37 10 * * *" # Run at 10:37 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.37:
+        patterns:
+          - "k8s.io/*"
     labels:
       - "dependencies"
-      - "github-actions"
-      - "release-1.29"
-    target-branch: "release-1.29"
-
-  # ------------------------------------------------------------------------------------------------------------
-  # Update the go modules for each of the branches
-  # ------------------------------------------------------------------------------------------------------------
+      - "go"
+      - "release-1.37"
+    target-branch: "release-1.37"
 
   - package-ecosystem: "gomod" # Specifies the Go modules package ecosystem
     directory: "/" # Location of your go.mod file
@@ -311,32 +340,3 @@ updates:
       - "go"
       - "release-1.30"
     target-branch: "release-1.30"
-
-  - package-ecosystem: "gomod" # Specifies the Go modules package ecosystem
-    directory: "/" # Location of your go.mod file
-    schedule:
-      interval: "cron"
-      cronjob: "29 10 * * *" # Run at 10:29 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.29:
-        patterns:
-          - "k8s.io/*"
-    labels:
-      - "dependencies"
-      - "go"
-      - "release-1.29"
-    target-branch: "release-1.29"

.github/scripts/kube-update.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # ******************************************************************************
 # IBM Cloud Kubernetes Service, 5737-D43
-# (C) Copyright IBM Corp. 2025 All Rights Reserved.
+# (C) Copyright IBM Corp. 2025, 2026 All Rights Reserved.
 #
 # SPDX-License-Identifier: Apache2.0
 #
@@ -87,7 +87,7 @@ GO_CURRENT_VERSION=$(grep '^go ' go.mod | awk '{ print $2 }')
 K8S_DIRECTORY="/tmp/kubernetes"
 git clone --filter=blob:none --depth=1 --sparse -b "${K8S_UPDATE_VERSION}" https://github.com/kubernetes/kubernetes.git ${K8S_DIRECTORY}
 git -C ${K8S_DIRECTORY} sparse-checkout add build
-GO_UPDATE_VERSION=$(grep -A 1 "name: \"golang: upstream version" "${K8S_DIRECTORY}/build/dependencies.yaml" | grep "version:" | awk '{ print $2 }')
+GO_UPDATE_VERSION=$(cat "${K8S_DIRECTORY}/.go-version")
 echo "INFO: Updated Go version: ${GO_UPDATE_VERSION}"
 rm -rf "${K8S_DIRECTORY}"
 

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

@@ -22,7 +22,7 @@ jobs:
           echo "golangci_version=v$(grep '^GOLANGCI_LINT_VERSION ' Makefile | awk '{ print $3 }')" >> "$GITHUB_OUTPUT"
 
       - name: Set up Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v7
         with:
           go-version: ${{ steps.get-ver.outputs.go_version }}
 

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

@@ -32,7 +32,7 @@ jobs:
           echo "go_version=$(grep '^go ' go.mod | awk '{ print $2 }')" >> "$GITHUB_OUTPUT"
 
       - name: Set up Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v7
         with:
           go-version: ${{ steps.get-ver.outputs.go_version }}
 

.github/workflows/go.yml

@@ -35,7 +35,7 @@ jobs:
           echo "go_version=$(grep '^go ' go.mod | awk '{ print $2 }')" >> "$GITHUB_OUTPUT"
           echo "golangci_version=v$(grep '^GOLANGCI_LINT_VERSION ' Makefile | awk '{ print $3 }')" >> "$GITHUB_OUTPUT"
       - name: Set up Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v7
         with:
           go-version: ${{ steps.get-ver.outputs.go_version }}
       - name: Install golangci-lint v2
@@ -57,7 +57,7 @@ jobs:
         run: |
           echo "go_version=$(grep '^go ' go.mod | awk '{ print $2 }')" >> "$GITHUB_OUTPUT"
       - name: Set up Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v7
         with:
           go-version: ${{ steps.get-ver.outputs.go_version }}
       - name: Rnn go vet
@@ -75,7 +75,7 @@ jobs:
         run: |
           echo "go_version=$(grep '^go ' go.mod | awk '{ print $2 }')" >> "$GITHUB_OUTPUT"
       - name: Set up Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v7
         with:
           go-version: ${{ steps.get-ver.outputs.go_version }}
       - name: Run go build

.github/workflows/golangci-update.yml

@@ -13,14 +13,14 @@ jobs:
       matrix:
         branch:
           [
-            release-1.29,
             release-1.30,
             release-1.31,
             release-1.32,
             release-1.33,
             release-1.34,
             release-1.35,
             release-1.36,
+            release-1.37,
           ]
     steps:
       - name: Set up Git config

.github/workflows/kube-update.yml

@@ -35,11 +35,11 @@ jobs:
       matrix:
         branch:
           [
-            release-1.32,
             release-1.33,
             release-1.34,
             release-1.35,
             release-1.36,
+            release-1.37,
           ]
     steps:
       - name: Set up Git config

.github/workflows/markdown.yml

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

Makefile

@@ -22,10 +22,10 @@ export
 GOPACKAGES=$(shell go list ./...)
 SHFILES=$(shell find . -type f -name '*.sh')
 
-GOLANGCI_LINT_VERSION := 2.12.2
+GOLANGCI_LINT_VERSION := 2.13.2
 GOLANGCI_LINT_EXISTS := $(shell golangci-lint --version 2>/dev/null)
 
-TAG ?= v1.36.2
+TAG ?= v1.37.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.36.2](https://github.com/kubernetes/kubernetes/tree/v1.36.2).
+[Kubernetes version v1.37.0](https://github.com/kubernetes/kubernetes/tree/v1.37.0).
 
 See [CONTRIBUTING.md](./CONTRIBUTING.md) for contribution guidelines.