Skip to content

Commit 7d62316

Browse files
mcrutemcrute
committed
Migrate fake cloud provider to staging
1 parent 0e224ad commit 7d62316

File tree

27 files changed

+146
-123
lines changed

27 files changed

+146
-123
lines changed

‎hack/.golint_failures‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ pkg/apis/rbac/validation
5050
pkg/apis/storage
5151
pkg/apis/storage/v1
5252
pkg/apis/storage/v1beta1
53-
pkg/cloudprovider/providers/fake
5453
pkg/cloudprovider/providers/photon
5554
pkg/controller
5655
pkg/controller/apis/config/v1alpha1

‎pkg/cloudprovider/providers/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ filegroup(
3636
srcs = [
3737
":package-srcs",
3838
"//pkg/cloudprovider/providers/cloudstack:all-srcs",
39-
"//pkg/cloudprovider/providers/fake:all-srcs",
4039
"//pkg/cloudprovider/providers/openstack:all-srcs",
4140
"//pkg/cloudprovider/providers/ovirt:all-srcs",
4241
"//pkg/cloudprovider/providers/photon:all-srcs",

‎pkg/controller/cloud/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ go_test(
4646
],
4747
embed = [":go_default_library"],
4848
deps = [
49-
"//pkg/cloudprovider/providers/fake:go_default_library",
5049
"//pkg/controller:go_default_library",
5150
"//pkg/controller/testutil:go_default_library",
5251
"//pkg/kubelet/apis:go_default_library",
@@ -60,6 +59,7 @@ go_test(
6059
"//staging/src/k8s.io/client-go/kubernetes/scheme:go_default_library",
6160
"//staging/src/k8s.io/client-go/tools/record:go_default_library",
6261
"//staging/src/k8s.io/cloud-provider:go_default_library",
62+
"//staging/src/k8s.io/cloud-provider/fake:go_default_library",
6363
"//vendor/github.com/stretchr/testify/assert:go_default_library",
6464
"//vendor/k8s.io/klog:go_default_library",
6565
],

‎pkg/controller/cloud/node_controller_test.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"k8s.io/client-go/informers"
3131
"k8s.io/client-go/tools/record"
3232
cloudprovider "k8s.io/cloud-provider"
33-
fakecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake"
33+
fakecloud "k8s.io/cloud-provider/fake"
3434
"k8s.io/kubernetes/pkg/controller"
3535
"k8s.io/kubernetes/pkg/controller/testutil"
3636
kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis"
@@ -135,7 +135,7 @@ func TestEnsureNodeExistsByProviderID(t *testing.T) {
135135

136136
for _, tc := range testCases {
137137
t.Run(tc.testName, func(t *testing.T) {
138-
fc := &fakecloud.FakeCloud{
138+
fc := &fakecloud.Cloud{
139139
ExistsByProviderID: tc.existsByProviderID,
140140
Err: tc.nodeNameErr,
141141
ErrByProviderID: tc.providerIDErr,
@@ -199,7 +199,7 @@ func TestNodeInitialized(t *testing.T) {
199199

200200
factory := informers.NewSharedInformerFactory(fnh, controller.NoResyncPeriodFunc())
201201

202-
fakeCloud := &fakecloud.FakeCloud{
202+
fakeCloud := &fakecloud.Cloud{
203203
InstanceTypes: map[types.NodeName]string{
204204
types.NodeName("node0"): "t1.micro",
205205
},
@@ -264,7 +264,7 @@ func TestNodeIgnored(t *testing.T) {
264264

265265
factory := informers.NewSharedInformerFactory(fnh, controller.NoResyncPeriodFunc())
266266

267-
fakeCloud := &fakecloud.FakeCloud{
267+
fakeCloud := &fakecloud.Cloud{
268268
InstanceTypes: map[types.NodeName]string{
269269
types.NodeName("node0"): "t1.micro",
270270
},
@@ -336,7 +336,7 @@ func TestGCECondition(t *testing.T) {
336336

337337
factory := informers.NewSharedInformerFactory(fnh, controller.NoResyncPeriodFunc())
338338

339-
fakeCloud := &fakecloud.FakeCloud{
339+
fakeCloud := &fakecloud.Cloud{
340340
InstanceTypes: map[types.NodeName]string{
341341
types.NodeName("node0"): "t1.micro",
342342
},
@@ -421,7 +421,7 @@ func TestZoneInitialized(t *testing.T) {
421421

422422
factory := informers.NewSharedInformerFactory(fnh, controller.NoResyncPeriodFunc())
423423

424-
fakeCloud := &fakecloud.FakeCloud{
424+
fakeCloud := &fakecloud.Cloud{
425425
InstanceTypes: map[types.NodeName]string{
426426
types.NodeName("node0"): "t1.micro",
427427
},
@@ -511,7 +511,7 @@ func TestNodeAddresses(t *testing.T) {
511511

512512
factory := informers.NewSharedInformerFactory(fnh, controller.NoResyncPeriodFunc())
513513

514-
fakeCloud := &fakecloud.FakeCloud{
514+
fakeCloud := &fakecloud.Cloud{
515515
InstanceTypes: map[types.NodeName]string{},
516516
Addresses: []v1.NodeAddress{
517517
{
@@ -624,7 +624,7 @@ func TestNodeProvidedIPAddresses(t *testing.T) {
624624

625625
factory := informers.NewSharedInformerFactory(fnh, controller.NoResyncPeriodFunc())
626626

627-
fakeCloud := &fakecloud.FakeCloud{
627+
fakeCloud := &fakecloud.Cloud{
628628
InstanceTypes: map[types.NodeName]string{
629629
types.NodeName("node0"): "t1.micro",
630630
types.NodeName("node0.aws.12345"): "t2.macro",
@@ -839,7 +839,7 @@ func TestNodeAddressesNotUpdate(t *testing.T) {
839839

840840
factory := informers.NewSharedInformerFactory(fnh, controller.NoResyncPeriodFunc())
841841

842-
fakeCloud := &fakecloud.FakeCloud{
842+
fakeCloud := &fakecloud.Cloud{
843843
InstanceTypes: map[types.NodeName]string{},
844844
Addresses: []v1.NodeAddress{
845845
{
@@ -914,7 +914,7 @@ func TestNodeProviderID(t *testing.T) {
914914

915915
factory := informers.NewSharedInformerFactory(fnh, controller.NoResyncPeriodFunc())
916916

917-
fakeCloud := &fakecloud.FakeCloud{
917+
fakeCloud := &fakecloud.Cloud{
918918
InstanceTypes: map[types.NodeName]string{},
919919
Addresses: []v1.NodeAddress{
920920
{
@@ -997,7 +997,7 @@ func TestNodeProviderIDAlreadySet(t *testing.T) {
997997

998998
factory := informers.NewSharedInformerFactory(fnh, controller.NoResyncPeriodFunc())
999999

1000-
fakeCloud := &fakecloud.FakeCloud{
1000+
fakeCloud := &fakecloud.Cloud{
10011001
InstanceTypes: map[types.NodeName]string{},
10021002
Addresses: []v1.NodeAddress{
10031003
{

‎pkg/controller/cloud/node_lifecycle_controller_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@ import (
3030
"k8s.io/client-go/kubernetes/fake"
3131
"k8s.io/client-go/kubernetes/scheme"
3232
"k8s.io/client-go/tools/record"
33+
fakecloud "k8s.io/cloud-provider/fake"
3334
"k8s.io/klog"
34-
fakecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake"
3535
"k8s.io/kubernetes/pkg/controller/testutil"
3636
)
3737

3838
func Test_NodesDeleted(t *testing.T) {
3939
testcases := []struct {
4040
name string
4141
fnh *testutil.FakeNodeHandler
42-
fakeCloud *fakecloud.FakeCloud
42+
fakeCloud *fakecloud.Cloud
4343
deleteNodes []*v1.Node
4444
}{
4545
{
@@ -66,7 +66,7 @@ func Test_NodesDeleted(t *testing.T) {
6666
DeletedNodes: []*v1.Node{},
6767
Clientset: fake.NewSimpleClientset(),
6868
},
69-
fakeCloud: &fakecloud.FakeCloud{
69+
fakeCloud: &fakecloud.Cloud{
7070
ExistsByProviderID: false,
7171
},
7272
deleteNodes: []*v1.Node{
@@ -100,7 +100,7 @@ func Test_NodesDeleted(t *testing.T) {
100100
DeletedNodes: []*v1.Node{},
101101
Clientset: fake.NewSimpleClientset(),
102102
},
103-
fakeCloud: &fakecloud.FakeCloud{
103+
fakeCloud: &fakecloud.Cloud{
104104
ExistsByProviderID: false,
105105
ErrByProviderID: errors.New("err!"),
106106
},
@@ -133,7 +133,7 @@ func Test_NodesDeleted(t *testing.T) {
133133
DeletedNodes: []*v1.Node{},
134134
Clientset: fake.NewSimpleClientset(),
135135
},
136-
fakeCloud: &fakecloud.FakeCloud{
136+
fakeCloud: &fakecloud.Cloud{
137137
ExistsByProviderID: true,
138138
},
139139
deleteNodes: []*v1.Node{},
@@ -162,7 +162,7 @@ func Test_NodesDeleted(t *testing.T) {
162162
DeletedNodes: []*v1.Node{},
163163
Clientset: fake.NewSimpleClientset(),
164164
},
165-
fakeCloud: &fakecloud.FakeCloud{
165+
fakeCloud: &fakecloud.Cloud{
166166
ExistsByProviderID: false,
167167
},
168168
deleteNodes: []*v1.Node{
@@ -193,7 +193,7 @@ func Test_NodesDeleted(t *testing.T) {
193193
DeletedNodes: []*v1.Node{},
194194
Clientset: fake.NewSimpleClientset(),
195195
},
196-
fakeCloud: &fakecloud.FakeCloud{
196+
fakeCloud: &fakecloud.Cloud{
197197
NodeShutdown: false,
198198
ExistsByProviderID: true,
199199
ExtID: map[types.NodeName]string{
@@ -229,7 +229,7 @@ func Test_NodesDeleted(t *testing.T) {
229229
DeletedNodes: []*v1.Node{},
230230
Clientset: fake.NewSimpleClientset(),
231231
},
232-
fakeCloud: &fakecloud.FakeCloud{
232+
fakeCloud: &fakecloud.Cloud{
233233
ExistsByProviderID: false,
234234
},
235235
deleteNodes: []*v1.Node{},
@@ -270,7 +270,7 @@ func Test_NodesShutdown(t *testing.T) {
270270
testcases := []struct {
271271
name string
272272
fnh *testutil.FakeNodeHandler
273-
fakeCloud *fakecloud.FakeCloud
273+
fakeCloud *fakecloud.Cloud
274274
updatedNodes []*v1.Node
275275
}{
276276
{
@@ -297,7 +297,7 @@ func Test_NodesShutdown(t *testing.T) {
297297
UpdatedNodes: []*v1.Node{},
298298
Clientset: fake.NewSimpleClientset(),
299299
},
300-
fakeCloud: &fakecloud.FakeCloud{
300+
fakeCloud: &fakecloud.Cloud{
301301
NodeShutdown: true,
302302
ErrShutdownByProviderID: nil,
303303
},
@@ -349,7 +349,7 @@ func Test_NodesShutdown(t *testing.T) {
349349
UpdatedNodes: []*v1.Node{},
350350
Clientset: fake.NewSimpleClientset(),
351351
},
352-
fakeCloud: &fakecloud.FakeCloud{
352+
fakeCloud: &fakecloud.Cloud{
353353
NodeShutdown: false,
354354
ErrShutdownByProviderID: errors.New("err!"),
355355
},
@@ -379,7 +379,7 @@ func Test_NodesShutdown(t *testing.T) {
379379
UpdatedNodes: []*v1.Node{},
380380
Clientset: fake.NewSimpleClientset(),
381381
},
382-
fakeCloud: &fakecloud.FakeCloud{
382+
fakeCloud: &fakecloud.Cloud{
383383
NodeShutdown: false,
384384
ErrShutdownByProviderID: nil,
385385
},
@@ -409,7 +409,7 @@ func Test_NodesShutdown(t *testing.T) {
409409
UpdatedNodes: []*v1.Node{},
410410
Clientset: fake.NewSimpleClientset(),
411411
},
412-
fakeCloud: &fakecloud.FakeCloud{
412+
fakeCloud: &fakecloud.Cloud{
413413
NodeShutdown: true,
414414
ErrShutdownByProviderID: nil,
415415
},

‎pkg/controller/route/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ go_test(
4242
srcs = ["route_controller_test.go"],
4343
embed = [":go_default_library"],
4444
deps = [
45-
"//pkg/cloudprovider/providers/fake:go_default_library",
4645
"//pkg/controller:go_default_library",
4746
"//pkg/controller/util/node:go_default_library",
4847
"//staging/src/k8s.io/api/core/v1:go_default_library",
@@ -52,6 +51,7 @@ go_test(
5251
"//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library",
5352
"//staging/src/k8s.io/client-go/testing:go_default_library",
5453
"//staging/src/k8s.io/cloud-provider:go_default_library",
54+
"//staging/src/k8s.io/cloud-provider/fake:go_default_library",
5555
],
5656
)
5757

‎pkg/controller/route/route_controller_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"k8s.io/client-go/kubernetes/fake"
3030
core "k8s.io/client-go/testing"
3131
cloudprovider "k8s.io/cloud-provider"
32-
fakecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake"
32+
fakecloud "k8s.io/cloud-provider/fake"
3333
"k8s.io/kubernetes/pkg/controller"
3434
nodeutil "k8s.io/kubernetes/pkg/controller/util/node"
3535
)
@@ -226,9 +226,9 @@ func TestReconcile(t *testing.T) {
226226
},
227227
}
228228
for i, testCase := range testCases {
229-
cloud := &fakecloud.FakeCloud{RouteMap: make(map[string]*fakecloud.FakeRoute)}
229+
cloud := &fakecloud.Cloud{RouteMap: make(map[string]*fakecloud.Route)}
230230
for _, route := range testCase.initialRoutes {
231-
fakeRoute := &fakecloud.FakeRoute{}
231+
fakeRoute := &fakecloud.Route{}
232232
fakeRoute.ClusterName = cluster
233233
fakeRoute.Route = *route
234234
cloud.RouteMap[route.Name] = fakeRoute

‎pkg/controller/service/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ go_test(
4343
embed = [":go_default_library"],
4444
deps = [
4545
"//pkg/api/testapi:go_default_library",
46-
"//pkg/cloudprovider/providers/fake:go_default_library",
4746
"//pkg/controller:go_default_library",
4847
"//staging/src/k8s.io/api/core/v1:go_default_library",
4948
"//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
@@ -54,6 +53,7 @@ go_test(
5453
"//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library",
5554
"//staging/src/k8s.io/client-go/testing:go_default_library",
5655
"//staging/src/k8s.io/client-go/tools/record:go_default_library",
56+
"//staging/src/k8s.io/cloud-provider/fake:go_default_library",
5757
],
5858
)
5959

‎pkg/controller/service/service_controller_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ import (
3232
"k8s.io/client-go/kubernetes/fake"
3333
core "k8s.io/client-go/testing"
3434
"k8s.io/client-go/tools/record"
35+
fakecloud "k8s.io/cloud-provider/fake"
3536
"k8s.io/kubernetes/pkg/api/testapi"
36-
fakecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake"
3737
"k8s.io/kubernetes/pkg/controller"
3838
)
3939

@@ -52,8 +52,8 @@ func defaultExternalService() *v1.Service {
5252

5353
func alwaysReady() bool { return true }
5454

55-
func newController() (*ServiceController, *fakecloud.FakeCloud, *fake.Clientset) {
56-
cloud := &fakecloud.FakeCloud{}
55+
func newController() (*ServiceController, *fakecloud.Cloud, *fake.Clientset) {
56+
cloud := &fakecloud.Cloud{}
5757
cloud.Region = region
5858

5959
client := fake.NewSimpleClientset()
@@ -166,7 +166,7 @@ func TestCreateExternalLoadBalancer(t *testing.T) {
166166
t.Errorf("unexpected client actions: %v", actions)
167167
}
168168
} else {
169-
var balancer *fakecloud.FakeBalancer
169+
var balancer *fakecloud.Balancer
170170
for k := range cloud.Balancers {
171171
if balancer == nil {
172172
b := cloud.Balancers[k]
@@ -205,7 +205,7 @@ func TestUpdateNodesInExternalLoadBalancer(t *testing.T) {
205205
}
206206
table := []struct {
207207
services []*v1.Service
208-
expectedUpdateCalls []fakecloud.FakeUpdateBalancerCall
208+
expectedUpdateCalls []fakecloud.UpdateBalancerCall
209209
}{
210210
{
211211
// No services present: no calls should be made.
@@ -225,7 +225,7 @@ func TestUpdateNodesInExternalLoadBalancer(t *testing.T) {
225225
services: []*v1.Service{
226226
newService("s0", "333", v1.ServiceTypeLoadBalancer),
227227
},
228-
expectedUpdateCalls: []fakecloud.FakeUpdateBalancerCall{
228+
expectedUpdateCalls: []fakecloud.UpdateBalancerCall{
229229
{Service: newService("s0", "333", v1.ServiceTypeLoadBalancer), Hosts: nodes},
230230
},
231231
},
@@ -236,7 +236,7 @@ func TestUpdateNodesInExternalLoadBalancer(t *testing.T) {
236236
newService("s1", "555", v1.ServiceTypeLoadBalancer),
237237
newService("s2", "666", v1.ServiceTypeLoadBalancer),
238238
},
239-
expectedUpdateCalls: []fakecloud.FakeUpdateBalancerCall{
239+
expectedUpdateCalls: []fakecloud.UpdateBalancerCall{
240240
{Service: newService("s0", "444", v1.ServiceTypeLoadBalancer), Hosts: nodes},
241241
{Service: newService("s1", "555", v1.ServiceTypeLoadBalancer), Hosts: nodes},
242242
{Service: newService("s2", "666", v1.ServiceTypeLoadBalancer), Hosts: nodes},
@@ -250,7 +250,7 @@ func TestUpdateNodesInExternalLoadBalancer(t *testing.T) {
250250
newService("s3", "999", v1.ServiceTypeLoadBalancer),
251251
newService("s4", "123", v1.ServiceTypeClusterIP),
252252
},
253-
expectedUpdateCalls: []fakecloud.FakeUpdateBalancerCall{
253+
expectedUpdateCalls: []fakecloud.UpdateBalancerCall{
254254
{Service: newService("s1", "888", v1.ServiceTypeLoadBalancer), Hosts: nodes},
255255
{Service: newService("s3", "999", v1.ServiceTypeLoadBalancer), Hosts: nodes},
256256
},
@@ -261,7 +261,7 @@ func TestUpdateNodesInExternalLoadBalancer(t *testing.T) {
261261
newService("s0", "234", v1.ServiceTypeLoadBalancer),
262262
nil,
263263
},
264-
expectedUpdateCalls: []fakecloud.FakeUpdateBalancerCall{
264+
expectedUpdateCalls: []fakecloud.UpdateBalancerCall{
265265
{Service: newService("s0", "234", v1.ServiceTypeLoadBalancer), Hosts: nodes},
266266
},
267267
},
@@ -527,7 +527,7 @@ func TestSyncService(t *testing.T) {
527527
func TestProcessServiceDeletion(t *testing.T) {
528528

529529
var controller *ServiceController
530-
var cloud *fakecloud.FakeCloud
530+
var cloud *fakecloud.Cloud
531531
// Add a global svcKey name
532532
svcKey := "external-balancer"
533533

‎pkg/kubelet/cloudresource/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ go_test(
1919
srcs = ["cloud_request_manager_test.go"],
2020
embed = [":go_default_library"],
2121
deps = [
22-
"//pkg/cloudprovider/providers/fake:go_default_library",
2322
"//staging/src/k8s.io/api/core/v1:go_default_library",
2423
"//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library",
24+
"//staging/src/k8s.io/cloud-provider/fake:go_default_library",
2525
],
2626
)
2727

0 commit comments

Comments
 (0)