Merge pull request #996 from openshift-cloud-team/k8s-bump-1.35

Update Kubernetes dependencies to v0.35.1; go1.25.8

Author: k8s-ci-robot

.gitignore

@@ -8,3 +8,4 @@ _artifacts/
 _rundir/
 _tmp/
 /bin/
+__pycache__/

Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=${BUILDPLATFORM} golang:1.24.13 AS builder
+FROM --platform=${BUILDPLATFORM} golang:1.25.8 AS builder
 
 # golang envs
 ARG TARGETARCH
@@ -17,7 +17,7 @@ COPY providers/ providers/
 
 RUN CGO_ENABLED=0 go build -o /go/bin/cloud-controller-manager ./cmd/cloud-controller-manager
 
-FROM registry.k8s.io/build-image/go-runner:v2.4.0-go1.25.6-bookworm.0
+FROM registry.k8s.io/build-image/go-runner:v2.4.0-go1.25.8-bookworm.0
 COPY --from=builder --chown=root:root /go/bin/cloud-controller-manager /cloud-controller-manager
 CMD ["/cloud-controller-manager"]
 ENTRYPOINT ["/cloud-controller-manager"]

dev/tools/update-golang

@@ -6,9 +6,11 @@ import subprocess
 import re
 import argparse
 
-# The file paths to update.
+# Root marker used to verify script execution location.
 # Assumes the script is run from the root of the repository.
-WORKSPACE_PATH = "WORKSPACE"
+ROOT_MARKER_PATH = "go.work"
+GO_RUNNER_TAGS_URL = "https://registry.k8s.io/v2/build-image/go-runner/tags/list"
+GO_RUNNER_GO_SEGMENT_RE = re.compile(r"-go\d+(?:\.\d+){1,2}-")
 
 def find_go_files():
     """Finds all go.mod and go.work files in the repository."""
@@ -46,6 +48,37 @@ def get_latest_go_version():
             return version
     raise RuntimeError("Could not find a stable Go release.")
 
+def get_go_runner_tags():
+    """Fetches go-runner tags from the registry API."""
+    print(f"Fetching go-runner tags from {GO_RUNNER_TAGS_URL}...")
+    with urllib.request.urlopen(GO_RUNNER_TAGS_URL) as response:
+        if response.status != 200:
+            raise RuntimeError(
+                f"Failed to fetch go-runner tags: HTTP {response.status}"
+            )
+        payload = json.loads(response.read().decode())
+    tags = payload.get("tags", [])
+    if not tags:
+        raise RuntimeError("No tags returned from go-runner registry API.")
+
+    return tags
+
+def resolve_go_runner_tag(current_tag, go_version):
+    """Resolves the go-runner tag for the target Go version."""
+    target_tag, replacements = GO_RUNNER_GO_SEGMENT_RE.subn(
+        f"-go{go_version}-", current_tag, count=1
+    )
+    if replacements != 1:
+        raise RuntimeError(f"Unsupported go-runner tag format: {current_tag}")
+
+    if target_tag not in get_go_runner_tags():
+        raise RuntimeError(
+            f"go-runner image tag not found for Go {go_version}: {target_tag}"
+        )
+
+    print(f"Using go-runner tag {target_tag} for Go {go_version}")
+    return target_tag
+
 def _replace_file_contents(file_path, fn):
     """Replaces the contents of a file with the result of a function, applied line-by-line."""
     if not os.path.exists(file_path):
@@ -72,11 +105,19 @@ def _replace_file_contents(file_path, fn):
 
 def update_go_file(file_path, new_version):
     """Updates the go and toolchain directives in a go.mod or go.work file."""
+    parts = new_version.split(".")
+    if len(parts) < 2:
+        raise ValueError(f"Invalid Go version '{new_version}'. Expected at least major.minor.")
+    # The `go` directive should express the minimum supported Go line,
+    # so we keep it at `major.minor.0` for modules that depend on this repo.
+    # Exact patch pinning belongs in `toolchain` and runtime/build image config.
+    go_directive_version = f"{parts[0]}.{parts[1]}.0"
+
     def fn(line):
         stripped = line.lstrip()
         # Replace lines like `go 1.22.3`
         if stripped.startswith("go "):
-            return f"go {new_version}\n"
+            return f"go {go_directive_version}\n"
         # Replace lines like `toolchain go1.22.3`
         if stripped.startswith("toolchain go"):
             return f"toolchain go{new_version}\n"
@@ -92,6 +133,15 @@ def update_dockerfile(file_path, go_version):
         # Replace lines like `FROM golang:1.24.1` or `FROM --platform=... golang:1.24.1 AS builder`
         if line.lstrip().startswith("FROM ") and "golang:" in line:
             return re.sub(r"golang:[0-9.]+", f"golang:{go_version}", line)
+        # Replace runtime image tags like:
+        # `FROM registry.k8s.io/build-image/go-runner:v2.4.0-go1.25.6-bookworm.0`
+        if line.lstrip().startswith("FROM ") and "build-image/go-runner:" in line:
+            image_match = re.search(r"build-image/go-runner:(?P<tag>[^ \t\n]+)", line)
+            if not image_match:
+                return line
+            target_tag = resolve_go_runner_tag(image_match.group("tag"), go_version)
+            tag_start, tag_end = image_match.span("tag")
+            return f"{line[:tag_start]}{target_tag}{line[tag_end:]}"
         return line
 
     _replace_file_contents(file_path, fn)
@@ -103,8 +153,7 @@ def main():
     1. Fetches (or receives) the Go version to update to.
     2. Updates all go.mod and go.work files.
     3. Updates all Dockerfiles.
-    4. Updates the WORKSPACE file.
-    5. Verifies the updates with 'go mod tidy'.
+    4. Verifies the updates with 'go mod tidy'.
     """
     parser = argparse.ArgumentParser(description="Update Go version across the repository.")
     parser.add_argument("--version", help="The Go version to update to (e.g., 1.25.7). If not specified, fetches the latest stable version.")
@@ -139,7 +188,7 @@ def main():
 
 if __name__ == "__main__":
     # Ensure the script is run from the repository root
-    if not os.path.exists(WORKSPACE_PATH):
-        print(f"Error: This script must be run from the repository root directory containing the WORKSPACE file.")
+    if not os.path.exists(ROOT_MARKER_PATH):
+        print(f"Error: This script must be run from the repository root directory containing the {ROOT_MARKER_PATH} file.")
     else:
         main()

docs/RELEASE.md

@@ -36,8 +36,11 @@ LIBRARY_FILES=(
 2. Bump library versions.
 ```bash
 sed -i s/v1.$MINOR_OLD.$PATCH_OLD/v1.$MINOR.$PATCH/ "${VERSION_FILES[@]}"
-sed -i s/v0.$MINOR_OLD.$PATCH_OLD/v0.$MINOR.$PATCH/ "${LIBRARY_FILES[@]}"
-sed -i s/v1.$MINOR_OLD.$PATCH_OLD/v1.$MINOR.$PATCH/ "${LIBRARY_FILES[@]}"
+for f in "${LIBRARY_FILES[@]}" go.work; do
+  sed -E -i \
+    "s#(k8s\\.io/[^[:space:]]+[[:space:]]+v0\\.)$MINOR_OLD\\.$PATCH_OLD#\\1$MINOR.$PATCH#g; s#(k8s\\.io/kubernetes[[:space:]]+v1\\.)$MINOR_OLD\\.$PATCH_OLD#\\1$MINOR.$PATCH#g" \
+    "$f"
+done
 for go_mod_file in "${LIBRARY_FILES[@]}"; do
   dir=$(dirname "$go_mod_file")
   pushd $dir

ginko-test-package-version.env

@@ -1 +1 @@
-v1.34.2
+v1.35.1

go.mod

@@ -1,8 +1,8 @@
 module k8s.io/cloud-provider-gcp
 
-go 1.24.13
+go 1.25.0
 
-toolchain go1.26.0
+toolchain go1.25.8
 
 require (
 	github.com/evanphx/json-patch v5.9.0+incompatible
@@ -15,18 +15,18 @@ require (
 	google.golang.org/api v0.199.0
 	gopkg.in/gcfg.v1 v1.2.3
 	gopkg.in/warnings.v0 v0.1.2 // indirect
-	k8s.io/api v0.34.2
-	k8s.io/apimachinery v0.34.2
-	k8s.io/apiserver v0.34.2
-	k8s.io/client-go v0.34.2
-	k8s.io/code-generator v0.34.2
-	k8s.io/component-base v0.34.2
-	k8s.io/component-helpers v0.34.2
-	k8s.io/controller-manager v0.34.2
+	k8s.io/api v0.35.1
+	k8s.io/apimachinery v0.35.1
+	k8s.io/apiserver v0.35.1
+	k8s.io/client-go v0.35.1
+	k8s.io/code-generator v0.35.1
+	k8s.io/component-base v0.35.1
+	k8s.io/component-helpers v0.35.1
+	k8s.io/controller-manager v0.35.1
 	k8s.io/klog/v2 v2.140.0
-	k8s.io/kube-controller-manager v0.34.2
-	k8s.io/kubelet v0.34.2
-	k8s.io/metrics v0.34.2
+	k8s.io/kube-controller-manager v0.35.1
+	k8s.io/kubelet v0.35.1
+	k8s.io/metrics v0.35.1
 	k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
 	sigs.k8s.io/controller-tools v0.17.2
 )
@@ -36,9 +36,9 @@ require (
 	github.com/GoogleCloudPlatform/gke-networking-api v0.1.2-0.20240904205008-bc15495fd43f
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/natefinch/atomic v1.0.1
-	k8s.io/cloud-provider v0.34.2
+	k8s.io/cloud-provider v0.35.1
 	k8s.io/cloud-provider-gcp/providers v0.0.0-00010101000000-000000000000
-	k8s.io/kubernetes v1.34.2
+	k8s.io/kubernetes v1.35.1
 )
 
 require (
@@ -59,11 +59,10 @@ require (
 	go.yaml.in/yaml/v2 v2.4.3 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
-	golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
-	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
-	k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
+	gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
+	k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b // indirect
 	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
 	sigs.k8s.io/controller-runtime v0.14.7 // indirect
 	sigs.k8s.io/randfill v1.0.0 // indirect
@@ -109,19 +108,19 @@ 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/onsi/gomega v1.36.2
+	github.com/onsi/gomega v1.38.2
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
 	github.com/prometheus/common v0.66.1 // indirect
 	github.com/prometheus/procfs v0.16.1 // indirect
 	github.com/stoewer/go-strcase v1.3.0 // indirect
-	go.etcd.io/etcd/api/v3 v3.6.4 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
-	go.etcd.io/etcd/client/v3 v3.6.4 // indirect
+	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.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
 	go.opentelemetry.io/otel v1.41.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0 // indirect
@@ -140,45 +139,45 @@ require (
 	golang.org/x/text v0.34.0 // indirect
 	golang.org/x/time v0.10.0 // indirect
 	golang.org/x/tools v0.41.0 // indirect
-	google.golang.org/grpc v1.72.1 // indirect
+	google.golang.org/grpc v1.72.2 // indirect
 	google.golang.org/protobuf v1.36.8 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiextensions-apiserver v0.34.2 // indirect
-	k8s.io/kms v0.34.2 // indirect
-	k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
+	k8s.io/apiextensions-apiserver v0.35.1 // indirect
+	k8s.io/kms v0.35.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
 	sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
 	sigs.k8s.io/yaml v1.6.0 // indirect
 )
 
 replace (
-	k8s.io/api => k8s.io/api v0.34.2
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.34.2
-	k8s.io/apimachinery => k8s.io/apimachinery v0.34.2
-	k8s.io/apiserver => k8s.io/apiserver v0.34.2
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.34.2
-	k8s.io/client-go => k8s.io/client-go v0.34.2
-	k8s.io/cloud-provider => k8s.io/cloud-provider v0.34.2
+	k8s.io/api => k8s.io/api v0.35.1
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.35.1
+	k8s.io/apimachinery => k8s.io/apimachinery v0.35.1
+	k8s.io/apiserver => k8s.io/apiserver v0.35.1
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.35.1
+	k8s.io/client-go => k8s.io/client-go v0.35.1
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.35.1
 
 	k8s.io/cloud-provider-gcp/providers => ./providers
-	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.34.2
-	k8s.io/code-generator => k8s.io/code-generator v0.34.2
-	k8s.io/component-base => k8s.io/component-base v0.34.2
-	k8s.io/component-helpers => k8s.io/component-helpers v0.34.2
-	k8s.io/controller-manager => k8s.io/controller-manager v0.34.2
-	k8s.io/cri-api => k8s.io/cri-api v0.34.2
-	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.34.2
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.34.2
-	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.34.2
-	k8s.io/kube-proxy => k8s.io/kube-proxy v0.34.2
-	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.34.2
-	k8s.io/kubectl => k8s.io/kubectl v0.34.2
-	k8s.io/kubelet => k8s.io/kubelet v0.34.2
-	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.34.2
-	k8s.io/metrics => k8s.io/metrics v0.34.2
-	k8s.io/mount-utils => k8s.io/mount-utils v0.34.2
-	k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.34.2
-	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.34.2
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.35.1
+	k8s.io/code-generator => k8s.io/code-generator v0.35.1
+	k8s.io/component-base => k8s.io/component-base v0.35.1
+	k8s.io/component-helpers => k8s.io/component-helpers v0.35.1
+	k8s.io/controller-manager => k8s.io/controller-manager v0.35.1
+	k8s.io/cri-api => k8s.io/cri-api v0.35.1
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.35.1
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.35.1
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.35.1
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.35.1
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.35.1
+	k8s.io/kubectl => k8s.io/kubectl v0.35.1
+	k8s.io/kubelet => k8s.io/kubelet v0.35.1
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.35.1
+	k8s.io/metrics => k8s.io/metrics v0.35.1
+	k8s.io/mount-utils => k8s.io/mount-utils v0.35.1
+	k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.35.1
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.35.1
 )