Merge pull request #1504 from shiftstack/subnet

⚠️Remove OpenStackMachineSpec.Subnet

Author: k8s-ci-robot

api/v1alpha3/conversion_test.go

@@ -142,6 +142,7 @@ func TestFuzzyConversion(t *testing.T) {
 				if v1alpha3Cluster.Spec.Bastion != nil {
 					v1alpha3Cluster.Spec.Bastion.Instance.Image = ""
 					v1alpha3Cluster.Spec.Bastion.Instance.UserDataSecret = nil
+					v1alpha3Cluster.Spec.Bastion.Instance.Subnet = ""
 					if v1alpha3Cluster.Spec.Bastion.Instance.CloudsSecret != nil {
 						v1alpha3Cluster.Spec.Bastion.Instance.CloudsSecret.Namespace = ""
 					}
@@ -160,6 +161,7 @@ func TestFuzzyConversion(t *testing.T) {
 				v1alpha3Machine.ObjectMeta.Annotations = map[string]string{}
 
 				v1alpha3Machine.Spec.UserDataSecret = nil
+				v1alpha3Machine.Spec.Subnet = ""
 
 				if v1alpha3Machine.Spec.CloudsSecret != nil {
 					// In switching to IdentityRef, fetching the cloud secret
@@ -179,6 +181,7 @@ func TestFuzzyConversion(t *testing.T) {
 
 				v1alpha3MachineTemplate.Spec.Template.Spec.Image = ""
 				v1alpha3MachineTemplate.Spec.Template.Spec.UserDataSecret = nil
+				v1alpha3MachineTemplate.Spec.Template.Spec.Subnet = ""
 
 				if v1alpha3MachineTemplate.Spec.Template.Spec.CloudsSecret != nil {
 					v1alpha3MachineTemplate.Spec.Template.Spec.CloudsSecret.Namespace = ""

api/v1alpha3/zz_generated.conversion.go

@@ -220,6 +220,7 @@ func TestFuzzyConversion(t *testing.T) {
 
 				if v1alpha4Cluster.Spec.Bastion != nil {
 					v1alpha4Cluster.Spec.Bastion.Instance.Image = ""
+					v1alpha4Cluster.Spec.Bastion.Instance.Subnet = ""
 				}
 			},
 			func(v1alpha3SubnetFilter *SubnetFilter, c fuzz.Continue) {
@@ -261,6 +262,7 @@ func TestFuzzyConversion(t *testing.T) {
 				c.FuzzNoCustom(v1alpha4Machine)
 
 				v1alpha4Machine.ObjectMeta.Annotations = map[string]string{}
+				v1alpha4Machine.Spec.Subnet = ""
 
 				if v1alpha4Machine.Spec.RootVolume != nil {
 					// OpenStackMachineSpec.Image is ignored in v1alpha4 if RootVolume is set
@@ -273,6 +275,7 @@ func TestFuzzyConversion(t *testing.T) {
 				v1alpha4MachineTemplate.ObjectMeta.Annotations = map[string]string{}
 
 				v1alpha4MachineTemplate.Spec.Template.Spec.Image = ""
+				v1alpha4MachineTemplate.Spec.Template.Spec.Subnet = ""
 			},
 			func(v1alpha4Instance *Instance, c fuzz.Continue) {
 				c.FuzzNoCustom(v1alpha4Instance)
@@ -289,6 +292,7 @@ func TestFuzzyConversion(t *testing.T) {
 
 				if v1alpha4ClusterTemplate.Spec.Template.Spec.Bastion != nil {
 					v1alpha4ClusterTemplate.Spec.Template.Spec.Bastion.Instance.Image = ""
+					v1alpha4ClusterTemplate.Spec.Template.Spec.Bastion.Instance.Subnet = ""
 				}
 			},
 

api/v1alpha4/conversion_test.go

@@ -231,3 +231,7 @@ func Convert_Slice_v1alpha7_Network_To_Slice_v1alpha5_Network(in *[]infrav1.Netw
 	}
 	return nil
 }
+
+func Convert_v1alpha5_OpenStackMachineSpec_To_v1alpha7_OpenStackMachineSpec(in *OpenStackMachineSpec, out *infrav1.OpenStackMachineSpec, s conversion.Scope) error {
+	return autoConvert_v1alpha5_OpenStackMachineSpec_To_v1alpha7_OpenStackMachineSpec(in, out, s)
+}