Skip to content
This repository was archived by the owner on Apr 25, 2023. It is now read-only.

Commit 2eb2f52

Browse files
committed
Merge commit '378506579a19cbab900a634df67b60d1d5e77f4e' into kubernetes-1.18.5
2 parents c425e39 + 3785065 commit 2eb2f52

File tree

189 files changed

+4106
-24907
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

189 files changed

+4106
-24907
lines changed

vendor/repo-infra/.bazelignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.git

vendor/repo-infra/.bazelrc

+51
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,55 @@
11
build --verbose_failures
22
test --test_output=errors
33

4+
# TODO(fejta): figure out why this causes problems
5+
#test --features=race # enable data race detection
6+
7+
# Note needs an instance name
8+
# https://github.com/bazelbuild/bazel-toolchains/blob/master/bazelrc/bazel-0.27.0.bazelrc
9+
build:remote --jobs=500
10+
build:remote --host_javabase=@rbe_default//java:jdk
11+
build:remote --javabase=@rbe_default//java:jdk
12+
build:remote --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
13+
build:remote --java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
14+
build:remote --crosstool_top=@rbe_default//cc:toolchain
15+
build:remote --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
16+
17+
build:remote --extra_toolchains=@rbe_default//config:cc-toolchain
18+
build:remote --extra_execution_platforms=@io_k8s_repo_infra//:rbe_with_network
19+
build:remote --host_platform=@io_k8s_repo_infra//:rbe_with_network
20+
build:remote --platforms=@io_k8s_repo_infra//:rbe_with_network
21+
22+
build:remote --define=EXECUTOR=remote
23+
build:remote --remote_executor=grpcs://remotebuildexecution.googleapis.com
24+
build:remote --remote_timeout=3600
25+
26+
# Alt: --google_credentials=some_file.json
27+
build:remote --google_default_credentials=true
28+
29+
# Improve cache hit rate
30+
build:remote --incompatible_strict_action_env=true
31+
32+
# Minimize what is downloaded
33+
build:inmemory --experimental_inmemory_jdeps_files
34+
build:inmemory --experimental_inmemory_dotd_files
35+
36+
# Minimize what is downloaded
37+
build:toplevel --config=inmemory
38+
build:toplevel --experimental_remote_download_outputs=toplevel
39+
40+
build:minimal --config=inmemory
41+
build:minimal --experimental_remote_download_outputs=minimal
42+
43+
build:remote --config=toplevel
44+
45+
run:remote --experimental_remote_download_outputs=all --noexperimental_inmemory_jdeps_files --noexperimental_inmemory_dotd_files
46+
47+
# Compose the remote configs with an instance name
48+
# A couple examples below:
49+
50+
# --config=ci-instance adds the instance name
51+
build:ci-instance --remote_instance_name=projects/k8s-prow-builds/instances/default_instance
52+
53+
# Config we want to use in ci
54+
build:ci --config=remote --config=ci-instance
455
build:ci --noshow_progress

vendor/repo-infra/.bazelversion

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2.2.0

vendor/repo-infra/.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,8 @@ __pycache__/
55

66
/bazel-*
77
/_output
8+
9+
# Vim-related files
10+
[._]*.s[a-w][a-z]
11+
[._]s[a-w][a-z]
12+
*.un~

vendor/repo-infra/.golangci.yml

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
run:
2+
deadline: 180s
3+
tests: true
4+
skip-dirs:
5+
- .git
6+
- .tool
7+
- vendor
8+
- verify
9+
10+
linters-settings:
11+
dupl:
12+
threshold: 100
13+
gocyclo:
14+
min-complexity: 50
15+
16+
linters:
17+
enable:
18+
- govet
19+
- deadcode
20+
- golint
21+
- gocyclo
22+
disable-all: true
23+
24+
issues:
25+
exclude-rules:
26+
- linters:
27+
- golint
28+
text: ".*should not use dot dot imports"

vendor/repo-infra/.kazelcfg.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"GoPrefix": "k8s.io/repo-infra"
2+
"GoPrefix": "k8s.io/repo-infra",
3+
"AddSourcesRules": true
34
}

vendor/repo-infra/.travis.yml

-29
This file was deleted.

vendor/repo-infra/BUILD.bazel

+74
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,82 @@
11
# gazelle:prefix k8s.io/repo-infra
2+
# gazelle:exclude hack
3+
# gazelle:proto disable
24

35
# Use the Bazel-vendored protobuf library since we use go_proto_library
46
# gazelle:resolve go github.com/golang/protobuf/proto @com_github_golang_protobuf//proto:go_default_library
57

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

810
licenses(["notice"])
11+
12+
load("//defs:run_in_workspace.bzl", "workspace_binary")
13+
14+
workspace_binary(
15+
name = "gofmt",
16+
cmd = "@go_sdk//:bin/gofmt",
17+
)
18+
19+
workspace_binary(
20+
name = "go",
21+
cmd = "@go_sdk//:bin/go",
22+
)
23+
24+
workspace_binary(
25+
name = "kazel",
26+
cmd = "//cmd/kazel",
27+
)
28+
29+
workspace_binary(
30+
name = "golangci-lint",
31+
cmd = "@com_github_golangci_golangci_lint//cmd/golangci-lint",
32+
)
33+
34+
workspace_binary(
35+
name = "buildifier",
36+
cmd = "@com_github_bazelbuild_buildtools//buildifier",
37+
)
38+
39+
load("@bazel_gazelle//:def.bzl", "gazelle")
40+
41+
gazelle(name = "gazelle")
42+
43+
exports_files([".kazelcfg.json"])
44+
45+
filegroup(
46+
name = "package-srcs",
47+
srcs = glob(
48+
["**"],
49+
exclude = [
50+
"bazel-*/**",
51+
".git/**",
52+
],
53+
),
54+
tags = ["automanaged"],
55+
visibility = ["//visibility:private"],
56+
)
57+
58+
filegroup(
59+
name = "all-srcs",
60+
srcs = [
61+
":package-srcs",
62+
"//cmd/kazel:all-srcs",
63+
"//defs:all-srcs",
64+
"//hack:all-srcs",
65+
"//tools/build_tar:all-srcs",
66+
"//verify:all-srcs",
67+
],
68+
tags = ["automanaged"],
69+
visibility = ["//visibility:public"],
70+
)
71+
72+
platform(
73+
name = "rbe_with_network",
74+
parents = ["@rbe_default//config:platform"],
75+
remote_execution_properties = """
76+
properties: {
77+
name: "dockerNetwork"
78+
value: "standard"
79+
}
80+
{PARENT_REMOTE_EXECUTION_PROPERTIES}
81+
""",
82+
)

vendor/repo-infra/Gopkg.lock

-69
This file was deleted.

vendor/repo-infra/Gopkg.toml

-30
This file was deleted.

vendor/repo-infra/OWNERS

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
approvers:
2+
- BenTheElder
3+
- clarketm
24
- fejta
3-
- ixdy
45
- mikedanese
6+
7+
emeritus_approvers:
8+
- ixdy

vendor/repo-infra/WORKSPACE

+6-15
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,12 @@
1+
# gazelle:repository_macro repos.bzl%go_repositories
12
workspace(name = "io_k8s_repo_infra")
23

3-
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
4+
load("//:load.bzl", "repositories")
45

5-
http_archive(
6-
name = "io_bazel_rules_go",
7-
sha256 = "492c3ac68ed9dcf527a07e6a1b2dcbf199c6bf8b35517951467ac32e421c06c1",
8-
url = "https://github.com/bazelbuild/rules_go/releases/download/0.17.0/rules_go-0.17.0.tar.gz",
9-
)
6+
repositories()
107

11-
load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
8+
load("//:repos.bzl", "configure", "repo_infra_go_repositories")
129

13-
go_rules_dependencies()
10+
configure()
1411

15-
go_register_toolchains()
16-
17-
http_archive(
18-
name = "io_bazel",
19-
sha256 = "6860a226c8123770b122189636fb0c156c6e5c9027b5b245ac3b2315b7b55641",
20-
url = "https://github.com/bazelbuild/bazel/releases/download/0.22.0/bazel-0.22.0-dist.zip",
21-
)
12+
repo_infra_go_repositories()

vendor/repo-infra/kazel/BUILD.bazel vendor/repo-infra/cmd/kazel/BUILD.bazel

+18-4
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ go_library(
2323
"kazel.go",
2424
"sourcerer.go",
2525
],
26-
importpath = "k8s.io/repo-infra/kazel",
26+
importpath = "k8s.io/repo-infra/cmd/kazel",
2727
deps = [
28-
"//vendor/github.com/bazelbuild/buildtools/build:go_default_library",
29-
"//vendor/k8s.io/klog:go_default_library",
28+
"@com_github_bazelbuild_buildtools//build:go_default_library",
29+
"@io_k8s_klog_v2//:go_default_library",
3030
],
3131
)
3232

@@ -37,5 +37,19 @@ go_test(
3737
"kazel_test.go",
3838
],
3939
embed = [":go_default_library"],
40-
deps = ["//vendor/github.com/bazelbuild/buildtools/build:go_default_library"],
40+
deps = ["@com_github_bazelbuild_buildtools//build:go_default_library"],
41+
)
42+
43+
filegroup(
44+
name = "package-srcs",
45+
srcs = glob(["**"]),
46+
tags = ["automanaged"],
47+
visibility = ["//visibility:private"],
48+
)
49+
50+
filegroup(
51+
name = "all-srcs",
52+
srcs = [":package-srcs"],
53+
tags = ["automanaged"],
54+
visibility = ["//visibility:public"],
4155
)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)