Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Staging legacy fake cloud provider #77839

Merged
merged 1 commit into from
May 15, 2019
Merged

Staging legacy fake cloud provider #77839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion hack/.golint_failures
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ pkg/apis/rbac/validation
pkg/apis/storage
pkg/apis/storage/v1
pkg/apis/storage/v1beta1
pkg/cloudprovider/providers/fake
mcrute marked this conversation as resolved.
Show resolved Hide resolved
pkg/cloudprovider/providers/photon
pkg/controller
pkg/controller/apis/config/v1alpha1
Expand Down
1 change: 0 additions & 1 deletion pkg/cloudprovider/providers/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ filegroup(
srcs = [
":package-srcs",
"//pkg/cloudprovider/providers/cloudstack:all-srcs",
"//pkg/cloudprovider/providers/fake:all-srcs",
"//pkg/cloudprovider/providers/openstack:all-srcs",
"//pkg/cloudprovider/providers/ovirt:all-srcs",
"//pkg/cloudprovider/providers/photon:all-srcs",
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/cloud/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ go_test(
],
embed = [":go_default_library"],
deps = [
"//pkg/cloudprovider/providers/fake:go_default_library",
"//pkg/controller:go_default_library",
"//pkg/controller/testutil:go_default_library",
"//pkg/kubelet/apis:go_default_library",
Expand All @@ -60,6 +59,7 @@ go_test(
"//staging/src/k8s.io/client-go/kubernetes/scheme:go_default_library",
"//staging/src/k8s.io/client-go/tools/record:go_default_library",
"//staging/src/k8s.io/cloud-provider:go_default_library",
"//staging/src/k8s.io/cloud-provider/fake:go_default_library",
"//vendor/github.com/stretchr/testify/assert:go_default_library",
"//vendor/k8s.io/klog:go_default_library",
],
Expand Down
22 changes: 11 additions & 11 deletions pkg/controller/cloud/node_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"k8s.io/client-go/informers"
"k8s.io/client-go/tools/record"
cloudprovider "k8s.io/cloud-provider"
fakecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake"
fakecloud "k8s.io/cloud-provider/fake"
"k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/controller/testutil"
kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis"
Expand Down Expand Up @@ -135,7 +135,7 @@ func TestEnsureNodeExistsByProviderID(t *testing.T) {

for _, tc := range testCases {
t.Run(tc.testName, func(t *testing.T) {
fc := &fakecloud.FakeCloud{
fc := &fakecloud.Cloud{
ExistsByProviderID: tc.existsByProviderID,
Err: tc.nodeNameErr,
ErrByProviderID: tc.providerIDErr,
Expand Down Expand Up @@ -199,7 +199,7 @@ func TestNodeInitialized(t *testing.T) {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

fakeCloud := &fakecloud.FakeCloud{
fakeCloud := &fakecloud.Cloud{
InstanceTypes: map[types.NodeName]string{},
Addresses: []v1.NodeAddress{
{
Expand Down
26 changes: 13 additions & 13 deletions pkg/controller/cloud/node_lifecycle_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@ import (
"k8s.io/client-go/kubernetes/fake"
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/tools/record"
fakecloud "k8s.io/cloud-provider/fake"
"k8s.io/klog"
fakecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake"
"k8s.io/kubernetes/pkg/controller/testutil"
)

func Test_NodesDeleted(t *testing.T) {
testcases := []struct {
name string
fnh *testutil.FakeNodeHandler
fakeCloud *fakecloud.FakeCloud
fakeCloud *fakecloud.Cloud
deleteNodes []*v1.Node
}{
{
Expand All @@ -66,7 +66,7 @@ func Test_NodesDeleted(t *testing.T) {
DeletedNodes: []*v1.Node{},
Clientset: fake.NewSimpleClientset(),
},
fakeCloud: &fakecloud.FakeCloud{
fakeCloud: &fakecloud.Cloud{
ExistsByProviderID: false,
},
deleteNodes: []*v1.Node{
Expand Down Expand Up @@ -100,7 +100,7 @@ func Test_NodesDeleted(t *testing.T) {
DeletedNodes: []*v1.Node{},
Clientset: fake.NewSimpleClientset(),
},
fakeCloud: &fakecloud.FakeCloud{
fakeCloud: &fakecloud.Cloud{
ExistsByProviderID: false,
ErrByProviderID: errors.New("err!"),
},
Expand Down Expand Up @@ -133,7 +133,7 @@ func Test_NodesDeleted(t *testing.T) {
DeletedNodes: []*v1.Node{},
Clientset: fake.NewSimpleClientset(),
},
fakeCloud: &fakecloud.FakeCloud{
fakeCloud: &fakecloud.Cloud{
ExistsByProviderID: true,
},
deleteNodes: []*v1.Node{},
Expand Down Expand Up @@ -162,7 +162,7 @@ func Test_NodesDeleted(t *testing.T) {
DeletedNodes: []*v1.Node{},
Clientset: fake.NewSimpleClientset(),
},
fakeCloud: &fakecloud.FakeCloud{
fakeCloud: &fakecloud.Cloud{
ExistsByProviderID: false,
},
deleteNodes: []*v1.Node{
Expand Down Expand Up @@ -193,7 +193,7 @@ func Test_NodesDeleted(t *testing.T) {
DeletedNodes: []*v1.Node{},
Clientset: fake.NewSimpleClientset(),
},
fakeCloud: &fakecloud.FakeCloud{
fakeCloud: &fakecloud.Cloud{
NodeShutdown: false,
ExistsByProviderID: true,
ExtID: map[types.NodeName]string{
Expand Down Expand Up @@ -229,7 +229,7 @@ func Test_NodesDeleted(t *testing.T) {
DeletedNodes: []*v1.Node{},
Clientset: fake.NewSimpleClientset(),
},
fakeCloud: &fakecloud.FakeCloud{
fakeCloud: &fakecloud.Cloud{
ExistsByProviderID: false,
},
deleteNodes: []*v1.Node{},
Expand Down Expand Up @@ -270,7 +270,7 @@ func Test_NodesShutdown(t *testing.T) {
testcases := []struct {
name string
fnh *testutil.FakeNodeHandler
fakeCloud *fakecloud.FakeCloud
fakeCloud *fakecloud.Cloud
updatedNodes []*v1.Node
}{
{
Expand All @@ -297,7 +297,7 @@ func Test_NodesShutdown(t *testing.T) {
UpdatedNodes: []*v1.Node{},
Clientset: fake.NewSimpleClientset(),
},
fakeCloud: &fakecloud.FakeCloud{
fakeCloud: &fakecloud.Cloud{
NodeShutdown: true,
ErrShutdownByProviderID: nil,
},
Expand Down Expand Up @@ -349,7 +349,7 @@ func Test_NodesShutdown(t *testing.T) {
UpdatedNodes: []*v1.Node{},
Clientset: fake.NewSimpleClientset(),
},
fakeCloud: &fakecloud.FakeCloud{
fakeCloud: &fakecloud.Cloud{
NodeShutdown: false,
ErrShutdownByProviderID: errors.New("err!"),
},
Expand Down Expand Up @@ -379,7 +379,7 @@ func Test_NodesShutdown(t *testing.T) {
UpdatedNodes: []*v1.Node{},
Clientset: fake.NewSimpleClientset(),
},
fakeCloud: &fakecloud.FakeCloud{
fakeCloud: &fakecloud.Cloud{
NodeShutdown: false,
ErrShutdownByProviderID: nil,
},
Expand Down Expand Up @@ -409,7 +409,7 @@ func Test_NodesShutdown(t *testing.T) {
UpdatedNodes: []*v1.Node{},
Clientset: fake.NewSimpleClientset(),
},
fakeCloud: &fakecloud.FakeCloud{
fakeCloud: &fakecloud.Cloud{
NodeShutdown: true,
ErrShutdownByProviderID: nil,
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/route/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ go_test(
srcs = ["route_controller_test.go"],
embed = [":go_default_library"],
deps = [
"//pkg/cloudprovider/providers/fake:go_default_library",
"//pkg/controller:go_default_library",
"//pkg/controller/util/node:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",
Expand All @@ -52,6 +51,7 @@ go_test(
"//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library",
"//staging/src/k8s.io/client-go/testing:go_default_library",
"//staging/src/k8s.io/cloud-provider:go_default_library",
"//staging/src/k8s.io/cloud-provider/fake:go_default_library",
],
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/controller/route/route_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"k8s.io/client-go/kubernetes/fake"
core "k8s.io/client-go/testing"
cloudprovider "k8s.io/cloud-provider"
fakecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake"
fakecloud "k8s.io/cloud-provider/fake"
"k8s.io/kubernetes/pkg/controller"
nodeutil "k8s.io/kubernetes/pkg/controller/util/node"
)
Expand Down Expand Up @@ -226,9 +226,9 @@ func TestReconcile(t *testing.T) {
},
}
for i, testCase := range testCases {
cloud := &fakecloud.FakeCloud{RouteMap: make(map[string]*fakecloud.FakeRoute)}
cloud := &fakecloud.Cloud{RouteMap: make(map[string]*fakecloud.Route)}
for _, route := range testCase.initialRoutes {
fakeRoute := &fakecloud.FakeRoute{}
fakeRoute := &fakecloud.Route{}
fakeRoute.ClusterName = cluster
fakeRoute.Route = *route
cloud.RouteMap[route.Name] = fakeRoute
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/service/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ go_test(
embed = [":go_default_library"],
deps = [
"//pkg/api/testapi:go_default_library",
"//pkg/cloudprovider/providers/fake:go_default_library",
"//pkg/controller:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
Expand All @@ -54,6 +53,7 @@ go_test(
"//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library",
"//staging/src/k8s.io/client-go/testing:go_default_library",
"//staging/src/k8s.io/client-go/tools/record:go_default_library",
"//staging/src/k8s.io/cloud-provider/fake:go_default_library",
],
)

Expand Down
20 changes: 10 additions & 10 deletions pkg/controller/service/service_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import (
"k8s.io/client-go/kubernetes/fake"
core "k8s.io/client-go/testing"
"k8s.io/client-go/tools/record"
fakecloud "k8s.io/cloud-provider/fake"
"k8s.io/kubernetes/pkg/api/testapi"
fakecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake"
"k8s.io/kubernetes/pkg/controller"
)

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

func alwaysReady() bool { return true }

func newController() (*ServiceController, *fakecloud.FakeCloud, *fake.Clientset) {
cloud := &fakecloud.FakeCloud{}
func newController() (*ServiceController, *fakecloud.Cloud, *fake.Clientset) {
cloud := &fakecloud.Cloud{}
cloud.Region = region

client := fake.NewSimpleClientset()
Expand Down Expand Up @@ -166,7 +166,7 @@ func TestCreateExternalLoadBalancer(t *testing.T) {
t.Errorf("unexpected client actions: %v", actions)
}
} else {
var balancer *fakecloud.FakeBalancer
var balancer *fakecloud.Balancer
for k := range cloud.Balancers {
if balancer == nil {
b := cloud.Balancers[k]
Expand Down Expand Up @@ -205,7 +205,7 @@ func TestUpdateNodesInExternalLoadBalancer(t *testing.T) {
}
table := []struct {
services []*v1.Service
expectedUpdateCalls []fakecloud.FakeUpdateBalancerCall
expectedUpdateCalls []fakecloud.UpdateBalancerCall
}{
{
// No services present: no calls should be made.
Expand All @@ -225,7 +225,7 @@ func TestUpdateNodesInExternalLoadBalancer(t *testing.T) {
services: []*v1.Service{
newService("s0", "333", v1.ServiceTypeLoadBalancer),
},
expectedUpdateCalls: []fakecloud.FakeUpdateBalancerCall{
expectedUpdateCalls: []fakecloud.UpdateBalancerCall{
{Service: newService("s0", "333", v1.ServiceTypeLoadBalancer), Hosts: nodes},
},
},
Expand All @@ -236,7 +236,7 @@ func TestUpdateNodesInExternalLoadBalancer(t *testing.T) {
newService("s1", "555", v1.ServiceTypeLoadBalancer),
newService("s2", "666", v1.ServiceTypeLoadBalancer),
},
expectedUpdateCalls: []fakecloud.FakeUpdateBalancerCall{
expectedUpdateCalls: []fakecloud.UpdateBalancerCall{
{Service: newService("s0", "444", v1.ServiceTypeLoadBalancer), Hosts: nodes},
{Service: newService("s1", "555", v1.ServiceTypeLoadBalancer), Hosts: nodes},
{Service: newService("s2", "666", v1.ServiceTypeLoadBalancer), Hosts: nodes},
Expand All @@ -250,7 +250,7 @@ func TestUpdateNodesInExternalLoadBalancer(t *testing.T) {
newService("s3", "999", v1.ServiceTypeLoadBalancer),
newService("s4", "123", v1.ServiceTypeClusterIP),
},
expectedUpdateCalls: []fakecloud.FakeUpdateBalancerCall{
expectedUpdateCalls: []fakecloud.UpdateBalancerCall{
{Service: newService("s1", "888", v1.ServiceTypeLoadBalancer), Hosts: nodes},
{Service: newService("s3", "999", v1.ServiceTypeLoadBalancer), Hosts: nodes},
},
Expand All @@ -261,7 +261,7 @@ func TestUpdateNodesInExternalLoadBalancer(t *testing.T) {
newService("s0", "234", v1.ServiceTypeLoadBalancer),
nil,
},
expectedUpdateCalls: []fakecloud.FakeUpdateBalancerCall{
expectedUpdateCalls: []fakecloud.UpdateBalancerCall{
{Service: newService("s0", "234", v1.ServiceTypeLoadBalancer), Hosts: nodes},
},
},
Expand Down Expand Up @@ -527,7 +527,7 @@ func TestSyncService(t *testing.T) {
func TestProcessServiceDeletion(t *testing.T) {

var controller *ServiceController
var cloud *fakecloud.FakeCloud
var cloud *fakecloud.Cloud
// Add a global svcKey name
svcKey := "external-balancer"

Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/cloudresource/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ go_test(
srcs = ["cloud_request_manager_test.go"],
embed = [":go_default_library"],
deps = [
"//pkg/cloudprovider/providers/fake:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library",
"//staging/src/k8s.io/cloud-provider/fake:go_default_library",
],
)

Expand Down