Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.4.0
6.5.0
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ release-tars: build-all
# Dockerize cloud-controller-manager
mkdir -p release/$(GIT_VERSION)/docker-build
cp release/$(GIT_VERSION)/cloud-controller-manager/linux/amd64/cloud-controller-manager release/$(GIT_VERSION)/docker-build/
echo "FROM registry.k8s.io/build-image/go-runner:v2.4.0-go1.24.10-bookworm.0" > release/$(GIT_VERSION)/docker-build/Dockerfile
echo "FROM registry.k8s.io/build-image/go-runner:v2.4.0-go1.25.6-bookworm.0" > release/$(GIT_VERSION)/docker-build/Dockerfile
echo "COPY cloud-controller-manager /cloud-controller-manager" >> release/$(GIT_VERSION)/docker-build/Dockerfile
echo "CMD [\"/cloud-controller-manager\"]" >> release/$(GIT_VERSION)/docker-build/Dockerfile

Expand Down
25 changes: 19 additions & 6 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,25 @@ python_register_toolchains(
python_version = "3.9",
)

http_archive(
name = "rules_pkg",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/1.2.0/rules_pkg-1.2.0.tar.gz",
"https://github.com/bazelbuild/rules_pkg/releases/download/1.2.0/rules_pkg-1.2.0.tar.gz",
],
sha256 = "b5c9184a23bb0bcff241981fd9d9e2a97638a1374c9953bb1808836ce711f990",
)

load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")

rules_pkg_dependencies()

http_archive(
name = "io_bazel_rules_go",
sha256 = "b2038e2de2cace18f032249cb4bb0048abf583a36369fa98f687af1b3f880b26",
sha256 = "68af54cb97fbdee5e5e8fe8d210d15a518f9d62abfd71620c3eaff3b26a5ff86",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.48.1/rules_go-v0.48.1.zip",
"https://github.com/bazelbuild/rules_go/releases/download/v0.48.1/rules_go-v0.48.1.zip",
"https://mirror.bazel.build/github.com/bazel-contrib/rules_go/releases/download/v0.59.0/rules_go-v0.59.0.zip",
"https://github.com/bazel-contrib/rules_go/releases/download/v0.59.0/rules_go-v0.59.0.zip",
],
)

Expand Down Expand Up @@ -62,7 +75,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_download_sdk", "go_register_toolchai

go_rules_dependencies()

go_download_sdk(name = "go_sdk",version = "1.24.5")
go_download_sdk(name = "go_sdk",version = "1.25.6")

go_register_toolchains()

Expand Down Expand Up @@ -92,11 +105,11 @@ container_pull(
container_pull(
name = "go-runner",
# this digest is actually go-runner-amd64
digest = "sha256:4decba1ba68d6db721b8ce9bcd1e8567829f0b5bec9a6ceea0b0c094d027c1ac",
digest = "sha256:07659dce32caf7e7af15c92d7e5dbbd98965f22208345da96b494ab59a6cf211",
registry = "registry.k8s.io",
repository = "build-image/go-runner",
# 'tag' is also supported, but digest is encouraged for reproducibility.
tag = "v2.4.0-go1.23.3-bookworm.0",
tag = "v2.4.0-go1.25.6-bookworm.0",
)

load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
Expand Down
2 changes: 1 addition & 1 deletion cluster/BUILD
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package(default_visibility = ["//visibility:public"])

load("@io_k8s_repo_infra//defs:pkg.bzl", "pkg_tar")
load("@rules_pkg//pkg:tar.bzl", "pkg_tar")

filegroup(
name = "package-srcs",
Expand Down
2 changes: 1 addition & 1 deletion cluster/addons/BUILD
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package(default_visibility = ["//visibility:public"])

load("@io_k8s_repo_infra//defs:pkg.bzl", "pkg_tar")
load("@rules_pkg//pkg:tar.bzl", "pkg_tar")

filegroup(
name = "addon-srcs",
Expand Down
2 changes: 1 addition & 1 deletion cluster/gce/BUILD
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package(default_visibility = ["//visibility:public"])

load("@io_k8s_repo_infra//defs:build.bzl", "release_filegroup")
load("@io_k8s_repo_infra//defs:pkg.bzl", "pkg_tar")
load("@rules_pkg//pkg:tar.bzl", "pkg_tar")

filegroup(
name = "package-srcs",
Expand Down
2 changes: 1 addition & 1 deletion cluster/gce/addons/BUILD
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package(default_visibility = ["//visibility:public"])

load("@io_k8s_repo_infra//defs:pkg.bzl", "pkg_tar")
load("@rules_pkg//pkg:tar.bzl", "pkg_tar")

filegroup(
name = "addon-srcs",
Expand Down
2 changes: 1 addition & 1 deletion cluster/gce/gci/BUILD
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@io_bazel_rules_go//go:def.bzl", "go_test")
load("@io_k8s_repo_infra//defs:pkg.bzl", "pkg_tar")
load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
load("@io_k8s_repo_infra//defs:build.bzl", "release_filegroup")

# Having the COS code from the GCE cluster deploy hosted with the release is
Expand Down
2 changes: 1 addition & 1 deletion cluster/gce/gci/configure-helper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1205,7 +1205,7 @@ rules:
namespaces: ["kube-system"]
resources:
- group: "" # core
resources: ["endpoints"]
resources: ["endpoints", "configmaps"]
- level: None
users: ["system:apiserver"]
verbs: ["get"]
Expand Down
2 changes: 1 addition & 1 deletion cluster/gce/manifests/BUILD
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package(default_visibility = ["//visibility:public"])

load("@io_k8s_repo_infra//defs:build.bzl", "release_filegroup")
load("@io_k8s_repo_infra//defs:pkg.bzl", "pkg_tar")
load("@rules_pkg//pkg:tar.bzl", "pkg_tar")

pkg_tar(
name = "gce-master-manifests",
Expand Down
2 changes: 1 addition & 1 deletion defs/repo_rules.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ load("@bazel_skylib//lib:paths.bzl", "paths")
BUILD_PRELUDE = """
package(default_visibility = ["//visibility:public"])

load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
"""

BUILD_TAR_TEMPLATE = """
Expand Down
2 changes: 1 addition & 1 deletion deploy/BUILD
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
load("@rules_pkg//pkg:tar.bzl", "pkg_tar")

package(default_visibility = ["//visibility:public"])

Expand Down
2 changes: 1 addition & 1 deletion release/BUILD
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package(default_visibility = ["//visibility:public"])

load("@io_k8s_repo_infra//defs:build.bzl", "release_filegroup")
load("@io_k8s_repo_infra//defs:pkg.bzl", "pkg_tar")
load("@rules_pkg//pkg:tar.bzl", "pkg_tar")

# We depend on the behavior that pkg_tar will use the first file that it sees
# in case of duplicates. I'm open for building something with more explicit
Expand Down