Prevent fuzzy conversion tests from considering new field

Matt Pryor · Matt Pryor · commit 5b138e7fe931 · 2022-09-12T17:48:20.000+01:00
diff --git a/api/v1alpha3/conversion_test.go b/api/v1alpha3/conversion_test.go
@@ -235,6 +235,7 @@ func TestFuzzyConversion(t *testing.T) {
 					v1alpha6Cluster.Spec.Bastion.Instance.ImageUUID = ""
 					v1alpha6Cluster.Spec.Bastion.Instance.Ports = nil
 				}
+				v1alpha6Cluster.Spec.ControlPlaneOmitAvailabilityZone = false
 
 				v1alpha6Cluster.Status.FailureMessage = nil
 				v1alpha6Cluster.Status.FailureReason = nil
diff --git a/api/v1alpha4/conversion_test.go b/api/v1alpha4/conversion_test.go
@@ -331,6 +331,8 @@ func TestFuzzyConversion(t *testing.T) {
 
 				v1alpha6Cluster.Spec.APIServerLoadBalancer.AllowedCIDRs = nil
 
+				v1alpha6Cluster.Spec.ControlPlaneOmitAvailabilityZone = false
+
 				if v1alpha6Cluster.Spec.Bastion != nil {
 					v1alpha6Cluster.Spec.Bastion.Instance.Image = ""
 				}
@@ -405,6 +407,8 @@ func TestFuzzyConversion(t *testing.T) {
 
 				v1alpha6ClusterTemplate.Spec.Template.Spec.APIServerLoadBalancer.AllowedCIDRs = nil
 
+				v1alpha6ClusterTemplate.Spec.Template.Spec.ControlPlaneOmitAvailabilityZone = false
+
 				if v1alpha6ClusterTemplate.Spec.Template.Spec.Bastion != nil {
 					v1alpha6ClusterTemplate.Spec.Template.Spec.Bastion.Instance.Image = ""
 				}

Original file line number	Diff line number	Diff line change
`@@ -235,6 +235,7 @@ func TestFuzzyConversion(t *testing.T) {`
`235`	`235`	`v1alpha6Cluster.Spec.Bastion.Instance.ImageUUID = ""`
`236`	`236`	`v1alpha6Cluster.Spec.Bastion.Instance.Ports = nil`
`237`	`237`	`}`
	`238`	`+ v1alpha6Cluster.Spec.ControlPlaneOmitAvailabilityZone = false`
`238`	`239`
`239`	`240`	`v1alpha6Cluster.Status.FailureMessage = nil`
`240`	`241`	`v1alpha6Cluster.Status.FailureReason = nil`
Original file line number	Diff line number	Diff line change
`@@ -331,6 +331,8 @@ func TestFuzzyConversion(t *testing.T) {`
`331`	`331`
`332`	`332`	`v1alpha6Cluster.Spec.APIServerLoadBalancer.AllowedCIDRs = nil`
`333`	`333`
	`334`	`+ v1alpha6Cluster.Spec.ControlPlaneOmitAvailabilityZone = false`
	`335`	`+`
`334`	`336`	`if v1alpha6Cluster.Spec.Bastion != nil {`
`335`	`337`	`v1alpha6Cluster.Spec.Bastion.Instance.Image = ""`
`336`	`338`	`}`
`@@ -405,6 +407,8 @@ func TestFuzzyConversion(t *testing.T) {`
`405`	`407`
`406`	`408`	`v1alpha6ClusterTemplate.Spec.Template.Spec.APIServerLoadBalancer.AllowedCIDRs = nil`
`407`	`409`
	`410`	`+ v1alpha6ClusterTemplate.Spec.Template.Spec.ControlPlaneOmitAvailabilityZone = false`
	`411`	`+`
`408`	`412`	`if v1alpha6ClusterTemplate.Spec.Template.Spec.Bastion != nil {`
`409`	`413`	`v1alpha6ClusterTemplate.Spec.Template.Spec.Bastion.Instance.Image = ""`
`410`	`414`	`}`