Merge pull request #1988 from shiftstack/instanceidstatus2

⚠️ Move InstanceID from Spec to Status

Author: k8s-ci-robot

api/v1alpha5/zz_generated.conversion.go

@@ -607,7 +607,7 @@ func TestMachineConversionControllerSpecFields(t *testing.T) {
 		{
 			name: "Set InstanceID",
 			modifyUp: func(up *infrav1.OpenStackMachine) {
-				up.Spec.InstanceID = pointer.String("new-instance-id")
+				up.Status.InstanceID = pointer.String("new-instance-id")
 			},
 			testAfter: func(after *OpenStackMachine) {
 				g.Expect(after.Spec.InstanceID).To(gomega.Equal(pointer.String("new-instance-id")))

api/v1alpha6/conversion_test.go

@@ -116,6 +116,10 @@ var v1beta1OpenStackClusterRestorer = conversion.RestorerFor[*infrav1.OpenStackC
 /* OpenStackClusterSpec */
 
 func restorev1alpha6ClusterSpec(previous *OpenStackClusterSpec, dst *OpenStackClusterSpec) {
+	if previous == nil || dst == nil {
+		return
+	}
+
 	for i := range previous.ExternalRouterIPs {
 		dstIP := &dst.ExternalRouterIPs[i]
 		previousIP := &previous.ExternalRouterIPs[i]
@@ -139,6 +143,7 @@ func restorev1alpha6ClusterSpec(previous *OpenStackClusterSpec, dst *OpenStackCl
 	dstBastion := dst.Bastion
 	if prevBastion != nil && dstBastion != nil {
 		restorev1alpha6MachineSpec(&prevBastion.Instance, &dstBastion.Instance)
+		dstBastion.Instance.InstanceID = prevBastion.Instance.InstanceID
 	}
 
 	// To avoid lossy conversion, we need to restore AllowAllInClusterTraffic

api/v1alpha6/openstackcluster_conversion.go

@@ -102,6 +102,26 @@ var v1beta1OpenStackMachineRestorer = conversion.RestorerFor[*infrav1.OpenStackM
 	),
 }
 
+/* OpenStackMachine */
+
+func Convert_v1alpha6_OpenStackMachine_To_v1beta1_OpenStackMachine(in *OpenStackMachine, out *infrav1.OpenStackMachine, s apiconversion.Scope) error {
+	err := autoConvert_v1alpha6_OpenStackMachine_To_v1beta1_OpenStackMachine(in, out, s)
+	if err != nil {
+		return err
+	}
+	out.Status.InstanceID = in.Spec.InstanceID
+	return nil
+}
+
+func Convert_v1beta1_OpenStackMachine_To_v1alpha6_OpenStackMachine(in *infrav1.OpenStackMachine, out *OpenStackMachine, s apiconversion.Scope) error {
+	err := autoConvert_v1beta1_OpenStackMachine_To_v1alpha6_OpenStackMachine(in, out, s)
+	if err != nil {
+		return err
+	}
+	out.Spec.InstanceID = in.Status.InstanceID
+	return nil
+}
+
 /* OpenStackMachineSpec */
 
 func restorev1alpha6MachineSpec(previous *OpenStackMachineSpec, dst *OpenStackMachineSpec) {

api/v1alpha6/openstackmachine_conversion.go

@@ -64,7 +64,7 @@ var v1alpha6OpenStackMachineTemplateRestorer = conversion.RestorerFor[*OpenStack
 		func(c *OpenStackMachineTemplate) *OpenStackMachineSpec {
 			return &c.Spec.Template.Spec
 		},
-		restorev1alpha6MachineSpec,
+		restorev1alpha6MachineTemplateMachineSpec,
 	),
 }
 
@@ -76,3 +76,13 @@ var v1beta1OpenStackMachineTemplateRestorer = conversion.RestorerFor[*infrav1.Op
 		restorev1beta1MachineSpec,
 	),
 }
+
+// Restore a MachineSpec in the context of a MachineTemplate. Restores
+// InstanceID, which will not otherwise be restored for a MachineTemplate.
+func restorev1alpha6MachineTemplateMachineSpec(previous *OpenStackMachineSpec, dst *OpenStackMachineSpec) {
+	if previous == nil || dst == nil {
+		return
+	}
+	restorev1alpha6MachineSpec(previous, dst)
+	dst.InstanceID = previous.InstanceID
+}

api/v1alpha6/openstackmachinetemplate_conversion.go

@@ -211,7 +211,7 @@ func TestMachineConversionControllerSpecFields(t *testing.T) {
 		{
 			name: "Set InstanceID",
 			modifyUp: func(up *infrav1.OpenStackMachine) {
-				up.Spec.InstanceID = pointer.String("new-instance-id")
+				up.Status.InstanceID = pointer.String("new-instance-id")
 			},
 			testAfter: func(g gomega.Gomega, after *OpenStackMachine) {
 				g.Expect(after.Spec.InstanceID).To(gomega.Equal(pointer.String("new-instance-id")))

api/v1alpha6/zz_generated.conversion.go

@@ -371,9 +371,14 @@ func Convert_v1beta1_OpenStackClusterStatus_To_v1alpha7_OpenStackClusterStatus(i
 /* Bastion */
 
 func restorev1alpha7Bastion(previous **Bastion, dst **Bastion) {
-	if *previous != nil && *dst != nil {
-		restorev1alpha7MachineSpec(&(*previous).Instance, &(*dst).Instance)
+	if *previous == nil || *dst == nil {
+		return
 	}
+
+	prevMachineSpec := &(*previous).Instance
+	dstMachineSpec := &(*dst).Instance
+	restorev1alpha7MachineSpec(prevMachineSpec, dstMachineSpec)
+	dstMachineSpec.InstanceID = prevMachineSpec.InstanceID
 }
 
 func restorev1beta1Bastion(previous **infrav1.Bastion, dst **infrav1.Bastion) {

api/v1alpha7/conversion_test.go

@@ -102,6 +102,28 @@ var v1beta1OpenStackMachineRestorer = conversion.RestorerFor[*infrav1.OpenStackM
 	),
 }
 
+/* OpenStackMachine */
+
+func Convert_v1alpha7_OpenStackMachine_To_v1beta1_OpenStackMachine(in *OpenStackMachine, out *infrav1.OpenStackMachine, s apiconversion.Scope) error {
+	err := autoConvert_v1alpha7_OpenStackMachine_To_v1beta1_OpenStackMachine(in, out, s)
+	if err != nil {
+		return err
+	}
+
+	out.Status.InstanceID = in.Spec.InstanceID
+	return nil
+}
+
+func Convert_v1beta1_OpenStackMachine_To_v1alpha7_OpenStackMachine(in *infrav1.OpenStackMachine, out *OpenStackMachine, s apiconversion.Scope) error {
+	err := autoConvert_v1beta1_OpenStackMachine_To_v1alpha7_OpenStackMachine(in, out, s)
+	if err != nil {
+		return err
+	}
+
+	out.Spec.InstanceID = in.Status.InstanceID
+	return nil
+}
+
 /* OpenStackMachineSpec */
 
 func restorev1alpha7MachineSpec(previous *OpenStackMachineSpec, dst *OpenStackMachineSpec) {

api/v1alpha7/openstackcluster_conversion.go

@@ -78,5 +78,12 @@ var v1beta1OpenStackMachineTemplateRestorer = conversion.RestorerFor[*infrav1.Op
 }
 
 func restorev1alpha7MachineTemplateSpec(previous *OpenStackMachineTemplateSpec, dst *OpenStackMachineTemplateSpec) {
-	restorev1alpha7MachineSpec(&previous.Template.Spec, &dst.Template.Spec)
+	if previous == nil || dst == nil {
+		return
+	}
+
+	prevMachineSpec := &previous.Template.Spec
+	dstMachineSpec := &dst.Template.Spec
+	restorev1alpha7MachineSpec(prevMachineSpec, dstMachineSpec)
+	dstMachineSpec.InstanceID = prevMachineSpec.InstanceID
 }

api/v1alpha7/openstackmachine_conversion.go

@@ -22,6 +22,8 @@ import (
 	"k8s.io/utils/pointer"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/errors"
+
+	"sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/optional"
 )
 
 const (
@@ -36,9 +38,6 @@ type OpenStackMachineSpec struct {
 	// ProviderID is the unique identifier as specified by the cloud provider.
 	ProviderID *string `json:"providerID,omitempty"`
 
-	// InstanceID is the OpenStack instance ID for this machine.
-	InstanceID *string `json:"instanceID,omitempty"`
-
 	// The flavor reference for the flavor for your server instance.
 	Flavor string `json:"flavor"`
 
@@ -119,6 +118,10 @@ type OpenStackMachineStatus struct {
 	// +optional
 	Ready bool `json:"ready"`
 
+	// InstanceID is the OpenStack instance ID for this machine.
+	// +optional
+	InstanceID optional.String `json:"instanceID,omitempty"`
+
 	// Addresses contains the OpenStack instance associated addresses.
 	Addresses []corev1.NodeAddress `json:"addresses,omitempty"`