From 655dfd11964c12e351ef4f14261baaf6084cafd7 Mon Sep 17 00:00:00 2001 From: wlan0 Date: Tue, 28 Mar 2017 15:08:03 -0700 Subject: [PATCH] move ProvideID indexed methods to right location --- pkg/cloudprovider/providers/gce/gce.go | 16 ---------------- pkg/cloudprovider/providers/gce/gce_instances.go | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/pkg/cloudprovider/providers/gce/gce.go b/pkg/cloudprovider/providers/gce/gce.go index f9253856dac..92e22442456 100644 --- a/pkg/cloudprovider/providers/gce/gce.go +++ b/pkg/cloudprovider/providers/gce/gce.go @@ -17,7 +17,6 @@ limitations under the License. package gce import ( - "errors" "fmt" "io" "regexp" @@ -30,7 +29,6 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/util/flowcontrol" - "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/cloudprovider" "github.com/golang/glog" @@ -342,17 +340,3 @@ func getZonesForRegion(svc *compute.Service, projectID, region string) ([]string } return zones, nil } - -// NodeAddressesByProviderID returns the node addresses of an instances with the specified unique providerID -// This method will not be called from the node that is requesting this ID. i.e. metadata service -// and other local methods cannot be used here -func (gce *GCECloud) NodeAddressesByProviderID(providerID string) ([]v1.NodeAddress, error) { - return []v1.NodeAddress{}, errors.New("unimplemented") -} - -// InstanceTypeByProviderID returns the cloudprovider instance type of the node with the specified unique providerID -// This method will not be called from the node that is requesting this ID. i.e. metadata service -// and other local methods cannot be used here -func (gce *GCECloud) InstanceTypeByProviderID(providerID string) (string, error) { - return "", errors.New("unimplemented") -} diff --git a/pkg/cloudprovider/providers/gce/gce_instances.go b/pkg/cloudprovider/providers/gce/gce_instances.go index 1813d43b040..13efc670803 100644 --- a/pkg/cloudprovider/providers/gce/gce_instances.go +++ b/pkg/cloudprovider/providers/gce/gce_instances.go @@ -17,6 +17,7 @@ limitations under the License. package gce import ( + "errors" "fmt" "net/http" "strconv" @@ -349,3 +350,17 @@ func (gce *GCECloud) isCurrentInstance(instanceID string) bool { return currentInstanceID == canonicalizeInstanceName(instanceID) } + +// NodeAddressesByProviderID returns the node addresses of an instances with the specified unique providerID +// This method will not be called from the node that is requesting this ID. i.e. metadata service +// and other local methods cannot be used here +func (gce *GCECloud) NodeAddressesByProviderID(providerID string) ([]v1.NodeAddress, error) { + return []v1.NodeAddress{}, errors.New("unimplemented") +} + +// InstanceTypeByProviderID returns the cloudprovider instance type of the node with the specified unique providerID +// This method will not be called from the node that is requesting this ID. i.e. metadata service +// and other local methods cannot be used here +func (gce *GCECloud) InstanceTypeByProviderID(providerID string) (string, error) { + return "", errors.New("unimplemented") +}