Merge pull request #94 from aman4433/release-4.17

OCPBUGS-44880: Fetch service instance id from spec of IBMPowerVSCluster object while setting provider id
openshift · Nov 28, 2024 · 213d34d · 213d34d
2 parents a2beaa3 + 379f9ef
commit 213d34d
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/cloud/scope/powervs_machine.go b/cloud/scope/powervs_machine.go
@@ -922,10 +922,16 @@ func (m *PowerVSMachineScope) GetZone() string {
 
 // GetServiceInstanceID returns the service instance id.
 func (m *PowerVSMachineScope) GetServiceInstanceID() string {
-	if m.IBMPowerVSCluster.Status.ServiceInstance == nil || m.IBMPowerVSCluster.Status.ServiceInstance.ID == nil {
-		return ""
+	if m.IBMPowerVSCluster.Status.ServiceInstance != nil && m.IBMPowerVSCluster.Status.ServiceInstance.ID != nil {
+		return *m.IBMPowerVSCluster.Status.ServiceInstance.ID
+	}
+	if m.IBMPowerVSCluster.Spec.ServiceInstanceID != "" {
+		return m.IBMPowerVSCluster.Spec.ServiceInstanceID
 	}
-	return *m.IBMPowerVSCluster.Status.ServiceInstance.ID
+	if m.IBMPowerVSCluster.Spec.ServiceInstance != nil && m.IBMPowerVSCluster.Spec.ServiceInstance.ID != nil {
+		return *m.IBMPowerVSCluster.Spec.ServiceInstance.ID
+	}
+	return ""
 }
 
 // SetProviderID will set the provider id for the machine.