allow retrieval of instance fqdn using instanceID

Author: IamPrvn

pkg/cloudprovider/providers/oci/instances.go

@@ -92,6 +92,7 @@ func (cp *CloudProvider) NodeAddresses(ctx context.Context, name types.NodeName)
 // nodeaddresses are being queried. i.e. local metadata services cannot be used
 // in this method to obtain nodeaddresses.
 func (cp *CloudProvider) NodeAddressesByProviderID(ctx context.Context, providerID string) ([]api.NodeAddress, error) {
+	addresses := []api.NodeAddress{}
 	cp.logger.With("instanceID", providerID).Debug("Getting node addresses by provider id")
 	instanceID, err := MapProviderIDToInstanceID(providerID)
 	if err != nil {
@@ -101,7 +102,28 @@ func (cp *CloudProvider) NodeAddressesByProviderID(ctx context.Context, provider
 	if err != nil {
 		return nil, errors.Wrap(err, "GetPrimaryVNICForInstance")
 	}
-	return extractNodeAddressesFromVNIC(vnic)
+	vnicAddresses, err := extractNodeAddressesFromVNIC(vnic)
+	if err != nil {
+		return nil, err
+	}
+	addresses = append(addresses, vnicAddresses...)
+	hostname := vnic.HostnameLabel
+	if *hostname == "" {
+		cp.logger.With("instanceID", providerID).Debug("hostname not set, instance won't be resolvable using using the Internet and VCN Resolver")
+		return addresses, nil
+	}
+	subnet, err := cp.client.Networking().GetSubnet(ctx, *vnic.SubnetId)
+	if err != nil {
+		return nil, errors.Wrap(err, "GetSubnetForInstance")
+	}
+	vcn, err := cp.client.Networking().GetVcn(ctx, *subnet.VcnId)
+	if err != nil {
+		return nil, errors.Wrap(err, "GetVcnForInstance")
+	}
+	fqdn := strings.Join([]string{*hostname, *subnet.DnsLabel, *vcn.DnsLabel, "oraclevcn.com"}, ".")
+	addresses = append(addresses, api.NodeAddress{Type: api.NodeHostName, Address: fqdn})
+	addresses = append(addresses, api.NodeAddress{Type: api.NodeInternalDNS, Address: fqdn})
+	return addresses, nil
 }
 
 // InstanceID returns the cloud provider ID of the node with the specified NodeName.

pkg/oci/client/client.go

@@ -66,6 +66,7 @@ type computeClient interface {
 type virtualNetworkClient interface {
 	GetVnic(ctx context.Context, request core.GetVnicRequest) (response core.GetVnicResponse, err error)
 	GetSubnet(ctx context.Context, request core.GetSubnetRequest) (response core.GetSubnetResponse, err error)
+	GetVcn(ctx context.Context, request core.GetVcnRequest) (response core.GetVcnResponse, err error)
 	GetSecurityList(ctx context.Context, request core.GetSecurityListRequest) (response core.GetSecurityListResponse, err error)
 	UpdateSecurityList(ctx context.Context, request core.UpdateSecurityListRequest) (response core.UpdateSecurityListResponse, err error)
 

pkg/oci/client/client_test.go

@@ -187,6 +187,10 @@ func (c *mockVirtualNetworkClient) GetSubnet(ctx context.Context, request core.G
 	return core.GetSubnetResponse{}, nil
 }
 
+func (c *mockVirtualNetworkClient) GetVcn(ctx context.Context, request core.GetVcnRequest) (response core.GetVcnResponse, err error)  {
+	return core.GetVcnResponse{} , nil
+}
+
 func (c *mockVirtualNetworkClient) GetSecurityList(ctx context.Context, request core.GetSecurityListRequest) (response core.GetSecurityListResponse, err error) {
 	return core.GetSecurityListResponse{}, nil
 }

pkg/oci/client/metrics.go

@@ -38,6 +38,7 @@ const (
 	vnicAttachmentResource     resource = "vnic_attachment"
 	vnicResource               resource = "vnic"
 	subnetResource             resource = "subnet"
+	vcnResource                resource = "vcn"
 	loadBalancerResource       resource = "load_balancer"
 	backendSetResource         resource = "load_balancer_backend_set"
 	listenerResource           resource = "load_balancer_listener"

pkg/oci/client/networking.go

@@ -28,6 +28,8 @@ type NetworkingInterface interface {
 	GetSubnet(ctx context.Context, id string) (*core.Subnet, error)
 	GetSubnetFromCacheByIP(ip string) (*core.Subnet, error)
 
+	GetVcn(ctx context.Context, id string) (*core.Vcn, error)
+
 	GetSecurityList(ctx context.Context, id string) (core.GetSecurityListResponse, error)
 	UpdateSecurityList(ctx context.Context, request core.UpdateSecurityListRequest) (core.UpdateSecurityListResponse, error)
 
@@ -97,6 +99,23 @@ func (c *client) GetSubnetFromCacheByIP(ip string) (*core.Subnet, error) {
 	return nil, nil
 }
 
+func (c *client) GetVcn(ctx context.Context, id string) (*core.Vcn, error) {
+	if !c.rateLimiter.Reader.TryAccept() {
+		return nil, RateLimitError(false, "GetVcn")
+	}
+	resp, err := c.network.GetVcn(ctx, core.GetVcnRequest{
+		VcnId: &id,
+	})
+	incRequestCounter(err, getVerb, vcnResource)
+
+	if err != nil {
+		return nil, errors.WithStack(err)
+	}
+
+	vcn := &resp.Vcn
+	return vcn, nil
+}
+
 func (c *client) GetSecurityList(ctx context.Context, id string) (core.GetSecurityListResponse, error) {
 	if !c.rateLimiter.Reader.TryAccept() {
 		return core.GetSecurityListResponse{}, RateLimitError(false, "GetSecurityList")

pkg/volume/provisioner/block/block_test.go

@@ -206,6 +206,10 @@ func (c *MockVirtualNetworkClient) GetSubnet(ctx context.Context, id string) (*c
 	return nil, nil
 }
 
+func (c *MockVirtualNetworkClient) GetVcn(ctx context.Context, id string) (*core.Vcn, error) {
+	return &core.Vcn{}, nil
+}
+
 func (c *MockVirtualNetworkClient) GetSubnetFromCacheByIP(ip string) (*core.Subnet, error) {
 	return nil, nil
 }

pkg/volume/provisioner/fss/fss_test.go

@@ -209,6 +209,10 @@ func (c *MockVirtualNetworkClient) GetSubnetFromCacheByIP(ip string) (*core.Subn
 	return nil, nil
 }
 
+func (c *MockVirtualNetworkClient) GetVcn(ctx context.Context, id string) (*core.Vcn, error) {
+	return &core.Vcn{}, nil
+}
+
 func (c *MockVirtualNetworkClient) GetSecurityList(ctx context.Context, id string) (core.GetSecurityListResponse, error) {
 	return core.GetSecurityListResponse{}, nil
 }