use tagging

Author: yutpeng

pkg/cloudprovider/providers/oci/instances.go

@@ -18,6 +18,7 @@ import (
 	"context"
 	"fmt"
 	"net"
+	"strings"
 
 	"github.com/oracle/oci-go-sdk/v65/core"
 	"k8s.io/apimachinery/pkg/labels"
@@ -97,17 +98,16 @@ func (cp *CloudProvider) extractNodeAddresses(ctx context.Context, instanceID st
 		addresses = append(addresses, api.NodeAddress{Type: api.NodeExternalIP, Address: ip.String()})
 	}
 
-	useSecondaryVnic, err := cp.checkOpenShiftNodesSecondaryVnicByInstance(instanceID)
-	if useSecondaryVnic {
-		secondaryVnic, err := cp.client.Compute().GetSecondaryVNICForInstance(ctx, compartmentID, instanceID)
-		if err != nil {
-			return nil, errors.Wrap(err, "GetSecondaryVNICForInstance")
-		}
+	secondaryVnic, err := cp.client.Compute().GetSecondaryVNICForInstance(ctx, compartmentID, instanceID)
+	if err != nil {
+		return nil, errors.Wrap(err, "GetSecondaryVNICForInstance")
+	}
 
-		if secondaryVnic == nil {
-			return addresses, nil
-		}
+	if secondaryVnic == nil {
+		return addresses, nil
+	}
 
+	if cp.checkOpenShiftISCSIBootVolumeByVnic(ctx, secondaryVnic) {
 		if (secondaryVnic.IsPrimary == nil || !*secondaryVnic.IsPrimary) && secondaryVnic.PrivateIp != nil && *secondaryVnic.PrivateIp != "" {
 			ip := net.ParseIP(*secondaryVnic.PrivateIp)
 			if ip == nil {
@@ -340,24 +340,13 @@ func (cp *CloudProvider) getCompartmentIDByNodeName(nodeName string) (string, er
 	return "", errors.New("compartmentID annotation missing in the node. Would retry")
 }
 
-func (cp *CloudProvider) checkOpenShiftNodesSecondaryVnicByInstance(instanceID string) (bool, error) {
-	var SecondaryVnicUsageInstances = []string{"BM.Standard3.64"}
-	nodeList, err := cp.NodeLister.List(labels.Everything())
-	if err != nil {
-		return false, errors.Wrap(err, "error listing all the nodes using node informer")
-	}
-	for _, node := range nodeList {
-		providerID, err := MapProviderIDToResourceID(node.Spec.ProviderID)
-		if err != nil {
-			return false, errors.New("Failed to map providerID to instanceID.")
-		}
-		if providerID == instanceID {
-			if _, ok := node.Labels[OpenShiftNodeIdentifierLabel]; ok {
-				if instanceType, ok := node.Labels[api.LabelInstanceTypeStable]; ok && contains(SecondaryVnicUsageInstances, instanceType) {
-					return true, nil
-				}
+func (cp *CloudProvider) checkOpenShiftISCSIBootVolumeByVnic(ctx context.Context, vnic *core.Vnic) bool {
+	for namespace := range vnic.DefinedTags {
+		if strings.HasPrefix(namespace, "openshift") {
+			if bootVolume, exist := vnic.DefinedTags[namespace]["boot-volume-type"]; exist && bootVolume == "ISCSI" {
+				return true
 			}
 		}
 	}
-	return false, errors.New("Failed to check OpenShift node using node lables. Returning false")
+	return false
 }