Merge pull request #1642 from ching-kuo/remove_apilb_conversion

k8s-ci-robot · web-flow · commit cc304b8af1d5 · 2023-08-17T02:35:23.000-07:00
🌱Remove APIServerLoadBalancer.Provider Up Conversion
diff --git a/api/v1alpha6/conversion.go b/api/v1alpha6/conversion.go
@@ -121,8 +121,6 @@ func restorev1alpha7MachineSpec(previous *infrav1.OpenStackMachineSpec, dst *inf
 }
 
 func restorev1alpha7ClusterSpec(previous *infrav1.OpenStackClusterSpec, dst *infrav1.OpenStackClusterSpec) {
-	// APIServerLoadBalancer.Provider is new in v1alpha7
-	dst.APIServerLoadBalancer.Provider = previous.APIServerLoadBalancer.Provider
 	dst.Router = previous.Router
 	// PropagateUplinkStatus has been added in v1alpha7.
 	// We restore the whole Ports since they are anyway immutable.

Original file line number	Diff line number	Diff line change
`@@ -121,8 +121,6 @@ func restorev1alpha7MachineSpec(previous infrav1.OpenStackMachineSpec, dst inf`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`func restorev1alpha7ClusterSpec(previous infrav1.OpenStackClusterSpec, dst infrav1.OpenStackClusterSpec) {`
`124`		`- // APIServerLoadBalancer.Provider is new in v1alpha7`
`125`		`- dst.APIServerLoadBalancer.Provider = previous.APIServerLoadBalancer.Provider`
`126`	`124`	`dst.Router = previous.Router`
`127`	`125`	`// PropagateUplinkStatus has been added in v1alpha7.`
`128`	`126`	`// We restore the whole Ports since they are anyway immutable.`