cloud provider: remove redundant implementation of InstanceMetadataByProviderID since instanceV2 is disabled for all providers

Signed-off-by: Andrew Sy Kim <[email protected]>

Author: andrewsykim

staging/src/k8s.io/legacy-cloud-providers/aws/aws.go

@@ -1395,6 +1395,7 @@ func (c *Cloud) Instances() (cloudprovider.Instances, bool) {
 }
 
 // InstancesV2 returns an implementation of InstancesV2 for Amazon Web Services.
+// TODO: implement ONLY for external cloud provider
 func (c *Cloud) InstancesV2() (cloudprovider.InstancesV2, bool) {
 	return nil, false
 }
@@ -1670,31 +1671,6 @@ func (c *Cloud) InstanceShutdownByProviderID(ctx context.Context, providerID str
 	return false, nil
 }
 
-// InstanceMetadataByProviderID returns metadata of the specified instance.
-func (c *Cloud) InstanceMetadataByProviderID(ctx context.Context, providerID string) (*cloudprovider.InstanceMetadata, error) {
-	instanceID, err := KubernetesInstanceID(providerID).MapToAWSInstanceID()
-	if err != nil {
-		return nil, err
-	}
-
-	instance, err := describeInstance(c.ec2, instanceID)
-	if err != nil {
-		return nil, err
-	}
-
-	// TODO ignore checking whether `*instance.State.Name == ec2.InstanceStateNameTerminated` here.
-	// If not behave as expected, add it.
-	addresses, err := extractNodeAddresses(instance)
-	if err != nil {
-		return nil, err
-	}
-	return &cloudprovider.InstanceMetadata{
-		ProviderID:    providerID,
-		Type:          aws.StringValue(instance.InstanceType),
-		NodeAddresses: addresses,
-	}, nil
-}
-
 // InstanceID returns the cloud provider ID of the node with the specified nodeName.
 func (c *Cloud) InstanceID(ctx context.Context, nodeName types.NodeName) (string, error) {
 	// In the future it is possible to also return an endpoint as:

staging/src/k8s.io/legacy-cloud-providers/aws/aws_test.go

@@ -681,23 +681,6 @@ func TestNodeAddressesWithMetadata(t *testing.T) {
 	}
 }
 
-func TestInstanceMetadataByProviderID(t *testing.T) {
-	instance0 := makeInstance(0, "192.168.0.1", "1.2.3.4", "instance-same.ec2.internal", "instance-same.ec2.external", true)
-	aws1, _ := mockInstancesResp(&instance0, []*ec2.Instance{&instance0})
-	// change node name so it uses the instance instead of metadata
-	aws1.selfAWSInstance.nodeName = "foo"
-
-	md, err := aws1.InstanceMetadataByProviderID(context.TODO(), "/us-east-1a/i-0")
-	if err != nil {
-		t.Errorf("should not error when instance found")
-	}
-	if md.ProviderID != "/us-east-1a/i-0" || md.Type != "c3.large" {
-		t.Errorf("expect providerID %s get %s, expect type %s get %s", "/us-east-1a/i-0", md.ProviderID, "c3.large", md.Type)
-	}
-	testHasNodeAddress(t, md.NodeAddresses, v1.NodeInternalIP, "192.168.0.1")
-	testHasNodeAddress(t, md.NodeAddresses, v1.NodeExternalIP, "1.2.3.4")
-}
-
 func TestParseMetadataLocalHostname(t *testing.T) {
 	tests := []struct {
 		name        string

staging/src/k8s.io/legacy-cloud-providers/azure/azure.go

@@ -665,6 +665,7 @@ func (az *Cloud) Instances() (cloudprovider.Instances, bool) {
 }
 
 // InstancesV2 returns an instancesV2 interface. Also returns true if the interface is supported, false otherwise.
+// TODO: implement ONLY for external cloud provider
 func (az *Cloud) InstancesV2() (cloudprovider.InstancesV2, bool) {
 	return nil, false
 }

staging/src/k8s.io/legacy-cloud-providers/azure/azure_instances.go

@@ -239,80 +239,6 @@ func (az *Cloud) InstanceShutdownByProviderID(ctx context.Context, providerID st
 	return status == vmPowerStateStopped || status == vmPowerStateDeallocated || status == vmPowerStateDeallocating, nil
 }
 
-// InstanceMetadataByProviderID returns metadata of the specified instance.
-// InstanceMetadataByProviderID is part of InstancesV2 interface and is only used in cloud node-controller.
-func (az *Cloud) InstanceMetadataByProviderID(ctx context.Context, providerID string) (*cloudprovider.InstanceMetadata, error) {
-	if providerID == "" {
-		return nil, errNodeNotInitialized
-	}
-
-	// Returns nil for unmanaged nodes because azure cloud provider couldn't fetch information for them.
-	if az.IsNodeUnmanagedByProviderID(providerID) {
-		klog.V(4).Infof("NodeAddressesByProviderID: omitting unmanaged node %q", providerID)
-		return nil, nil
-	}
-
-	nodeName, err := az.vmSet.GetNodeNameByProviderID(providerID)
-	if err != nil {
-		return nil, err
-	}
-
-	md := &cloudprovider.InstanceMetadata{}
-	md.ProviderID = providerID
-	if az.UseInstanceMetadata {
-		metadata, err := az.metadata.GetMetadata(azcache.CacheReadTypeDefault)
-		if err != nil {
-			return nil, err
-		}
-
-		if metadata.Compute == nil || metadata.Network == nil {
-			return nil, fmt.Errorf("failure of getting instance metadata")
-		}
-
-		isLocalInstance, err := az.isCurrentInstance(nodeName, metadata.Compute.Name)
-		if err != nil {
-			return nil, err
-		}
-
-		// Not local instance, get metadata from Azure ARM API.
-		if !isLocalInstance {
-			if az.vmSet != nil {
-				if md.Type, err = az.vmSet.GetInstanceTypeByNodeName(string(nodeName)); err != nil {
-					return nil, err
-				}
-				if md.NodeAddresses, err = az.addressGetter(nodeName); err != nil {
-					return nil, err
-				}
-				return md, nil
-			}
-			// vmSet == nil indicates credentials are not provided.
-			return nil, fmt.Errorf("no credentials provided for Azure cloud provider")
-		}
-
-		// Get instance metadata from IMDS for local instance.
-		if metadata.Compute.VMSize != "" {
-			md.Type = metadata.Compute.VMSize
-		} else {
-			if md.Type, err = az.vmSet.GetInstanceTypeByNodeName(string(nodeName)); err != nil {
-				return nil, err
-			}
-		}
-		if md.NodeAddresses, err = az.getLocalInstanceNodeAddresses(metadata.Network.Interface, string(nodeName)); err != nil {
-			return nil, err
-		}
-		return md, nil
-	}
-
-	// Get instance metadata from ARM API when UseInstanceMetadata is disabled.
-	if md.Type, err = az.vmSet.GetInstanceTypeByNodeName(string(nodeName)); err != nil {
-		return nil, err
-	}
-	if md.NodeAddresses, err = az.addressGetter(nodeName); err != nil {
-		return nil, err
-	}
-	return md, err
-}
-
 func (az *Cloud) isCurrentInstance(name types.NodeName, metadataVMName string) (bool, error) {
 	var err error
 	nodeName := mapNodeNameToVMName(name)