Skip to content
This repository has been archived by the owner on Mar 22, 2018. It is now read-only.

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
  • Loading branch information
Kubernetes Submit Queue authored Oct 16, 2017
2 parents 36e7a60 + 14174de commit e24e335
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 0 deletions.
2 changes: 2 additions & 0 deletions pkg/cloudprovider/providers/openstack/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ go_library(
"openstack_routes.go",
"openstack_volumes.go",
],
importpath = "k8s.io/kubernetes/pkg/cloudprovider/providers/openstack",
deps = [
"//pkg/api/v1/helper:go_default_library",
"//pkg/api/v1/service:go_default_library",
Expand Down Expand Up @@ -70,6 +71,7 @@ go_test(
"openstack_routes_test.go",
"openstack_test.go",
],
importpath = "k8s.io/kubernetes/pkg/cloudprovider/providers/openstack",
library = ":go_default_library",
deps = [
"//pkg/cloudprovider:go_default_library",
Expand Down
2 changes: 2 additions & 0 deletions pkg/volume/cinder/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ go_library(
"cinder_util.go",
"doc.go",
],
importpath = "k8s.io/kubernetes/pkg/volume/cinder",
deps = [
"//pkg/cloudprovider:go_default_library",
"//pkg/cloudprovider/providers/openstack:go_default_library",
Expand Down Expand Up @@ -42,6 +43,7 @@ go_test(
"attacher_test.go",
"cinder_test.go",
],
importpath = "k8s.io/kubernetes/pkg/volume/cinder",
library = ":go_default_library",
deps = [
"//pkg/cloudprovider:go_default_library",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,14 @@ load(
go_test(
name = "go_default_test",
srcs = ["openstack_test.go"],
importpath = "k8s.io/client-go/plugin/pkg/client/auth/openstack",
library = ":go_default_library",
)

go_library(
name = "go_default_library",
srcs = ["openstack.go"],
importpath = "k8s.io/client-go/plugin/pkg/client/auth/openstack",
deps = [
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/github.com/gophercloud/gophercloud/openstack:go_default_library",
Expand Down

0 comments on commit e24e335

Please sign in to comment.