Skip to content

Commit 796097a

Browse files
committed
Staging the GCE Cloud Provider
**What type of PR is this?** /kind cleanup **What this PR does / why we need it**: Staging the GCE Cloud Provider as part of KEP [20190125-removing-in-tree-providers](https://github.com/kubernetes/enhancements/blob/master/keps/sig-cloud-provider/20190125-removing-in-tree-providers.md). Staging repo setup here https://github.com/kubernetes/legacy-cloud-providers Moves the GCE cloud provider implementation to staging. This is in preparation for moving the cloud provider code out of tree entirely. However we need it in staging while the code needs to be consumed both in/out of tree. **Which issue(s) this PR fixes**: Fixes # **Special notes for your reviewer**: **Does this PR introduce a user-facing change?**: ``` NONE ``` Updated import dependency tracking. Factored in the cleanup from kubernetes#77412 Minor fix to go.mod.
1 parent 11611ee commit 796097a

Some content is hidden

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

75 files changed

+37
-27
lines changed

go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ go 1.12
88

99
require (
1010
bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690
11-
cloud.google.com/go v0.34.0
1211
github.com/Azure/azure-sdk-for-go v21.4.0+incompatible
1312
github.com/Azure/go-autorest v11.1.2+incompatible
1413
github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20181220005116-f8e995905100

pkg/cloudprovider/providers/BUILD

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ go_library(
1414
],
1515
deps = [
1616
"//pkg/cloudprovider/providers/cloudstack:go_default_library",
17-
"//pkg/cloudprovider/providers/gce:go_default_library",
1817
"//pkg/cloudprovider/providers/openstack:go_default_library",
1918
"//pkg/cloudprovider/providers/ovirt:go_default_library",
2019
"//pkg/cloudprovider/providers/photon:go_default_library",
2120
"//staging/src/k8s.io/legacy-cloud-providers/aws:go_default_library",
2221
"//staging/src/k8s.io/legacy-cloud-providers/azure:go_default_library",
22+
"//staging/src/k8s.io/legacy-cloud-providers/gce:go_default_library",
2323
"//staging/src/k8s.io/legacy-cloud-providers/vsphere:go_default_library",
2424
],
2525
)
@@ -37,7 +37,6 @@ filegroup(
3737
":package-srcs",
3838
"//pkg/cloudprovider/providers/cloudstack:all-srcs",
3939
"//pkg/cloudprovider/providers/fake:all-srcs",
40-
"//pkg/cloudprovider/providers/gce:all-srcs",
4140
"//pkg/cloudprovider/providers/openstack:all-srcs",
4241
"//pkg/cloudprovider/providers/ovirt:all-srcs",
4342
"//pkg/cloudprovider/providers/photon:all-srcs",

pkg/cloudprovider/providers/providers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ package cloudprovider
1919
import (
2020
// Cloud providers
2121
_ "k8s.io/kubernetes/pkg/cloudprovider/providers/cloudstack"
22-
_ "k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
2322
_ "k8s.io/kubernetes/pkg/cloudprovider/providers/openstack"
2423
_ "k8s.io/kubernetes/pkg/cloudprovider/providers/ovirt"
2524
_ "k8s.io/kubernetes/pkg/cloudprovider/providers/photon"
2625
_ "k8s.io/legacy-cloud-providers/aws"
2726
_ "k8s.io/legacy-cloud-providers/azure"
27+
_ "k8s.io/legacy-cloud-providers/gce"
2828
_ "k8s.io/legacy-cloud-providers/vsphere"
2929
)

pkg/controller/nodeipam/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ go_test(
1111
srcs = ["node_ipam_controller_test.go"],
1212
embed = [":go_default_library"],
1313
deps = [
14-
"//pkg/cloudprovider/providers/gce:go_default_library",
1514
"//pkg/controller:go_default_library",
1615
"//pkg/controller/nodeipam/ipam:go_default_library",
1716
"//pkg/controller/testutil:go_default_library",
1817
"//staging/src/k8s.io/api/core/v1:go_default_library",
1918
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
2019
"//staging/src/k8s.io/client-go/informers:go_default_library",
2120
"//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library",
21+
"//staging/src/k8s.io/legacy-cloud-providers/gce:go_default_library",
2222
],
2323
)
2424

pkg/controller/nodeipam/ipam/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ go_library(
4242
],
4343
importpath = "k8s.io/kubernetes/pkg/controller/nodeipam/ipam",
4444
deps = [
45-
"//pkg/cloudprovider/providers/gce:go_default_library",
4645
"//pkg/controller:go_default_library",
4746
"//pkg/controller/nodeipam/ipam/cidrset:go_default_library",
4847
"//pkg/controller/nodeipam/ipam/sync:go_default_library",
@@ -67,6 +66,7 @@ go_library(
6766
"//staging/src/k8s.io/client-go/tools/cache:go_default_library",
6867
"//staging/src/k8s.io/client-go/tools/record:go_default_library",
6968
"//staging/src/k8s.io/cloud-provider:go_default_library",
69+
"//staging/src/k8s.io/legacy-cloud-providers/gce:go_default_library",
7070
"//staging/src/k8s.io/metrics/pkg/client/clientset/versioned/scheme:go_default_library",
7171
"//vendor/k8s.io/klog:go_default_library",
7272
],

pkg/controller/nodeipam/ipam/adapter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ import (
2929
clientset "k8s.io/client-go/kubernetes"
3030
v1core "k8s.io/client-go/kubernetes/typed/core/v1"
3131
"k8s.io/client-go/tools/record"
32-
"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
3332
nodeutil "k8s.io/kubernetes/pkg/util/node"
33+
"k8s.io/legacy-cloud-providers/gce"
3434
"k8s.io/metrics/pkg/client/clientset/versioned/scheme"
3535
)
3636

pkg/controller/nodeipam/ipam/cloud_cidr_allocator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ import (
3939
"k8s.io/client-go/kubernetes/scheme"
4040
v1core "k8s.io/client-go/kubernetes/typed/core/v1"
4141
cloudprovider "k8s.io/cloud-provider"
42-
"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
4342
"k8s.io/kubernetes/pkg/controller"
4443
nodeutil "k8s.io/kubernetes/pkg/controller/util/node"
4544
schedulerapi "k8s.io/kubernetes/pkg/scheduler/api"
4645
utilnode "k8s.io/kubernetes/pkg/util/node"
4746
utiltaints "k8s.io/kubernetes/pkg/util/taints"
47+
"k8s.io/legacy-cloud-providers/gce"
4848
)
4949

5050
// nodeProcessingInfo tracks information related to current nodes in processing

pkg/controller/nodeipam/ipam/controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ import (
2929
clientset "k8s.io/client-go/kubernetes"
3030
"k8s.io/client-go/tools/cache"
3131
cloudprovider "k8s.io/cloud-provider"
32-
"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
3332
"k8s.io/kubernetes/pkg/controller/nodeipam/ipam/cidrset"
3433
nodesync "k8s.io/kubernetes/pkg/controller/nodeipam/ipam/sync"
3534
nodeutil "k8s.io/kubernetes/pkg/controller/util/node"
35+
"k8s.io/legacy-cloud-providers/gce"
3636
)
3737

3838
// Config for the IPAM controller.

pkg/controller/nodeipam/node_ipam_controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ import (
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2727
"k8s.io/client-go/informers"
2828
"k8s.io/client-go/kubernetes/fake"
29-
"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
3029
"k8s.io/kubernetes/pkg/controller"
3130
"k8s.io/kubernetes/pkg/controller/nodeipam/ipam"
3231
"k8s.io/kubernetes/pkg/controller/testutil"
32+
"k8s.io/legacy-cloud-providers/gce"
3333
)
3434

3535
func newTestNodeIpamController(clusterCIDR, serviceCIDR *net.IPNet, nodeCIDRMaskSize int, allocatorType ipam.CIDRAllocatorType) (*Controller, error) {

pkg/volume/gcepd/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ go_library(
1717
],
1818
importpath = "k8s.io/kubernetes/pkg/volume/gcepd",
1919
deps = [
20-
"//pkg/cloudprovider/providers/gce:go_default_library",
2120
"//pkg/features:go_default_library",
2221
"//pkg/util/mount:go_default_library",
2322
"//pkg/volume:go_default_library",
@@ -32,6 +31,7 @@ go_library(
3231
"//staging/src/k8s.io/cloud-provider:go_default_library",
3332
"//staging/src/k8s.io/cloud-provider/volume:go_default_library",
3433
"//staging/src/k8s.io/cloud-provider/volume/helpers:go_default_library",
34+
"//staging/src/k8s.io/legacy-cloud-providers/gce:go_default_library",
3535
"//vendor/k8s.io/klog:go_default_library",
3636
"//vendor/k8s.io/utils/exec:go_default_library",
3737
"//vendor/k8s.io/utils/path:go_default_library",

0 commit comments

Comments
 (0)