Skip to content

Commit b6644f7

Browse files
Merge pull request #53839 from ixdy/update-bazel-workspace
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Update rules_go, repo-infra, and rules_docker dependencies **What this PR does / why we need it**: several of our bazel dependencies were getting pretty old, since they required bazel 0.5.4+ but there were various failures if we tried to use them with bazel 0.5.4. Now that bazel 0.6.0 (and 0.6.1) have been out for a while, we can bump our dependencies and get a number of fixes and new functionality. x-ref #52677 and others **Special notes for your reviewer**: * This will now explicitly require bazel 0.6.0+ to build kubernetes. * Our staging directories are causing some issues for `gazelle`; it wants to set `importpath = "k8s.io/kubernetes/staging/src/k8s.io/blah"` instead of `importpath = "k8s.io/blah"`. I'm not sure what is the correct way to fix this; what we're doing here is pretty weird and nonstandard. I've used a `sed` substitution for now. * The `-proto=default` option of `gazelle` has a number of bugs right now (bazel-contrib/rules_go#888, bazel-contrib/rules_go#900, bazel-contrib/rules_go#907), so I am forcing the legacy behavior. **Release note**: ```release-note NONE ``` /assign @mikedanese @spxtr @BenTheElder Kubernetes-commit: 77b83e446b4e655a71c315ad3f3890dc2a220ccf
2 parents 532875a + c138bcf commit b6644f7

File tree

23 files changed

+38
-0
lines changed

23 files changed

+38
-0
lines changed

Diff for: cmd/client-gen/BUILD

+2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@ load(
88

99
go_binary(
1010
name = "client-gen",
11+
importpath = "k8s.io/code-generator/cmd/client-gen",
1112
library = ":go_default_library",
1213
)
1314

1415
go_library(
1516
name = "go_default_library",
1617
srcs = ["main.go"],
18+
importpath = "k8s.io/code-generator/cmd/client-gen",
1719
deps = [
1820
"//vendor/github.com/golang/glog:go_default_library",
1921
"//vendor/github.com/spf13/pflag:go_default_library",

Diff for: cmd/client-gen/args/BUILD

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ go_library(
1313
"gvpackages.go",
1414
"gvtype.go",
1515
],
16+
importpath = "k8s.io/code-generator/cmd/client-gen/args",
1617
deps = [
1718
"//vendor/github.com/spf13/pflag:go_default_library",
1819
"//vendor/k8s.io/code-generator/cmd/client-gen/types:go_default_library",
@@ -35,6 +36,7 @@ filegroup(
3536
go_test(
3637
name = "go_default_test",
3738
srcs = ["gvpackages_test.go"],
39+
importpath = "k8s.io/code-generator/cmd/client-gen/args",
3840
library = ":go_default_library",
3941
deps = [
4042
"//vendor/github.com/spf13/pflag:go_default_library",

Diff for: cmd/client-gen/generators/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ go_library(
1515
"generator_for_type.go",
1616
"tags.go",
1717
],
18+
importpath = "k8s.io/code-generator/cmd/client-gen/generators",
1819
deps = [
1920
"//vendor/github.com/golang/glog:go_default_library",
2021
"//vendor/k8s.io/code-generator/cmd/client-gen/args:go_default_library",

Diff for: cmd/client-gen/generators/fake/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ go_library(
1313
"generator_fake_for_group.go",
1414
"generator_fake_for_type.go",
1515
],
16+
importpath = "k8s.io/code-generator/cmd/client-gen/generators/fake",
1617
deps = [
1718
"//vendor/k8s.io/code-generator/cmd/client-gen/args:go_default_library",
1819
"//vendor/k8s.io/code-generator/cmd/client-gen/generators/scheme:go_default_library",

Diff for: cmd/client-gen/generators/scheme/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ load(
88
go_library(
99
name = "go_default_library",
1010
srcs = ["generator_for_scheme.go"],
11+
importpath = "k8s.io/code-generator/cmd/client-gen/generators/scheme",
1112
deps = [
1213
"//vendor/k8s.io/code-generator/cmd/client-gen/path:go_default_library",
1314
"//vendor/k8s.io/code-generator/cmd/client-gen/types:go_default_library",

Diff for: cmd/client-gen/generators/util/BUILD

+2
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@ load(
99
go_test(
1010
name = "go_default_test",
1111
srcs = ["tags_test.go"],
12+
importpath = "k8s.io/code-generator/cmd/client-gen/generators/util",
1213
library = ":go_default_library",
1314
)
1415

1516
go_library(
1617
name = "go_default_library",
1718
srcs = ["tags.go"],
19+
importpath = "k8s.io/code-generator/cmd/client-gen/generators/util",
1820
deps = ["//vendor/k8s.io/gengo/types:go_default_library"],
1921
)
2022

Diff for: cmd/client-gen/path/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ load(
88
go_library(
99
name = "go_default_library",
1010
srcs = ["path.go"],
11+
importpath = "k8s.io/code-generator/cmd/client-gen/path",
1112
)
1213

1314
filegroup(

Diff for: cmd/client-gen/types/BUILD

+2
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@ go_library(
1212
"helpers.go",
1313
"types.go",
1414
],
15+
importpath = "k8s.io/code-generator/cmd/client-gen/types",
1516
deps = ["//vendor/k8s.io/gengo/namer:go_default_library"],
1617
)
1718

1819
go_test(
1920
name = "go_default_test",
2021
srcs = ["helpers_test.go"],
22+
importpath = "k8s.io/code-generator/cmd/client-gen/types",
2123
library = ":go_default_library",
2224
)
2325

Diff for: cmd/conversion-gen/BUILD

+2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@ load(
88

99
go_binary(
1010
name = "conversion-gen",
11+
importpath = "k8s.io/code-generator/cmd/conversion-gen",
1112
library = ":go_default_library",
1213
)
1314

1415
go_library(
1516
name = "go_default_library",
1617
srcs = ["main.go"],
18+
importpath = "k8s.io/code-generator/cmd/conversion-gen",
1719
deps = [
1820
"//vendor/github.com/golang/glog:go_default_library",
1921
"//vendor/github.com/spf13/pflag:go_default_library",

Diff for: cmd/conversion-gen/generators/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ load(
88
go_library(
99
name = "go_default_library",
1010
srcs = ["conversion.go"],
11+
importpath = "k8s.io/code-generator/cmd/conversion-gen/generators",
1112
deps = [
1213
"//vendor/github.com/golang/glog:go_default_library",
1314
"//vendor/k8s.io/gengo/args:go_default_library",

Diff for: cmd/deepcopy-gen/BUILD

+2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@ load(
88

99
go_binary(
1010
name = "deepcopy-gen",
11+
importpath = "k8s.io/code-generator/cmd/deepcopy-gen",
1112
library = ":go_default_library",
1213
)
1314

1415
go_library(
1516
name = "go_default_library",
1617
srcs = ["main.go"],
18+
importpath = "k8s.io/code-generator/cmd/deepcopy-gen",
1719
deps = [
1820
"//vendor/github.com/golang/glog:go_default_library",
1921
"//vendor/github.com/spf13/pflag:go_default_library",

Diff for: cmd/defaulter-gen/BUILD

+2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@ load(
88

99
go_binary(
1010
name = "defaulter-gen",
11+
importpath = "k8s.io/code-generator/cmd/defaulter-gen",
1112
library = ":go_default_library",
1213
)
1314

1415
go_library(
1516
name = "go_default_library",
1617
srcs = ["main.go"],
18+
importpath = "k8s.io/code-generator/cmd/defaulter-gen",
1719
deps = [
1820
"//vendor/github.com/golang/glog:go_default_library",
1921
"//vendor/github.com/spf13/pflag:go_default_library",

Diff for: cmd/go-to-protobuf/BUILD

+2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@ load(
88

99
go_binary(
1010
name = "go-to-protobuf",
11+
importpath = "k8s.io/code-generator/cmd/go-to-protobuf",
1112
library = ":go_default_library",
1213
)
1314

1415
go_library(
1516
name = "go_default_library",
1617
srcs = ["main.go"],
18+
importpath = "k8s.io/code-generator/cmd/go-to-protobuf",
1719
deps = [
1820
"//vendor/github.com/spf13/pflag:go_default_library",
1921
"//vendor/k8s.io/code-generator/cmd/go-to-protobuf/protobuf:go_default_library",

Diff for: cmd/go-to-protobuf/protobuf/BUILD

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ go_library(
1717
"parser.go",
1818
"tags.go",
1919
],
20+
importpath = "k8s.io/code-generator/cmd/go-to-protobuf/protobuf",
2021
deps = [
2122
"//vendor/github.com/golang/glog:go_default_library",
2223
"//vendor/github.com/spf13/pflag:go_default_library",
@@ -32,6 +33,7 @@ go_library(
3233
go_test(
3334
name = "go_default_test",
3435
srcs = ["namer_test.go"],
36+
importpath = "k8s.io/code-generator/cmd/go-to-protobuf/protobuf",
3537
library = ":go_default_library",
3638
)
3739

Diff for: cmd/go-to-protobuf/protoc-gen-gogo/BUILD

+2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@ load(
88

99
go_binary(
1010
name = "protoc-gen-gogo",
11+
importpath = "k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo",
1112
library = ":go_default_library",
1213
)
1314

1415
go_library(
1516
name = "go_default_library",
1617
srcs = ["main.go"],
18+
importpath = "k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo",
1719
deps = [
1820
"//vendor/github.com/gogo/protobuf/gogoproto:go_default_library",
1921
"//vendor/github.com/gogo/protobuf/proto:go_default_library",

Diff for: cmd/import-boss/BUILD

+2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@ load(
88

99
go_binary(
1010
name = "import-boss",
11+
importpath = "k8s.io/code-generator/cmd/import-boss",
1112
library = ":go_default_library",
1213
)
1314

1415
go_library(
1516
name = "go_default_library",
1617
srcs = ["main.go"],
18+
importpath = "k8s.io/code-generator/cmd/import-boss",
1719
deps = [
1820
"//vendor/github.com/golang/glog:go_default_library",
1921
"//vendor/k8s.io/gengo/args:go_default_library",

Diff for: cmd/informer-gen/BUILD

+2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@ load(
88

99
go_binary(
1010
name = "informer-gen",
11+
importpath = "k8s.io/code-generator/cmd/informer-gen",
1112
library = ":go_default_library",
1213
)
1314

1415
go_library(
1516
name = "go_default_library",
1617
srcs = ["main.go"],
18+
importpath = "k8s.io/code-generator/cmd/informer-gen",
1719
deps = [
1820
"//vendor/github.com/golang/glog:go_default_library",
1921
"//vendor/github.com/spf13/pflag:go_default_library",

Diff for: cmd/informer-gen/generators/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ go_library(
1919
"types.go",
2020
"versioninterface.go",
2121
],
22+
importpath = "k8s.io/code-generator/cmd/informer-gen/generators",
2223
deps = [
2324
"//vendor/github.com/golang/glog:go_default_library",
2425
"//vendor/github.com/spf13/pflag:go_default_library",

Diff for: cmd/lister-gen/BUILD

+2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@ load(
88

99
go_binary(
1010
name = "lister-gen",
11+
importpath = "k8s.io/code-generator/cmd/lister-gen",
1112
library = ":go_default_library",
1213
)
1314

1415
go_library(
1516
name = "go_default_library",
1617
srcs = ["main.go"],
18+
importpath = "k8s.io/code-generator/cmd/lister-gen",
1719
deps = [
1820
"//vendor/github.com/golang/glog:go_default_library",
1921
"//vendor/k8s.io/code-generator/cmd/lister-gen/generators:go_default_library",

Diff for: cmd/lister-gen/generators/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ go_library(
1212
"lister.go",
1313
"tags.go",
1414
],
15+
importpath = "k8s.io/code-generator/cmd/lister-gen/generators",
1516
deps = [
1617
"//vendor/github.com/golang/glog:go_default_library",
1718
"//vendor/k8s.io/code-generator/cmd/client-gen/generators/util:go_default_library",

Diff for: cmd/openapi-gen/BUILD

+2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@ load(
88

99
go_binary(
1010
name = "openapi-gen",
11+
importpath = "k8s.io/code-generator/cmd/openapi-gen",
1112
library = ":go_default_library",
1213
)
1314

1415
go_library(
1516
name = "go_default_library",
1617
srcs = ["main.go"],
18+
importpath = "k8s.io/code-generator/cmd/openapi-gen",
1719
deps = [
1820
"//vendor/github.com/golang/glog:go_default_library",
1921
"//vendor/k8s.io/gengo/args:go_default_library",

Diff for: cmd/set-gen/BUILD

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ load(
88

99
go_binary(
1010
name = "set-gen",
11+
importpath = "k8s.io/code-generator/cmd/set-gen",
1112
library = ":go_default_library",
1213
)
1314

@@ -18,6 +19,7 @@ exports_files([
1819
go_library(
1920
name = "go_default_library",
2021
srcs = ["main.go"],
22+
importpath = "k8s.io/code-generator/cmd/set-gen",
2123
deps = [
2224
"//vendor/github.com/golang/glog:go_default_library",
2325
"//vendor/k8s.io/gengo/args:go_default_library",

Diff for: third_party/forked/golang/reflect/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ load(
88
go_library(
99
name = "go_default_library",
1010
srcs = ["type.go"],
11+
importpath = "k8s.io/code-generator/third_party/forked/golang/reflect",
1112
)
1213

1314
filegroup(

0 commit comments

Comments
 (0)