Merge pull request #1550 from shiftstack/network-remove-portopts

🌱Remove PortOpts from Network

Author: k8s-ci-robot

api/v1alpha5/conversion.go

@@ -251,3 +251,8 @@ func Convert_v1alpha7_BastionStatus_To_v1alpha5_Instance(in *infrav1.BastionStat
 	out.FloatingIP = in.FloatingIP
 	return nil
 }
+
+func Convert_v1alpha5_Network_To_v1alpha7_Network(in *Network, out *infrav1.Network, s conversion.Scope) error {
+	// PortOpts has been removed in v1alpha7
+	return autoConvert_v1alpha5_Network_To_v1alpha7_Network(in, out, s)
+}

api/v1alpha5/zz_generated.conversion.go

@@ -125,16 +125,6 @@ func restorev1alpha7ClusterSpec(previous *infrav1.OpenStackClusterSpec, dst *inf
 	}
 }
 
-func restorev1alpha7ClusterStatus(previous *infrav1.OpenStackClusterStatus, dst *infrav1.OpenStackClusterStatus) {
-	// PropagateUplinkStatus has been added in v1alpha7
-	if previous.ExternalNetwork != nil && previous.ExternalNetwork.PortOpts != nil {
-		dst.ExternalNetwork.PortOpts.PropagateUplinkStatus = previous.ExternalNetwork.PortOpts.PropagateUplinkStatus
-	}
-	if previous.Network != nil && previous.Network.PortOpts != nil {
-		dst.Network.PortOpts.PropagateUplinkStatus = previous.Network.PortOpts.PropagateUplinkStatus
-	}
-}
-
 var _ ctrlconversion.Convertible = &OpenStackCluster{}
 
 func (r *OpenStackCluster) ConvertTo(dstRaw ctrlconversion.Hub) error {
@@ -147,7 +137,6 @@ func (r *OpenStackCluster) ConvertTo(dstRaw ctrlconversion.Hub) error {
 
 	if restored {
 		restorev1alpha7ClusterSpec(&previous.Spec, &dst.Spec)
-		restorev1alpha7ClusterStatus(&previous.Status, &dst.Status)
 	}
 
 	return nil
@@ -442,3 +431,8 @@ func Convert_v1alpha7_BastionStatus_To_v1alpha6_Instance(in *infrav1.BastionStat
 	out.FloatingIP = in.FloatingIP
 	return nil
 }
+
+func Convert_v1alpha6_Network_To_v1alpha7_Network(in *Network, out *infrav1.Network, s conversion.Scope) error {
+	// PortOpts has been removed in v1alpha7
+	return autoConvert_v1alpha6_Network_To_v1alpha7_Network(in, out, s)
+}

api/v1alpha6/conversion.go

@@ -188,9 +188,8 @@ type Network struct {
 	//+optional
 	Tags []string `json:"tags,omitempty"`
 
-	Subnet   *Subnet   `json:"subnet,omitempty"`
-	PortOpts *PortOpts `json:"port,omitempty"`
-	Router   *Router   `json:"router,omitempty"`
+	Subnet *Subnet `json:"subnet,omitempty"`
+	Router *Router `json:"router,omitempty"`
 
 	// Be careful when using APIServerLoadBalancer, because this field is optional and therefore not
 	// set in all cases