Skip to content

K
k3s
Commit 7d62316f authored by Mike Crute's avatar Mike Crute
Browse files
Options

Migrate fake cloud provider to staging

parent 0e224ad3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 65 deletions
hack/.golint_failures
View file @ 7d62316f
......@@ -50,7 +50,6 @@ pkg/apis/rbac/validation
pkg/apis/storage
pkg/apis/storage/v1
pkg/apis/storage/v1beta1
pkg/cloudprovider/providers/fake
pkg/cloudprovider/providers/photon
pkg/controller
pkg/controller/apis/config/v1alpha1
......
pkg/cloudprovider/providers/BUILD
View file @ 7d62316f
......@@ -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",
......
pkg/controller/cloud/BUILD
View file @ 7d62316f
......@@ -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",
......@@ -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",
],
......
pkg/controller/cloud/node_controller_test.go
View file @ 7d62316f
......@@ -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"
......@@ -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,
......@@ -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",
},
......@@ -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",
},
......@@ -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",
},
......@@ -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",
},
......@@ -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{
{
......@@ -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",
......@@ -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{
{
......@@ -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{
{
......@@ -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{
{
......
pkg/controller/cloud/node_lifecycle_controller_test.go
View file @ 7d62316f
......@@ -30,8 +30,8 @@ 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"
)
......@@ -39,7 +39,7 @@ func Test_NodesDeleted(t *testing.T) {
testcases := []struct {
name string
fnh *testutil.FakeNodeHandler
fakeCloud *fakecloud.FakeCloud
fakeCloud *fakecloud.Cloud
deleteNodes []*v1.Node
}{
{
......@@ -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{
......@@ -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!"),
},
......@@ -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{},
......@@ -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{
......@@ -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{
......@@ -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{},
......@@ -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
}{
{
......@@ -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,
},
......@@ -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!"),
},
......@@ -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,
},
......@@ -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,
},
......
pkg/controller/route/BUILD
View file @ 7d62316f
......@@ -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",
......@@ -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",
],
)
......
pkg/controller/route/route_controller_test.go
View file @ 7d62316f
......@@ -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"
)
......@@ -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
......
pkg/controller/service/BUILD
View file @ 7d62316f
......@@ -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",
......@@ -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",
],
)
......
pkg/controller/service/service_controller_test.go
View file @ 7d62316f
......@@ -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"
)
......@@ -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()
......@@ -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]
......@@ -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.
......@@ -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},
},
},
......@@ -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},
......@@ -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},
},
......@@ -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},
},
},
......@@ -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"
......
pkg/kubelet/cloudresource/BUILD
View file @ 7d62316f
......@@ -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",
],
)
......
pkg/kubelet/cloudresource/cloud_request_manager_test.go
View file @ 7d62316f
......@@ -24,7 +24,7 @@ import (
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/util/diff"
"k8s.io/kubernetes/pkg/cloudprovider/providers/fake"
"k8s.io/cloud-provider/fake"
)
func createNodeInternalIPAddress(address string) []v1.NodeAddress {
......@@ -38,7 +38,7 @@ func createNodeInternalIPAddress(address string) []v1.NodeAddress {
func TestNodeAddressesDelay(t *testing.T) {
syncPeriod := 100 * time.Millisecond
cloud := &fake.FakeCloud{
cloud := &fake.Cloud{
Addresses: createNodeInternalIPAddress("10.0.1.12"),
// Set the request delay so the manager timeouts and collects the node addresses later
RequestDelay: 200 * time.Millisecond,
......@@ -82,7 +82,7 @@ func TestNodeAddressesDelay(t *testing.T) {
}
func TestNodeAddressesUsesLastSuccess(t *testing.T) {
cloud := &fake.FakeCloud{}
cloud := &fake.Cloud{}
manager := NewSyncManager(cloud, "defaultNode", 0).(*cloudResourceSyncManager)
// These tests are stateful and order dependant.
......
pkg/kubelet/nodestatus/BUILD
View file @ 7d62316f
......@@ -46,7 +46,6 @@ go_test(
srcs = ["setters_test.go"],
embed = [":go_default_library"],
deps = [
"//pkg/cloudprovider/providers/fake:go_default_library",
"//pkg/kubelet/cm:go_default_library",
"//pkg/kubelet/container:go_default_library",
"//pkg/kubelet/container/testing:go_default_library",
......@@ -62,6 +61,7 @@ go_test(
"//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/rand:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
"//staging/src/k8s.io/cloud-provider/fake:go_default_library",
"//vendor/github.com/google/cadvisor/info/v1:go_default_library",
"//vendor/github.com/stretchr/testify/assert:go_default_library",
"//vendor/github.com/stretchr/testify/require:go_default_library",
......
pkg/kubelet/nodestatus/setters_test.go
View file @ 7d62316f
......@@ -34,7 +34,7 @@ import (
"k8s.io/apimachinery/pkg/util/diff"
"k8s.io/apimachinery/pkg/util/rand"
"k8s.io/apimachinery/pkg/util/uuid"
fakecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake"
fakecloud "k8s.io/cloud-provider/fake"
"k8s.io/kubernetes/pkg/kubelet/cm"
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
kubecontainertest "k8s.io/kubernetes/pkg/kubelet/container/testing"
......@@ -249,7 +249,7 @@ func TestNodeAddress(t *testing.T) {
}
hostname := testKubeletHostname
externalCloudProvider := false
cloud := &fakecloud.FakeCloud{
cloud := &fakecloud.Cloud{
Addresses: testCase.nodeAddresses,
Err: nil,
}
......
pkg/volume/azure_file/BUILD
View file @ 7d62316f
......@@ -38,7 +38,6 @@ go_test(
srcs = ["azure_file_test.go"],
embed = [":go_default_library"],
deps = [
"//pkg/cloudprovider/providers/fake:go_default_library",
"//pkg/util/mount:go_default_library",
"//pkg/volume:go_default_library",
"//pkg/volume/testing:go_default_library",
......@@ -46,6 +45,7 @@ go_test(
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
"//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library",
"//staging/src/k8s.io/cloud-provider/fake:go_default_library",
"//staging/src/k8s.io/legacy-cloud-providers/azure:go_default_library",
"//vendor/github.com/Azure/go-autorest/autorest/to:go_default_library",
],
......
pkg/volume/azure_file/azure_file_test.go
View file @ 7d62316f
......@@ -30,7 +30,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/kubernetes/fake"
fakecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake"
fakecloud "k8s.io/cloud-provider/fake"
"k8s.io/kubernetes/pkg/util/mount"
"k8s.io/kubernetes/pkg/volume"
volumetest "k8s.io/kubernetes/pkg/volume/testing"
......@@ -119,7 +119,7 @@ func TestPluginWithoutCloudProvider(t *testing.T) {
func TestPluginWithOtherCloudProvider(t *testing.T) {
tmpDir := getTestTempDir(t)
defer os.RemoveAll(tmpDir)
cloud := &fakecloud.FakeCloud{}
cloud := &fakecloud.Cloud{}
testPlugin(t, tmpDir, volumetest.NewFakeVolumeHostWithCloudProvider(tmpDir, nil, nil, cloud))
}
......
pkg/volume/vsphere_volume/BUILD
View file @ 7d62316f
......@@ -45,7 +45,6 @@ go_test(
],
embed = [":go_default_library"],
deps = [
"//pkg/cloudprovider/providers/fake:go_default_library",
"//pkg/util/mount:go_default_library",
"//pkg/volume:go_default_library",
"//pkg/volume/testing:go_default_library",
......@@ -54,6 +53,7 @@ go_test(
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
"//staging/src/k8s.io/client-go/util/testing:go_default_library",
"//staging/src/k8s.io/cloud-provider:go_default_library",
"//staging/src/k8s.io/cloud-provider/fake:go_default_library",
"//staging/src/k8s.io/legacy-cloud-providers/vsphere:go_default_library",
"//staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib:go_default_library",
"//vendor/k8s.io/klog:go_default_library",
......
pkg/volume/vsphere_volume/vsphere_volume_test.go
View file @ 7d62316f
......@@ -26,7 +26,7 @@ import (
"k8s.io/apimachinery/pkg/types"
utiltesting "k8s.io/client-go/util/testing"
cloudprovider "k8s.io/cloud-provider"
"k8s.io/kubernetes/pkg/cloudprovider/providers/fake"
"k8s.io/cloud-provider/fake"
"k8s.io/kubernetes/pkg/util/mount"
"k8s.io/kubernetes/pkg/volume"
volumetest "k8s.io/kubernetes/pkg/volume/testing"
......@@ -203,7 +203,7 @@ func TestUnsupportedCloudProvider(t *testing.T) {
}{
{name: "nil cloudprovider", cloudProvider: nil},
{name: "vSphere", cloudProvider: &vsphere.VSphere{}, success: true},
{name: "fake cloudprovider", cloudProvider: &fake.FakeCloud{}},
{name: "fake cloudprovider", cloudProvider: &fake.Cloud{}},
}
for _, tc := range testcases {
......
staging/src/k8s.io/cloud-provider/BUILD
View file @ 7d62316f
......@@ -35,6 +35,7 @@ filegroup(
name = "all-srcs",
srcs = [
":package-srcs",
"//staging/src/k8s.io/cloud-provider/fake:all-srcs",
"//staging/src/k8s.io/cloud-provider/node:all-srcs",
"//staging/src/k8s.io/cloud-provider/service/helpers:all-srcs",
"//staging/src/k8s.io/cloud-provider/volume:all-srcs",
......
pkg/cloudprovider/providers/fake/BUILD → staging/src/k8s.io/cloud-provider/fake/BUILD
View file @ 7d62316f
......@@ -11,7 +11,8 @@ go_library(
"doc.go",
"fake.go",
],
importpath = "k8s.io/kubernetes/pkg/cloudprovider/providers/fake",
importmap = "k8s.io/kubernetes/vendor/k8s.io/cloud-provider/fake",
importpath = "k8s.io/cloud-provider/fake",
deps = [
"//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
......
pkg/cloudprovider/providers/fake/doc.go → staging/src/k8s.io/cloud-provider/fake/doc.go
View file @ 7d62316f
......@@ -16,4 +16,4 @@ limitations under the License.
// Package fake is a test-double implementation of cloudprovider
// Interface, LoadBalancer and Instances. It is useful for testing.
package fake // import "k8s.io/kubernetes/pkg/cloudprovider/providers/fake"
package fake // import "k8s.io/cloud-provider/fake"
test/integration/serving/BUILD
View file @ 7d62316f
......@@ -21,10 +21,10 @@ go_test(
"//cmd/kube-apiserver/app/testing:go_default_library",
"//cmd/kube-controller-manager/app/testing:go_default_library",
"//cmd/kube-scheduler/app/testing:go_default_library",
"//pkg/cloudprovider/providers/fake:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/server:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/server/options:go_default_library",
"//staging/src/k8s.io/cloud-provider:go_default_library",
"//staging/src/k8s.io/cloud-provider/fake:go_default_library",
"//test/integration/framework:go_default_library",
],
)
......
test/integration/serving/serving_test.go
View file @ 7d62316f
......@@ -31,11 +31,11 @@ import (
"k8s.io/apiserver/pkg/server"
"k8s.io/apiserver/pkg/server/options"
"k8s.io/cloud-provider"
"k8s.io/cloud-provider/fake"
cloudctrlmgrtesting "k8s.io/kubernetes/cmd/cloud-controller-manager/app/testing"
kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing"
kubectrlmgrtesting "k8s.io/kubernetes/cmd/kube-controller-manager/app/testing"
kubeschedulertesting "k8s.io/kubernetes/cmd/kube-scheduler/app/testing"
"k8s.io/kubernetes/pkg/cloudprovider/providers/fake"
"k8s.io/kubernetes/test/integration/framework"
)
......@@ -321,5 +321,5 @@ func intPtr(x int) *int {
}
func fakeCloudProviderFactory(io.Reader) (cloudprovider.Interface, error) {
return &fake.FakeCloud{}, nil
return &fake.Cloud{}, nil
}
test/integration/volume/BUILD
View file @ 7d62316f
......@@ -16,7 +16,6 @@ go_test(
tags = ["integration"],
deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/cloudprovider/providers/fake:go_default_library",
"//pkg/controller/volume/attachdetach:go_default_library",
"//pkg/controller/volume/attachdetach/cache:go_default_library",
"//pkg/controller/volume/persistentvolume:go_default_library",
......@@ -38,6 +37,7 @@ go_test(
"//staging/src/k8s.io/client-go/rest:go_default_library",
"//staging/src/k8s.io/client-go/tools/cache:go_default_library",
"//staging/src/k8s.io/client-go/tools/reference:go_default_library",
"//staging/src/k8s.io/cloud-provider/fake:go_default_library",
"//test/integration/framework:go_default_library",
"//vendor/k8s.io/klog:go_default_library",
],
......
test/integration/volume/attach_detach_test.go
View file @ 7d62316f
......@@ -32,7 +32,7 @@ import (
clientset "k8s.io/client-go/kubernetes"
restclient "k8s.io/client-go/rest"
"k8s.io/client-go/tools/cache"
fakecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake"
fakecloud "k8s.io/cloud-provider/fake"
"k8s.io/kubernetes/pkg/controller/volume/attachdetach"
volumecache "k8s.io/kubernetes/pkg/controller/volume/attachdetach/cache"
"k8s.io/kubernetes/pkg/controller/volume/persistentvolume"
......@@ -422,7 +422,7 @@ func createAdClients(ns *v1.Namespace, t *testing.T, server *httptest.Server, sy
Detachers: nil,
}
plugins := []volume.VolumePlugin{plugin}
cloud := &fakecloud.FakeCloud{}
cloud := &fakecloud.Cloud{}
informers := clientgoinformers.NewSharedInformerFactory(testClient, resyncPeriod)
ctrl, err := attachdetach.NewAttachDetachController(
testClient,
......
test/integration/volume/persistent_volumes_test.go
View file @ 7d62316f
......@@ -34,8 +34,8 @@ import (
clientset "k8s.io/client-go/kubernetes"
restclient "k8s.io/client-go/rest"
ref "k8s.io/client-go/tools/reference"
fakecloud "k8s.io/cloud-provider/fake"
"k8s.io/kubernetes/pkg/api/legacyscheme"
fakecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake"
persistentvolumecontroller "k8s.io/kubernetes/pkg/controller/volume/persistentvolume"
"k8s.io/kubernetes/pkg/volume"
volumetest "k8s.io/kubernetes/pkg/volume/testing"
......@@ -1123,7 +1123,7 @@ func createClients(ns *v1.Namespace, t *testing.T, s *httptest.Server, syncPerio
Detachers: nil,
}
plugins := []volume.VolumePlugin{plugin}
cloud := &fakecloud.FakeCloud{}
cloud := &fakecloud.Cloud{}
informers := informers.NewSharedInformerFactory(testClient, getSyncPeriod(syncPeriod))
ctrl, err := persistentvolumecontroller.NewController(
persistentvolumecontroller.ControllerParameters{
......
vendor/modules.txt
View file @ 7d62316f
......@@ -1530,6 +1530,7 @@ k8s.io/client-go/util/testing
k8s.io/client-go/util/workqueue
# k8s.io/cloud-provider v0.0.0 => ./staging/src/k8s.io/cloud-provider
k8s.io/cloud-provider
k8s.io/cloud-provider/fake
k8s.io/cloud-provider/node/helpers
k8s.io/cloud-provider/service/helpers
k8s.io/cloud-provider/volume
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment