Moving code around

Author: okokes-akamai

cloud/linode/cloud.go

@@ -28,8 +28,7 @@ var Options struct {
 
 type linodeCloud struct {
 	client        Client
-	instances     cloudprovider.Instances
-	zones         cloudprovider.Zones
+	instances     cloudprovider.InstancesV2
 	loadbalancers cloudprovider.LoadBalancer
 }
 
@@ -64,7 +63,6 @@ func newCloud() (cloudprovider.Interface, error) {
 	return &linodeCloud{
 		client:        &linodeClient,
 		instances:     newInstances(&linodeClient),
-		zones:         newZones(&linodeClient, region),
 		loadbalancers: newLoadbalancers(&linodeClient, region),
 	}, nil
 }
@@ -83,15 +81,15 @@ func (c *linodeCloud) LoadBalancer() (cloudprovider.LoadBalancer, bool) {
 }
 
 func (c *linodeCloud) Instances() (cloudprovider.Instances, bool) {
-	return c.instances, true
+	return nil, false
 }
 
 func (c *linodeCloud) InstancesV2() (cloudprovider.InstancesV2, bool) {
-	return nil, false
+	return c.instances, true
 }
 
 func (c *linodeCloud) Zones() (cloudprovider.Zones, bool) {
-	return c.zones, true
+	return nil, false
 }
 
 func (c *linodeCloud) Clusters() (cloudprovider.Clusters, bool) {

cloud/linode/instances.go

@@ -17,7 +17,14 @@ type instances struct {
 	client Client
 }
 
-func newInstances(client Client) cloudprovider.Instances {
+// TODO(PR): providing both APIs to keep the tests green and to enable
+// gradual migration
+type hybridInstances interface {
+	cloudprovider.Instances
+	cloudprovider.InstancesV2
+}
+
+func newInstances(client Client) hybridInstances {
 	return &instances{client}
 }
 
@@ -202,3 +209,16 @@ func (i *instances) InstanceShutdownByProviderID(ctx context.Context, providerID
 
 	return false, nil
 }
+
+// TODO(PR): move code from instancesv1 over here
+func (i *instances) InstanceExists(ctx context.Context, node *v1.Node) (bool, error) {
+	return false, nil // TODO(PR): fix
+}
+
+func (i *instances) InstanceShutdown(ctx context.Context, node *v1.Node) (bool, error) {
+	return false, nil // TODO(PR): fix
+}
+
+func (i *instances) InstanceMetadata(ctx context.Context, node *v1.Node) (*cloudprovider.InstanceMetadata, error) {
+	return nil, nil
+}

cloud/linode/zones.go

@@ -7,6 +7,7 @@ import (
 	cloudprovider "k8s.io/cloud-provider"
 )
 
+// TODO(PR): move this to instancesv2; move tests to instances_test
 type zones struct {
 	client Client
 	region string