Merge pull request #1546 from shiftstack/bastion-status

🌱 Reduce the Bastion status to only fields which are used

Author: k8s-ci-robot

api/v1alpha5/conversion.go

@@ -229,3 +229,25 @@ func Convert_v1alpha5_PortOpts_To_v1alpha7_PortOpts(in *PortOpts, out *infrav1.P
 	// SecurityGroups have been removed in v1alpha7.
 	return autoConvert_v1alpha5_PortOpts_To_v1alpha7_PortOpts(in, out, s)
 }
+
+func Convert_v1alpha5_Instance_To_v1alpha7_BastionStatus(in *Instance, out *infrav1.BastionStatus, _ conversion.Scope) error {
+	// BastionStatus is the same as Instance with unused fields removed
+	out.ID = in.ID
+	out.Name = in.Name
+	out.SSHKeyName = in.SSHKeyName
+	out.State = infrav1.InstanceState(in.State)
+	out.IP = in.IP
+	out.FloatingIP = in.FloatingIP
+	return nil
+}
+
+func Convert_v1alpha7_BastionStatus_To_v1alpha5_Instance(in *infrav1.BastionStatus, out *Instance, _ conversion.Scope) error {
+	// BastionStatus is the same as Instance with unused fields removed
+	out.ID = in.ID
+	out.Name = in.Name
+	out.SSHKeyName = in.SSHKeyName
+	out.State = InstanceState(in.State)
+	out.IP = in.IP
+	out.FloatingIP = in.FloatingIP
+	return nil
+}

api/v1alpha5/zz_generated.conversion.go

@@ -133,11 +133,6 @@ func restorev1alpha7ClusterStatus(previous *infrav1.OpenStackClusterStatus, dst
 	if previous.Network != nil && previous.Network.PortOpts != nil {
 		dst.Network.PortOpts.PropagateUplinkStatus = previous.Network.PortOpts.PropagateUplinkStatus
 	}
-	// PropagateUplinkStatus has been added in v1alpha7.
-	// We restore the whole Networks since they are anyway immutable.
-	if previous.Bastion != nil && previous.Bastion.Networks != nil {
-		dst.Bastion.Networks = previous.Bastion.Networks
-	}
 }
 
 var _ ctrlconversion.Convertible = &OpenStackCluster{}
@@ -425,3 +420,25 @@ func Convert_v1alpha7_PortOpts_To_v1alpha6_PortOpts(in *infrav1.PortOpts, out *P
 	// value specs and propagate uplink status have been added in v1alpha7 but have no equivalent in v1alpha5
 	return autoConvert_v1alpha7_PortOpts_To_v1alpha6_PortOpts(in, out, s)
 }
+
+func Convert_v1alpha6_Instance_To_v1alpha7_BastionStatus(in *Instance, out *infrav1.BastionStatus, _ conversion.Scope) error {
+	// BastionStatus is the same as Instance with unused fields removed
+	out.ID = in.ID
+	out.Name = in.Name
+	out.SSHKeyName = in.SSHKeyName
+	out.State = infrav1.InstanceState(in.State)
+	out.IP = in.IP
+	out.FloatingIP = in.FloatingIP
+	return nil
+}
+
+func Convert_v1alpha7_BastionStatus_To_v1alpha6_Instance(in *infrav1.BastionStatus, out *Instance, _ conversion.Scope) error {
+	// BastionStatus is the same as Instance with unused fields removed
+	out.ID = in.ID
+	out.Name = in.Name
+	out.SSHKeyName = in.SSHKeyName
+	out.State = InstanceState(in.State)
+	out.IP = in.IP
+	out.FloatingIP = in.FloatingIP
+	return nil
+}

api/v1alpha6/conversion.go

@@ -19,9 +19,12 @@ package v1alpha6
 import (
 	"testing"
 
+	fuzz "github.com/google/gofuzz"
 	"github.com/onsi/gomega"
+	"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
+	runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
 	ctrlconversion "sigs.k8s.io/controller-runtime/pkg/conversion"
 
@@ -36,10 +39,35 @@ func TestFuzzyConversion(t *testing.T) {
 		delete(obj.GetAnnotations(), utilconversion.DataAnnotation)
 	}
 
+	fuzzerFuncs := func(_ runtimeserializer.CodecFactory) []interface{} {
+		return []interface{}{
+			func(instance *Instance, c fuzz.Continue) {
+				c.FuzzNoCustom(instance)
+
+				// None of the following fields have ever been set in v1alpha6
+				instance.Trunk = false
+				instance.FailureDomain = ""
+				instance.SecurityGroups = nil
+				instance.Networks = nil
+				instance.Subnet = ""
+				instance.Tags = nil
+				instance.Image = ""
+				instance.ImageUUID = ""
+				instance.Flavor = ""
+				instance.UserData = ""
+				instance.Metadata = nil
+				instance.ConfigDrive = nil
+				instance.RootVolume = nil
+				instance.ServerGroupID = ""
+			},
+		}
+	}
+
 	t.Run("for OpenStackCluster", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{
 		Hub:              &infrav1.OpenStackCluster{},
 		Spoke:            &OpenStackCluster{},
 		HubAfterMutation: ignoreDataAnnotation,
+		FuzzerFuncs:      []fuzzer.FuzzerFuncs{fuzzerFuncs},
 	}))
 
 	t.Run("for OpenStackClusterTemplate", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{