improve instance tagging logic

Author: yutpeng

pkg/cloudprovider/providers/oci/instances.go

@@ -97,7 +97,7 @@ func (cp *CloudProvider) extractNodeAddresses(ctx context.Context, instanceID st
 		}
 		addresses = append(addresses, api.NodeAddress{Type: api.NodeExternalIP, Address: ip.String()})
 	}
-	if cp.checkOpenShiftISCSIBootVolumeByInstance(ctx, instanceID) {
+	if cp.checkOpenShiftInstance(ctx, instanceID) {
 		secondaryVnic, err := cp.client.Compute().GetSecondaryVNICForInstance(ctx, compartmentID, instanceID)
 		if err != nil {
 			return nil, errors.Wrap(err, "GetSecondaryVNICForInstance")
@@ -352,16 +352,14 @@ func (cp *CloudProvider) checkOpenShiftISCSIBootVolumeByVnic(ctx context.Context
 	return false
 }
 
-func (cp *CloudProvider) checkOpenShiftISCSIBootVolumeByInstance(ctx context.Context, instanceID string) bool {
+func (cp *CloudProvider) checkOpenShiftInstance(ctx context.Context, instanceID string) bool {
 	instance, err := cp.client.Compute().GetInstance(ctx, instanceID)
 	if err != nil {
 		return false
 	}
 	for namespace := range instance.DefinedTags {
 		if strings.HasPrefix(namespace, "openshift") {
-			if bootVolume, exist := instance.DefinedTags[namespace]["boot-volume-type"]; exist && bootVolume == "ISCSI" {
-				return true
-			}
+			return true
 		}
 	}
 	return false