Merge pull request #3913 from Skarlso/fix_upgrade_nlb

k8s-ci-robot · web-flow · commit 7849351b76f7 · 2022-12-05T09:19:03.000-08:00
Make the LoadBalancerType optional in the Status
diff --git a/api/v1beta2/network_types.go b/api/v1beta2/network_types.go
@@ -169,7 +169,7 @@ type LoadBalancer struct {
 
 	// LoadBalancerType sets the type for a load balancer. The default type is classic.
 	// +kubebuilder:validation:Enum:=classic;elb;alb;nlb
-	LoadBalancerType LoadBalancerType `json:"loadBalancerType"`
+	LoadBalancerType LoadBalancerType `json:"loadBalancerType,omitempty"`
 }
 
 // IsUnmanaged returns true if the Classic ELB is unmanaged.
diff --git a/config/crd/bases/controlplane.cluster.x-k8s.io_awsmanagedcontrolplanes.yaml b/config/crd/bases/controlplane.cluster.x-k8s.io_awsmanagedcontrolplanes.yaml
@@ -1290,8 +1290,6 @@ spec:
                         description: Tags is a map of tags associated with the load
                           balancer.
                         type: object
-                    required:
-                    - loadBalancerType
                     type: object
                   securityGroups:
                     additionalProperties:
@@ -2657,8 +2655,6 @@ spec:
                         description: Tags is a map of tags associated with the load
                           balancer.
                         type: object
-                    required:
-                    - loadBalancerType
                     type: object
                   securityGroups:
                     additionalProperties:
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsclusters.yaml
@@ -1742,8 +1742,6 @@ spec:
                         description: Tags is a map of tags associated with the load
                           balancer.
                         type: object
-                    required:
-                    - loadBalancerType
                     type: object
                   securityGroups:
                     additionalProperties:

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ type LoadBalancer struct {`
`169`	`169`
`170`	`170`	`// LoadBalancerType sets the type for a load balancer. The default type is classic.`
`171`	`171`	`// +kubebuilder:validation:Enum:=classic;elb;alb;nlb`
`172`		- LoadBalancerType LoadBalancerType `json:"loadBalancerType"`
	`172`	+ LoadBalancerType LoadBalancerType `json:"loadBalancerType,omitempty"`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`// IsUnmanaged returns true if the Classic ELB is unmanaged.`