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

Commit e24e335

Browse files
author
Kubernetes Submit Queue
authored
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
2 parents 36e7a60 + 14174de commit e24e335

3 files changed

Lines changed: 6 additions & 0 deletions

File tree

  • pkg
    • cloudprovider/providers/openstack
    • volume/cinder
  • staging/src/k8s.io/client-go/plugin/pkg/client/auth/openstack

pkg/cloudprovider/providers/openstack/BUILD

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ go_library(
1818
"openstack_routes.go",
1919
"openstack_volumes.go",
2020
],
21+
importpath = "k8s.io/kubernetes/pkg/cloudprovider/providers/openstack",
2122
deps = [
2223
"//pkg/api/v1/helper:go_default_library",
2324
"//pkg/api/v1/service:go_default_library",
@@ -70,6 +71,7 @@ go_test(
7071
"openstack_routes_test.go",
7172
"openstack_test.go",
7273
],
74+
importpath = "k8s.io/kubernetes/pkg/cloudprovider/providers/openstack",
7375
library = ":go_default_library",
7476
deps = [
7577
"//pkg/cloudprovider:go_default_library",

pkg/volume/cinder/BUILD

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ go_library(
1414
"cinder_util.go",
1515
"doc.go",
1616
],
17+
importpath = "k8s.io/kubernetes/pkg/volume/cinder",
1718
deps = [
1819
"//pkg/cloudprovider:go_default_library",
1920
"//pkg/cloudprovider/providers/openstack:go_default_library",
@@ -42,6 +43,7 @@ go_test(
4243
"attacher_test.go",
4344
"cinder_test.go",
4445
],
46+
importpath = "k8s.io/kubernetes/pkg/volume/cinder",
4547
library = ":go_default_library",
4648
deps = [
4749
"//pkg/cloudprovider:go_default_library",

staging/src/k8s.io/client-go/plugin/pkg/client/auth/openstack/BUILD

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@ load(
99
go_test(
1010
name = "go_default_test",
1111
srcs = ["openstack_test.go"],
12+
importpath = "k8s.io/client-go/plugin/pkg/client/auth/openstack",
1213
library = ":go_default_library",
1314
)
1415

1516
go_library(
1617
name = "go_default_library",
1718
srcs = ["openstack.go"],
19+
importpath = "k8s.io/client-go/plugin/pkg/client/auth/openstack",
1820
deps = [
1921
"//vendor/github.com/golang/glog:go_default_library",
2022
"//vendor/github.com/gophercloud/gophercloud/openstack:go_default_library",

0 commit comments

Comments
 (0)