Support service instance id (#1652)

Karthik-K-N · web-flow · commit 3142b92eacfe · 2024-03-08T04:26:45.000-08:00
diff --git a/api/v1beta2/ibmpowervscluster_webhook.go b/api/v1beta2/ibmpowervscluster_webhook.go
@@ -121,6 +121,10 @@ func (r *IBMPowerVSCluster) validateIBMPowerVSClusterCreateInfraPrereq() *field.
 		return field.Invalid(field.NewPath("spec.zone"), r.Spec.Zone, "value of zone is empty")
 	}
 
+	if r.Spec.VPC == nil {
+		return field.Invalid(field.NewPath("spec.vpc"), r.Spec.VPC, "value of VPC is empty")
+	}
+
 	if r.Spec.VPC.Region == nil {
 		return field.Invalid(field.NewPath("spec.vpc.region"), r.Spec.VPC.Region, "value of VPC region is empty")
 	}
diff --git a/cloud/scope/powervs_machine.go b/cloud/scope/powervs_machine.go
@@ -162,6 +162,8 @@ func NewPowerVSMachineScope(params PowerVSMachineScopeParams) (scope *PowerVSMac
 	var serviceInstanceID, serviceInstanceName string
 	if params.IBMPowerVSMachine.Spec.ServiceInstanceID != "" {
 		serviceInstanceID = params.IBMPowerVSMachine.Spec.ServiceInstanceID
+	} else if params.IBMPowerVSMachine.Spec.ServiceInstance != nil && params.IBMPowerVSMachine.Spec.ServiceInstance.ID != nil {
+		serviceInstanceID = *params.IBMPowerVSMachine.Spec.ServiceInstance.ID
 	} else {
 		serviceInstanceName = fmt.Sprintf("%s-%s", params.IBMPowerVSCluster.GetName(), "serviceInstance")
 		if params.IBMPowerVSCluster.Spec.ServiceInstance != nil && params.IBMPowerVSCluster.Spec.ServiceInstance.Name != nil {

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,10 @@ func (r IBMPowerVSCluster) validateIBMPowerVSClusterCreateInfraPrereq() field.`
`121`	`121`	`return field.Invalid(field.NewPath("spec.zone"), r.Spec.Zone, "value of zone is empty")`
`122`	`122`	`}`
`123`	`123`
	`124`	`+ if r.Spec.VPC == nil {`
	`125`	`+ return field.Invalid(field.NewPath("spec.vpc"), r.Spec.VPC, "value of VPC is empty")`
	`126`	`+ }`
	`127`	`+`
`124`	`128`	`if r.Spec.VPC.Region == nil {`
`125`	`129`	`return field.Invalid(field.NewPath("spec.vpc.region"), r.Spec.VPC.Region, "value of VPC region is empty")`
`126`	`130`	`}`