Merge pull request #42 from Karthik-K-N/fix-instanceid

UPSTREAM: <carry>: Add check for valid Power VS instance id
openshift · Jun 30, 2023 · 0e75226 · 0e75226
2 parents 049e3ed + 2ca2ac3
commit 0e75226
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/ibm/ibm_powervs_client.go b/ibm/ibm_powervs_client.go
@@ -175,6 +175,9 @@ func (p *ibmPowerVSClient) populateNodeMetadata(nodeName string, node *NodeMetad
 	if pvsInstance == nil {
 		return errors.New("Could not retrieve a Power instance: name=" + nodeName)
 	}
+	if pvsInstance.PvmInstanceID == nil || *pvsInstance.PvmInstanceID == "" {
+		return fmt.Errorf("could not retrieve valid instance id for Power instance name: %s instance id: %v", nodeName, pvsInstance.PvmInstanceID)
+	}
 	node.WorkerID = *pvsInstance.PvmInstanceID
 	klog.Infof("Node %s worker id is %s", nodeName, node.WorkerID)