Skip to content

Commit 07da10f

Browse files
committed
Upgrade io_bazel_rules_go to 0.59.0
This required migrate bazel to 6.5.0 and use @rules_pkg//pkg:tar.bzl for pkg_tar
1 parent f6fa5da commit 07da10f

File tree

12 files changed

+31
-15
lines changed

12 files changed

+31
-15
lines changed

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.4.0
1+
6.5.0

Dockerfile-build

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
FROM gcr.io/bazel-public/bazel:5.4.0
2+
COPY ./ /data
3+
RUN chown -R ubuntu:root /data

WORKSPACE

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,25 @@ python_register_toolchains(
1919
python_version = "3.9",
2020
)
2121

22+
http_archive(
23+
name = "rules_pkg",
24+
urls = [
25+
"https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/1.2.0/rules_pkg-1.2.0.tar.gz",
26+
"https://github.com/bazelbuild/rules_pkg/releases/download/1.2.0/rules_pkg-1.2.0.tar.gz",
27+
],
28+
sha256 = "b5c9184a23bb0bcff241981fd9d9e2a97638a1374c9953bb1808836ce711f990",
29+
)
30+
31+
load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
32+
33+
rules_pkg_dependencies()
34+
2235
http_archive(
2336
name = "io_bazel_rules_go",
24-
sha256 = "b2038e2de2cace18f032249cb4bb0048abf583a36369fa98f687af1b3f880b26",
37+
sha256 = "68af54cb97fbdee5e5e8fe8d210d15a518f9d62abfd71620c3eaff3b26a5ff86",
2538
urls = [
26-
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.48.1/rules_go-v0.48.1.zip",
27-
"https://github.com/bazelbuild/rules_go/releases/download/v0.48.1/rules_go-v0.48.1.zip",
39+
"https://mirror.bazel.build/github.com/bazel-contrib/rules_go/releases/download/v0.59.0/rules_go-v0.59.0.zip",
40+
"https://github.com/bazel-contrib/rules_go/releases/download/v0.59.0/rules_go-v0.59.0.zip",
2841
],
2942
)
3043

@@ -92,11 +105,11 @@ container_pull(
92105
container_pull(
93106
name = "go-runner",
94107
# this digest is actually go-runner-amd64
95-
digest = "sha256:4decba1ba68d6db721b8ce9bcd1e8567829f0b5bec9a6ceea0b0c094d027c1ac",
108+
digest = "sha256:07659dce32caf7e7af15c92d7e5dbbd98965f22208345da96b494ab59a6cf211",
96109
registry = "registry.k8s.io",
97110
repository = "build-image/go-runner",
98111
# 'tag' is also supported, but digest is encouraged for reproducibility.
99-
tag = "v2.4.0-go1.23.3-bookworm.0",
112+
tag = "v2.4.0-go1.25.6-bookworm.0",
100113
)
101114

102115
load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")

cluster/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package(default_visibility = ["//visibility:public"])
22

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

55
filegroup(
66
name = "package-srcs",

cluster/addons/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package(default_visibility = ["//visibility:public"])
22

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

55
filegroup(
66
name = "addon-srcs",

cluster/gce/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package(default_visibility = ["//visibility:public"])
22

33
load("@io_k8s_repo_infra//defs:build.bzl", "release_filegroup")
4-
load("@io_k8s_repo_infra//defs:pkg.bzl", "pkg_tar")
4+
load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
55

66
filegroup(
77
name = "package-srcs",

cluster/gce/addons/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package(default_visibility = ["//visibility:public"])
22

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

55
filegroup(
66
name = "addon-srcs",

cluster/gce/gci/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("@io_bazel_rules_go//go:def.bzl", "go_test")
2-
load("@io_k8s_repo_infra//defs:pkg.bzl", "pkg_tar")
2+
load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
33
load("@io_k8s_repo_infra//defs:build.bzl", "release_filegroup")
44

55
# Having the COS code from the GCE cluster deploy hosted with the release is

cluster/gce/manifests/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package(default_visibility = ["//visibility:public"])
22

33
load("@io_k8s_repo_infra//defs:build.bzl", "release_filegroup")
4-
load("@io_k8s_repo_infra//defs:pkg.bzl", "pkg_tar")
4+
load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
55

66
pkg_tar(
77
name = "gce-master-manifests",

defs/repo_rules.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ load("@bazel_skylib//lib:paths.bzl", "paths")
33
BUILD_PRELUDE = """
44
package(default_visibility = ["//visibility:public"])
55
6-
load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
6+
load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
77
"""
88

99
BUILD_TAR_TEMPLATE = """

0 commit comments

Comments
 (0)