Skip to content

Commit e216995

Browse files
ixdyixdy
committed
Update repo-infra, bazel-skylib, rules_docker, and rules_go dependencies
Also require bazel 0.18.0+
1 parent 5c780c8 commit e216995

File tree

17 files changed

+54
-51
lines changed

17 files changed

+54
-51
lines changed

‎build/BUILD

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

33
load("@io_bazel_rules_docker//container:container.bzl", "container_bundle", "container_image")
4-
load("@io_kubernetes_build//defs:build.bzl", "release_filegroup")
4+
load("@io_k8s_repo_infra//defs:build.bzl", "release_filegroup")
55
load(":code_generation_test.bzl", "code_generation_test_suite")
66

77
code_generation_test_suite(
@@ -71,7 +71,6 @@ DOCKERIZED_BINARIES = {
7171
images = {
7272
"k8s.gcr.io/%s:{STABLE_DOCKER_TAG}" % binary: binary + "-internal",
7373
},
74-
stamp = True,
7574
) for binary in DOCKERIZED_BINARIES.keys()]
7675

7776
[genrule(

‎build/code_generation.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
load("//build:kazel_generated.bzl", "go_prefix", "tags_values_pkgs")
1616
load("//build:openapi.bzl", "openapi_vendor_prefix")
17-
load("@io_kubernetes_build//defs:go.bzl", "go_genrule")
17+
load("@io_k8s_repo_infra//defs:go.bzl", "go_genrule")
1818

1919
def bazel_go_library(pkg):
2020
"""Returns the Bazel label for the Go library for the provided package.

‎build/code_generation_test.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
load(":code_generation.bzl", "bazel_go_library", "go_pkg")
16-
load("@bazel_skylib//:lib.bzl", "asserts", "unittest")
16+
load("@bazel_skylib//lib:unittest.bzl", "asserts", "unittest")
1717

1818
def _bazel_go_library_test_impl(ctx):
1919
env = unittest.begin(ctx)

‎build/debs/BUILD

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package(default_visibility = ["//visibility:public"])
22

3-
load("@io_kubernetes_build//defs:deb.bzl", "k8s_deb", "deb_data")
4-
load("@io_kubernetes_build//defs:build.bzl", "release_filegroup")
5-
load("@io_kubernetes_build//defs:pkg.bzl", "pkg_tar")
3+
load("@io_k8s_repo_infra//defs:deb.bzl", "k8s_deb", "deb_data")
4+
load("@io_k8s_repo_infra//defs:build.bzl", "release_filegroup")
5+
load("@io_k8s_repo_infra//defs:pkg.bzl", "pkg_tar")
66
load("//build:workspace.bzl", "CNI_VERSION", "CRI_TOOLS_VERSION")
77

88
# We do not include kube-scheduler, kube-controller-manager,

‎build/release-tars/BUILD

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

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

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

‎build/root/BUILD.root

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

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

16-
load("@io_kubernetes_build//defs:build.bzl", "gcs_upload")
16+
load("@io_k8s_repo_infra//defs:build.bzl", "gcs_upload")
1717

1818
filegroup(
1919
name = "_binary-artifacts-and-hashes",

‎build/root/WORKSPACE

+34-28
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,21 @@ load("//build:workspace_mirror.bzl", "mirror")
33
load("//build:workspace.bzl", "CNI_VERSION", "CRI_TOOLS_VERSION")
44

55
http_archive(
6-
name = "io_bazel_rules_go",
7-
sha256 = "ade51a315fa17347e5c31201fdc55aa5ffb913377aa315dceb56ee9725e620ee",
8-
urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.16.6/rules_go-0.16.6.tar.gz"),
6+
name = "bazel_skylib",
7+
sha256 = "eb5c57e4c12e68c0c20bc774bfbc60a568e800d025557bc4ea022c6479acc867",
8+
strip_prefix = "bazel-skylib-0.6.0",
9+
urls = mirror("https://github.com/bazelbuild/bazel-skylib/archive/0.6.0.tar.gz"),
910
)
1011

11-
http_archive(
12-
name = "io_kubernetes_build",
13-
sha256 = "21160531ea8a9a4001610223ad815622bf60671d308988c7057168a495a7e2e8",
14-
strip_prefix = "repo-infra-b4bc4f1552c7fc1d4654753ca9b0e5e13883429f",
15-
urls = mirror("https://github.com/kubernetes/repo-infra/archive/b4bc4f1552c7fc1d4654753ca9b0e5e13883429f.tar.gz"),
16-
)
12+
load("@bazel_skylib//lib:versions.bzl", "versions")
13+
14+
versions.check(minimum_bazel_version = "0.18.0")
1715

1816
http_archive(
19-
name = "bazel_skylib",
20-
sha256 = "bbccf674aa441c266df9894182d80de104cabd19be98be002f6d478aaa31574d",
21-
strip_prefix = "bazel-skylib-2169ae1c374aab4a09aa90e65efe1a3aad4e279b",
22-
urls = mirror("https://github.com/bazelbuild/bazel-skylib/archive/2169ae1c374aab4a09aa90e65efe1a3aad4e279b.tar.gz"),
17+
name = "io_k8s_repo_infra",
18+
sha256 = "4ce2d8576e786c8fb8bc4f7ed79f5fda543568d78c09306d16cc8d1b7d5621f0",
19+
strip_prefix = "repo-infra-8a5707674e76b825bfd9a8624bae045bc6e5f24d",
20+
urls = mirror("https://github.com/kubernetes/repo-infra/archive/8a5707674e76b825bfd9a8624bae045bc6e5f24d.tar.gz"),
2321
)
2422

2523
ETCD_VERSION = "3.3.10"
@@ -33,26 +31,34 @@ http_archive(
3331
)
3432

3533
http_archive(
36-
name = "io_bazel_rules_docker",
37-
sha256 = "29d109605e0d6f9c892584f07275b8c9260803bf0c6fcb7de2623b2bedc910bd",
38-
strip_prefix = "rules_docker-0.5.1",
39-
urls = mirror("https://github.com/bazelbuild/rules_docker/archive/v0.5.1.tar.gz"),
34+
name = "io_bazel_rules_go",
35+
sha256 = "492c3ac68ed9dcf527a07e6a1b2dcbf199c6bf8b35517951467ac32e421c06c1",
36+
urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.17.0/rules_go-0.17.0.tar.gz"),
4037
)
4138

42-
load("@bazel_skylib//:lib.bzl", "versions")
43-
44-
versions.check(minimum_bazel_version = "0.17.2")
45-
46-
load("@io_bazel_rules_go//go:def.bzl", "go_download_sdk", "go_register_toolchains", "go_rules_dependencies")
47-
load("@io_bazel_rules_docker//docker:docker.bzl", "docker_pull", "docker_repositories")
39+
load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
4840

4941
go_rules_dependencies()
5042

5143
go_register_toolchains(
5244
go_version = "1.11.5",
5345
)
5446

55-
docker_repositories()
47+
http_archive(
48+
name = "io_bazel_rules_docker",
49+
sha256 = "aed1c249d4ec8f703edddf35cbe9dfaca0b5f5ea6e4cd9e83e99f3b0d1136c3d",
50+
strip_prefix = "rules_docker-0.7.0",
51+
urls = mirror("https://github.com/bazelbuild/rules_docker/archive/v0.7.0.tar.gz"),
52+
)
53+
54+
load(
55+
"@io_bazel_rules_docker//repositories:repositories.bzl",
56+
container_repositories = "repositories",
57+
)
58+
59+
container_repositories()
60+
61+
load("@io_bazel_rules_docker//container:container.bzl", "container_pull")
5662

5763
http_file(
5864
name = "kubernetes_cni",
@@ -68,31 +74,31 @@ http_file(
6874
urls = mirror("https://github.com/kubernetes-incubator/cri-tools/releases/download/v%s/crictl-v%s-linux-amd64.tar.gz" % (CRI_TOOLS_VERSION, CRI_TOOLS_VERSION)),
6975
)
7076

71-
docker_pull(
77+
container_pull(
7278
name = "debian-base-amd64",
7379
digest = "sha256:8ccb65cd2dd7e0c24193d0742a20e4a673dbd11af5a33f16fcd471a31486866c",
7480
registry = "k8s.gcr.io",
7581
repository = "debian-base-amd64",
7682
tag = "0.4.1", # ignored, but kept here for documentation
7783
)
7884

79-
docker_pull(
85+
container_pull(
8086
name = "debian-iptables-amd64",
8187
digest = "sha256:9c41b4c326304b94eb96fdd2e181aa6e9995cc4642fcdfb570cedd73a419ba39",
8288
registry = "k8s.gcr.io",
8389
repository = "debian-iptables-amd64",
8490
tag = "v11.0.1", # ignored, but kept here for documentation
8591
)
8692

87-
docker_pull(
93+
container_pull(
8894
name = "debian-hyperkube-base-amd64",
8995
digest = "sha256:5d4ea2fb5fbe9a9a9da74f67cf2faefc881968bc39f2ac5d62d9167e575812a1",
9096
registry = "k8s.gcr.io",
9197
repository = "debian-hyperkube-base-amd64",
9298
tag = "0.12.1", # ignored, but kept here for documentation
9399
)
94100

95-
docker_pull(
101+
container_pull(
96102
name = "official_busybox",
97103
digest = "sha256:cb63aa0641a885f54de20f61d152187419e8f6b159ed11a251a09d115fdff9bd",
98104
registry = "index.docker.io",

‎build/visible_to/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ q=//cmd/kubectl:kubectl
157157
bazel query "buildfiles(deps($q))" | \
158158
grep -v @bazel_tools | \
159159
grep -v @io_bazel_rules | \
160-
grep -v @io_kubernetes_build | \
160+
grep -v @io_k8s_repo_infra | \
161161
grep -v @local_config | \
162162
grep -v @local_jdk | \
163163
grep -v //visible_to: | \

‎cluster/BUILD

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

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

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

‎cluster/addons/BUILD

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

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

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

‎cluster/gce/BUILD

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

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

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

‎cluster/gce/addons/BUILD

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

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

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

‎cluster/gce/gci/BUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
load("@io_bazel_rules_go//go:def.bzl", "go_test")
2-
load("@io_kubernetes_build//defs:pkg.bzl", "pkg_tar")
3-
load("@io_kubernetes_build//defs:build.bzl", "release_filegroup")
2+
load("@io_k8s_repo_infra//defs:pkg.bzl", "pkg_tar")
3+
load("@io_k8s_repo_infra//defs:build.bzl", "release_filegroup")
44

55
go_test(
66
name = "go_default_test",

‎cluster/gce/manifests/BUILD

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

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

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

‎cluster/images/conformance/BUILD

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ container_image(
4747
container_bundle(
4848
name = "conformance",
4949
images = {"k8s.gcr.io/conformance-amd64:{STABLE_DOCKER_TAG}": "conformance-internal"},
50-
stamp = True,
5150
)
5251

5352
filegroup(

‎cluster/images/hyperkube/BUILD

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ container_image(
1212
container_bundle(
1313
name = "hyperkube",
1414
images = {"k8s.gcr.io/hyperkube-amd64:{STABLE_DOCKER_TAG}": "hyperkube-internal"},
15-
stamp = True,
1615
)
1716

1817
filegroup(

‎staging/src/k8s.io/apimachinery/pkg/util/sets/BUILD

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

3-
load("@io_kubernetes_build//defs:go.bzl", "go_genrule")
3+
load("@io_k8s_repo_infra//defs:go.bzl", "go_genrule")
44
load(
55
"@io_bazel_rules_go//go:def.bzl",
66
"go_library",

0 commit comments

Comments
 (0)