Skip to content

Commit

Permalink
Merge pull request #53839 from ixdy/update-bazel-workspace
Browse files Browse the repository at this point in the history
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 (bazelbuild/rules_go#888, bazelbuild/rules_go#900, bazelbuild/rules_go#907), so I am forcing the legacy behavior.

**Release note**:

```release-note
NONE
```

/assign @mikedanese @spxtr @BenTheElder

Kubernetes-commit: 77b83e446b4e655a71c315ad3f3890dc2a220ccf
  • Loading branch information
k8s-publish-robot committed Oct 16, 2017
2 parents 317b655 + c9b9a57 commit 4792e5b
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 0 deletions.
2 changes: 2 additions & 0 deletions json/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@ load(
go_library(
name = "go_default_library",
srcs = ["json.go"],
importpath = "k8s.io/apimachinery/pkg/util/json",
)

go_test(
name = "go_default_test",
srcs = ["json_test.go"],
importpath = "k8s.io/apimachinery/pkg/util/json",
library = ":go_default_library",
)

Expand Down
2 changes: 2 additions & 0 deletions pkg/apimachinery/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ load(
go_test(
name = "go_default_test",
srcs = ["types_test.go"],
importpath = "k8s.io/apimachinery/pkg/apimachinery",
library = ":go_default_library",
deps = ["//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library"],
)
Expand All @@ -19,6 +20,7 @@ go_library(
"doc.go",
"types.go",
],
importpath = "k8s.io/apimachinery/pkg/apimachinery",
deps = [
"//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
Expand Down
2 changes: 2 additions & 0 deletions pkg/apimachinery/announced/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ load(
go_test(
name = "go_default_test",
srcs = ["announced_test.go"],
importpath = "k8s.io/apimachinery/pkg/apimachinery/announced",
library = ":go_default_library",
deps = ["//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library"],
)
Expand All @@ -19,6 +20,7 @@ go_library(
"announced.go",
"group_factory.go",
],
importpath = "k8s.io/apimachinery/pkg/apimachinery/announced",
deps = [
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library",
Expand Down
2 changes: 2 additions & 0 deletions pkg/apimachinery/registered/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ load(
go_test(
name = "go_default_test",
srcs = ["registered_test.go"],
importpath = "k8s.io/apimachinery/pkg/apimachinery/registered",
library = ":go_default_library",
deps = [
"//vendor/k8s.io/apimachinery/pkg/apimachinery:go_default_library",
Expand All @@ -19,6 +20,7 @@ go_test(
go_library(
name = "go_default_library",
srcs = ["registered.go"],
importpath = "k8s.io/apimachinery/pkg/apimachinery/registered",
deps = [
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library",
Expand Down
1 change: 1 addition & 0 deletions util/initialization/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = ["initialization.go"],
importpath = "k8s.io/apimachinery/pkg/util/initialization",
visibility = ["//visibility:public"],
deps = [
"//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library",
Expand Down
2 changes: 2 additions & 0 deletions yaml/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,14 @@ load(
go_test(
name = "go_default_test",
srcs = ["decoder_test.go"],
importpath = "k8s.io/apimachinery/pkg/util/yaml",
library = ":go_default_library",
)

go_library(
name = "go_default_library",
srcs = ["decoder.go"],
importpath = "k8s.io/apimachinery/pkg/util/yaml",
deps = [
"//vendor/github.com/ghodss/yaml:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
Expand Down

0 comments on commit 4792e5b

Please sign in to comment.