Refactor reconcilation of resources

kubernetes-sigs · Sep 4, 2024 · 2034107 · 2034107
1 parent 6ad79d2
commit 2034107
Show file tree

Hide file tree

Showing 3 changed files with 109 additions and 83 deletions.
diff --git a/api/v1beta2/ibmpowervscluster_webhook.go b/api/v1beta2/ibmpowervscluster_webhook.go
@@ -105,10 +105,12 @@ func (r *IBMPowerVSCluster) validateIBMPowerVSClusterNetwork() *field.Error {
 func (r *IBMPowerVSCluster) validateIBMPowerVSClusterLoadBalancerNames() (allErrs field.ErrorList) {
 	found := make(map[string]bool)
 	for i, loadbalancer := range r.Spec.LoadBalancers {
-		if found[loadbalancer.Name] {
-			allErrs = append(allErrs, field.Duplicate(field.NewPath("spec", fmt.Sprintf("loadbalancers[%d]", i)), map[string]interface{}{"Name": loadbalancer.Name}))
+		if loadbalancer.Name != "" {
+			if found[loadbalancer.Name] {
+				allErrs = append(allErrs, field.Duplicate(field.NewPath("spec", fmt.Sprintf("loadbalancers[%d]", i)), map[string]interface{}{"Name": loadbalancer.Name}))
+			}
+			found[loadbalancer.Name] = true
 		}
-		found[loadbalancer.Name] = true
 	}
 
 	return allErrs
@@ -117,10 +119,12 @@ func (r *IBMPowerVSCluster) validateIBMPowerVSClusterLoadBalancerNames() (allErr
 func (r *IBMPowerVSCluster) validateIBMPowerVSClusterVPCSubnetNames() (allErrs field.ErrorList) {
 	found := make(map[string]bool)
 	for i, subnet := range r.Spec.VPCSubnets {
-		if found[*subnet.Name] {
-			allErrs = append(allErrs, field.Duplicate(field.NewPath("spec", fmt.Sprintf("vpcSubnets[%d]", i)), map[string]interface{}{"Name": *subnet.Name}))
+		if subnet.Name != nil {
+			if found[*subnet.Name] {
+				allErrs = append(allErrs, field.Duplicate(field.NewPath("spec", fmt.Sprintf("vpcSubnets[%d]", i)), map[string]interface{}{"Name": *subnet.Name}))
+			}
+			found[*subnet.Name] = true
 		}
-		found[*subnet.Name] = true
 	}
 
 	return allErrs
@@ -130,6 +134,9 @@ func (r *IBMPowerVSCluster) validateIBMPowerVSClusterTransitGateway() *field.Err
 	if r.Spec.Zone == nil && r.Spec.VPC == nil {
 		return nil
 	}
+	if r.Spec.TransitGateway == nil {
+		return nil
+	}
 	if _, globalRouting, _ := genUtil.GetTransitGatewayLocationAndRouting(r.Spec.Zone, r.Spec.VPC.Region); r.Spec.TransitGateway.GlobalRouting != nil && !*r.Spec.TransitGateway.GlobalRouting && globalRouting != nil && *globalRouting {
 		return field.Invalid(field.NewPath("spec.transitGateway.globalRouting"), r.Spec.TransitGateway.GlobalRouting, "global routing is required since PowerVS and VPC region are from different region")
 	}