Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
e216995e
Commit
e216995e
authored
Jan 31, 2019
by
Jeff Grafton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update repo-infra, bazel-skylib, rules_docker, and rules_go dependencies
Also require bazel 0.18.0+
parent
5c780c8c
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
54 additions
and
51 deletions
+54
-51
BUILD
build/BUILD
+1
-2
code_generation.bzl
build/code_generation.bzl
+1
-1
code_generation_test.bzl
build/code_generation_test.bzl
+1
-1
BUILD
build/debs/BUILD
+3
-3
BUILD
build/release-tars/BUILD
+2
-2
BUILD.root
build/root/BUILD.root
+1
-1
WORKSPACE
build/root/WORKSPACE
+34
-28
README.md
build/visible_to/README.md
+1
-1
BUILD
cluster/BUILD
+1
-1
BUILD
cluster/addons/BUILD
+1
-1
BUILD
cluster/gce/BUILD
+2
-2
BUILD
cluster/gce/addons/BUILD
+1
-1
BUILD
cluster/gce/gci/BUILD
+2
-2
BUILD
cluster/gce/manifests/BUILD
+2
-2
BUILD
cluster/images/conformance/BUILD
+0
-1
BUILD
cluster/images/hyperkube/BUILD
+0
-1
BUILD
staging/src/k8s.io/apimachinery/pkg/util/sets/BUILD
+1
-1
No files found.
build/BUILD
View file @
e216995e
package(default_visibility = ["//visibility:public"])
package(default_visibility = ["//visibility:public"])
load("@io_bazel_rules_docker//container:container.bzl", "container_bundle", "container_image")
load("@io_bazel_rules_docker//container:container.bzl", "container_bundle", "container_image")
load("@io_k
ubernetes_build
//defs:build.bzl", "release_filegroup")
load("@io_k
8s_repo_infra
//defs:build.bzl", "release_filegroup")
load(":code_generation_test.bzl", "code_generation_test_suite")
load(":code_generation_test.bzl", "code_generation_test_suite")
code_generation_test_suite(
code_generation_test_suite(
...
@@ -71,7 +71,6 @@ DOCKERIZED_BINARIES = {
...
@@ -71,7 +71,6 @@ DOCKERIZED_BINARIES = {
images = {
images = {
"k8s.gcr.io/%s:{STABLE_DOCKER_TAG}" % binary: binary + "-internal",
"k8s.gcr.io/%s:{STABLE_DOCKER_TAG}" % binary: binary + "-internal",
},
},
stamp = True,
) for binary in DOCKERIZED_BINARIES.keys()]
) for binary in DOCKERIZED_BINARIES.keys()]
[genrule(
[genrule(
...
...
build/code_generation.bzl
View file @
e216995e
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
load("//build:kazel_generated.bzl", "go_prefix", "tags_values_pkgs")
load("//build:kazel_generated.bzl", "go_prefix", "tags_values_pkgs")
load("//build:openapi.bzl", "openapi_vendor_prefix")
load("//build:openapi.bzl", "openapi_vendor_prefix")
load("@io_k
ubernetes_build
//defs:go.bzl", "go_genrule")
load("@io_k
8s_repo_infra
//defs:go.bzl", "go_genrule")
def bazel_go_library(pkg):
def bazel_go_library(pkg):
"""Returns the Bazel label for the Go library for the provided package.
"""Returns the Bazel label for the Go library for the provided package.
...
...
build/code_generation_test.bzl
View file @
e216995e
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
# limitations under the License.
# limitations under the License.
load(":code_generation.bzl", "bazel_go_library", "go_pkg")
load(":code_generation.bzl", "bazel_go_library", "go_pkg")
load("@bazel_skylib//
:lib
.bzl", "asserts", "unittest")
load("@bazel_skylib//
lib:unittest
.bzl", "asserts", "unittest")
def _bazel_go_library_test_impl(ctx):
def _bazel_go_library_test_impl(ctx):
env = unittest.begin(ctx)
env = unittest.begin(ctx)
...
...
build/debs/BUILD
View file @
e216995e
package(default_visibility = ["//visibility:public"])
package(default_visibility = ["//visibility:public"])
load("@io_k
ubernetes_build
//defs:deb.bzl", "k8s_deb", "deb_data")
load("@io_k
8s_repo_infra
//defs:deb.bzl", "k8s_deb", "deb_data")
load("@io_k
ubernetes_build
//defs:build.bzl", "release_filegroup")
load("@io_k
8s_repo_infra
//defs:build.bzl", "release_filegroup")
load("@io_k
ubernetes_build
//defs:pkg.bzl", "pkg_tar")
load("@io_k
8s_repo_infra
//defs:pkg.bzl", "pkg_tar")
load("//build:workspace.bzl", "CNI_VERSION", "CRI_TOOLS_VERSION")
load("//build:workspace.bzl", "CNI_VERSION", "CRI_TOOLS_VERSION")
# We do not include kube-scheduler, kube-controller-manager,
# We do not include kube-scheduler, kube-controller-manager,
...
...
build/release-tars/BUILD
View file @
e216995e
package(default_visibility = ["//visibility:public"])
package(default_visibility = ["//visibility:public"])
load("@io_k
ubernetes_build
//defs:build.bzl", "release_filegroup")
load("@io_k
8s_repo_infra
//defs:build.bzl", "release_filegroup")
load("@io_k
ubernetes_build
//defs:pkg.bzl", "pkg_tar")
load("@io_k
8s_repo_infra
//defs:pkg.bzl", "pkg_tar")
filegroup(
filegroup(
name = "package-srcs",
name = "package-srcs",
...
...
build/root/BUILD.root
View file @
e216995e
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
package(default_visibility = ["//visibility:public"])
package(default_visibility = ["//visibility:public"])
load("@io_k
ubernetes_build
//defs:build.bzl", "gcs_upload")
load("@io_k
8s_repo_infra
//defs:build.bzl", "gcs_upload")
filegroup(
filegroup(
name = "_binary-artifacts-and-hashes",
name = "_binary-artifacts-and-hashes",
...
...
build/root/WORKSPACE
View file @
e216995e
...
@@ -3,23 +3,21 @@ load("//build:workspace_mirror.bzl", "mirror")
...
@@ -3,23 +3,21 @@ load("//build:workspace_mirror.bzl", "mirror")
load("//build:workspace.bzl", "CNI_VERSION", "CRI_TOOLS_VERSION")
load("//build:workspace.bzl", "CNI_VERSION", "CRI_TOOLS_VERSION")
http_archive(
http_archive(
name = "io_bazel_rules_go",
name = "bazel_skylib",
sha256 = "ade51a315fa17347e5c31201fdc55aa5ffb913377aa315dceb56ee9725e620ee",
sha256 = "eb5c57e4c12e68c0c20bc774bfbc60a568e800d025557bc4ea022c6479acc867",
urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.16.6/rules_go-0.16.6.tar.gz"),
strip_prefix = "bazel-skylib-0.6.0",
urls = mirror("https://github.com/bazelbuild/bazel-skylib/archive/0.6.0.tar.gz"),
)
)
http_archive(
load("@bazel_skylib//lib:versions.bzl", "versions")
name = "io_kubernetes_build",
sha256 = "21160531ea8a9a4001610223ad815622bf60671d308988c7057168a495a7e2e8",
versions.check(minimum_bazel_version = "0.18.0")
strip_prefix = "repo-infra-b4bc4f1552c7fc1d4654753ca9b0e5e13883429f",
urls = mirror("https://github.com/kubernetes/repo-infra/archive/b4bc4f1552c7fc1d4654753ca9b0e5e13883429f.tar.gz"),
)
http_archive(
http_archive(
name = "
bazel_skylib
",
name = "
io_k8s_repo_infra
",
sha256 = "
bbccf674aa441c266df9894182d80de104cabd19be98be002f6d478aaa31574d
",
sha256 = "
4ce2d8576e786c8fb8bc4f7ed79f5fda543568d78c09306d16cc8d1b7d5621f0
",
strip_prefix = "
bazel-skylib-2169ae1c374aab4a09aa90e65efe1a3aad4e279b
",
strip_prefix = "
repo-infra-8a5707674e76b825bfd9a8624bae045bc6e5f24d
",
urls = mirror("https://github.com/
bazelbuild/bazel-skylib/archive/2169ae1c374aab4a09aa90e65efe1a3aad4e279b
.tar.gz"),
urls = mirror("https://github.com/
kubernetes/repo-infra/archive/8a5707674e76b825bfd9a8624bae045bc6e5f24d
.tar.gz"),
)
)
ETCD_VERSION = "3.3.10"
ETCD_VERSION = "3.3.10"
...
@@ -33,18 +31,12 @@ http_archive(
...
@@ -33,18 +31,12 @@ http_archive(
)
)
http_archive(
http_archive(
name = "io_bazel_rules_docker",
name = "io_bazel_rules_go",
sha256 = "29d109605e0d6f9c892584f07275b8c9260803bf0c6fcb7de2623b2bedc910bd",
sha256 = "492c3ac68ed9dcf527a07e6a1b2dcbf199c6bf8b35517951467ac32e421c06c1",
strip_prefix = "rules_docker-0.5.1",
urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.17.0/rules_go-0.17.0.tar.gz"),
urls = mirror("https://github.com/bazelbuild/rules_docker/archive/v0.5.1.tar.gz"),
)
)
load("@bazel_skylib//:lib.bzl", "versions")
load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
versions.check(minimum_bazel_version = "0.17.2")
load("@io_bazel_rules_go//go:def.bzl", "go_download_sdk", "go_register_toolchains", "go_rules_dependencies")
load("@io_bazel_rules_docker//docker:docker.bzl", "docker_pull", "docker_repositories")
go_rules_dependencies()
go_rules_dependencies()
...
@@ -52,7 +44,21 @@ go_register_toolchains(
...
@@ -52,7 +44,21 @@ go_register_toolchains(
go_version = "1.11.5",
go_version = "1.11.5",
)
)
docker_repositories()
http_archive(
name = "io_bazel_rules_docker",
sha256 = "aed1c249d4ec8f703edddf35cbe9dfaca0b5f5ea6e4cd9e83e99f3b0d1136c3d",
strip_prefix = "rules_docker-0.7.0",
urls = mirror("https://github.com/bazelbuild/rules_docker/archive/v0.7.0.tar.gz"),
)
load(
"@io_bazel_rules_docker//repositories:repositories.bzl",
container_repositories = "repositories",
)
container_repositories()
load("@io_bazel_rules_docker//container:container.bzl", "container_pull")
http_file(
http_file(
name = "kubernetes_cni",
name = "kubernetes_cni",
...
@@ -68,7 +74,7 @@ http_file(
...
@@ -68,7 +74,7 @@ http_file(
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)),
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)),
)
)
dock
er_pull(
contain
er_pull(
name = "debian-base-amd64",
name = "debian-base-amd64",
digest = "sha256:8ccb65cd2dd7e0c24193d0742a20e4a673dbd11af5a33f16fcd471a31486866c",
digest = "sha256:8ccb65cd2dd7e0c24193d0742a20e4a673dbd11af5a33f16fcd471a31486866c",
registry = "k8s.gcr.io",
registry = "k8s.gcr.io",
...
@@ -76,7 +82,7 @@ docker_pull(
...
@@ -76,7 +82,7 @@ docker_pull(
tag = "0.4.1", # ignored, but kept here for documentation
tag = "0.4.1", # ignored, but kept here for documentation
)
)
dock
er_pull(
contain
er_pull(
name = "debian-iptables-amd64",
name = "debian-iptables-amd64",
digest = "sha256:9c41b4c326304b94eb96fdd2e181aa6e9995cc4642fcdfb570cedd73a419ba39",
digest = "sha256:9c41b4c326304b94eb96fdd2e181aa6e9995cc4642fcdfb570cedd73a419ba39",
registry = "k8s.gcr.io",
registry = "k8s.gcr.io",
...
@@ -84,7 +90,7 @@ docker_pull(
...
@@ -84,7 +90,7 @@ docker_pull(
tag = "v11.0.1", # ignored, but kept here for documentation
tag = "v11.0.1", # ignored, but kept here for documentation
)
)
dock
er_pull(
contain
er_pull(
name = "debian-hyperkube-base-amd64",
name = "debian-hyperkube-base-amd64",
digest = "sha256:5d4ea2fb5fbe9a9a9da74f67cf2faefc881968bc39f2ac5d62d9167e575812a1",
digest = "sha256:5d4ea2fb5fbe9a9a9da74f67cf2faefc881968bc39f2ac5d62d9167e575812a1",
registry = "k8s.gcr.io",
registry = "k8s.gcr.io",
...
@@ -92,7 +98,7 @@ docker_pull(
...
@@ -92,7 +98,7 @@ docker_pull(
tag = "0.12.1", # ignored, but kept here for documentation
tag = "0.12.1", # ignored, but kept here for documentation
)
)
dock
er_pull(
contain
er_pull(
name = "official_busybox",
name = "official_busybox",
digest = "sha256:cb63aa0641a885f54de20f61d152187419e8f6b159ed11a251a09d115fdff9bd",
digest = "sha256:cb63aa0641a885f54de20f61d152187419e8f6b159ed11a251a09d115fdff9bd",
registry = "index.docker.io",
registry = "index.docker.io",
...
...
build/visible_to/README.md
View file @
e216995e
...
@@ -157,7 +157,7 @@ q=//cmd/kubectl:kubectl
...
@@ -157,7 +157,7 @@ q=//cmd/kubectl:kubectl
bazel query "buildfiles(deps($q))" |
\
bazel query "buildfiles(deps($q))" |
\
grep -v @bazel_tools |
\
grep -v @bazel_tools |
\
grep -v @io_bazel_rules |
\
grep -v @io_bazel_rules |
\
grep -v @io_k
ubernetes_build
|
\
grep -v @io_k
8s_repo_infra
|
\
grep -v @local_config |
\
grep -v @local_config |
\
grep -v @local_jdk |
\
grep -v @local_jdk |
\
grep -v //visible_to: |
\
grep -v //visible_to: |
\
...
...
cluster/BUILD
View file @
e216995e
package(default_visibility = ["//visibility:public"])
package(default_visibility = ["//visibility:public"])
load("@io_k
ubernetes_build
//defs:pkg.bzl", "pkg_tar")
load("@io_k
8s_repo_infra
//defs:pkg.bzl", "pkg_tar")
filegroup(
filegroup(
name = "package-srcs",
name = "package-srcs",
...
...
cluster/addons/BUILD
View file @
e216995e
package(default_visibility = ["//visibility:public"])
package(default_visibility = ["//visibility:public"])
load("@io_k
ubernetes_build
//defs:pkg.bzl", "pkg_tar")
load("@io_k
8s_repo_infra
//defs:pkg.bzl", "pkg_tar")
filegroup(
filegroup(
name = "addon-srcs",
name = "addon-srcs",
...
...
cluster/gce/BUILD
View file @
e216995e
package(default_visibility = ["//visibility:public"])
package(default_visibility = ["//visibility:public"])
load("@io_k
ubernetes_build
//defs:build.bzl", "release_filegroup")
load("@io_k
8s_repo_infra
//defs:build.bzl", "release_filegroup")
load("@io_k
ubernetes_build
//defs:pkg.bzl", "pkg_tar")
load("@io_k
8s_repo_infra
//defs:pkg.bzl", "pkg_tar")
filegroup(
filegroup(
name = "package-srcs",
name = "package-srcs",
...
...
cluster/gce/addons/BUILD
View file @
e216995e
package(default_visibility = ["//visibility:public"])
package(default_visibility = ["//visibility:public"])
load("@io_k
ubernetes_build
//defs:pkg.bzl", "pkg_tar")
load("@io_k
8s_repo_infra
//defs:pkg.bzl", "pkg_tar")
filegroup(
filegroup(
name = "addon-srcs",
name = "addon-srcs",
...
...
cluster/gce/gci/BUILD
View file @
e216995e
load("@io_bazel_rules_go//go:def.bzl", "go_test")
load("@io_bazel_rules_go//go:def.bzl", "go_test")
load("@io_k
ubernetes_build
//defs:pkg.bzl", "pkg_tar")
load("@io_k
8s_repo_infra
//defs:pkg.bzl", "pkg_tar")
load("@io_k
ubernetes_build
//defs:build.bzl", "release_filegroup")
load("@io_k
8s_repo_infra
//defs:build.bzl", "release_filegroup")
go_test(
go_test(
name = "go_default_test",
name = "go_default_test",
...
...
cluster/gce/manifests/BUILD
View file @
e216995e
package(default_visibility = ["//visibility:public"])
package(default_visibility = ["//visibility:public"])
load("@io_k
ubernetes_build
//defs:build.bzl", "release_filegroup")
load("@io_k
8s_repo_infra
//defs:build.bzl", "release_filegroup")
load("@io_k
ubernetes_build
//defs:pkg.bzl", "pkg_tar")
load("@io_k
8s_repo_infra
//defs:pkg.bzl", "pkg_tar")
pkg_tar(
pkg_tar(
name = "gce-master-manifests",
name = "gce-master-manifests",
...
...
cluster/images/conformance/BUILD
View file @
e216995e
...
@@ -47,7 +47,6 @@ container_image(
...
@@ -47,7 +47,6 @@ container_image(
container_bundle(
container_bundle(
name = "conformance",
name = "conformance",
images = {"k8s.gcr.io/conformance-amd64:{STABLE_DOCKER_TAG}": "conformance-internal"},
images = {"k8s.gcr.io/conformance-amd64:{STABLE_DOCKER_TAG}": "conformance-internal"},
stamp = True,
)
)
filegroup(
filegroup(
...
...
cluster/images/hyperkube/BUILD
View file @
e216995e
...
@@ -12,7 +12,6 @@ container_image(
...
@@ -12,7 +12,6 @@ container_image(
container_bundle(
container_bundle(
name = "hyperkube",
name = "hyperkube",
images = {"k8s.gcr.io/hyperkube-amd64:{STABLE_DOCKER_TAG}": "hyperkube-internal"},
images = {"k8s.gcr.io/hyperkube-amd64:{STABLE_DOCKER_TAG}": "hyperkube-internal"},
stamp = True,
)
)
filegroup(
filegroup(
...
...
staging/src/k8s.io/apimachinery/pkg/util/sets/BUILD
View file @
e216995e
package(default_visibility = ["//visibility:public"])
package(default_visibility = ["//visibility:public"])
load("@io_k
ubernetes_build
//defs:go.bzl", "go_genrule")
load("@io_k
8s_repo_infra
//defs:go.bzl", "go_genrule")
load(
load(
"@io_bazel_rules_go//go:def.bzl",
"@io_bazel_rules_go//go:def.bzl",
"go_library",
"go_library",
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment