Merge pull request #1965 from shiftstack/machineresources

🌱 Rename referencedResources and dependentResources

Author: k8s-ci-robot

api/v1alpha5/conversion.go

@@ -455,7 +455,7 @@ func Convert_v1alpha5_Instance_To_v1beta1_BastionStatus(in *Instance, out *infra
 	out.State = infrav1.InstanceState(in.State)
 	out.IP = in.IP
 	out.FloatingIP = in.FloatingIP
-	out.ReferencedResources.ServerGroupID = in.ServerGroupID
+	out.Resolved.ServerGroupID = in.ServerGroupID
 	return nil
 }
 
@@ -467,7 +467,7 @@ func Convert_v1beta1_BastionStatus_To_v1alpha5_Instance(in *infrav1.BastionStatu
 	out.State = InstanceState(in.State)
 	out.IP = in.IP
 	out.FloatingIP = in.FloatingIP
-	out.ServerGroupID = in.ReferencedResources.ServerGroupID
+	out.ServerGroupID = in.Resolved.ServerGroupID
 	return nil
 }
 

api/v1alpha5/conversion_test.go

@@ -87,7 +87,7 @@ func TestConvertFrom(t *testing.T) {
 				Spec: OpenStackMachineSpec{},
 				ObjectMeta: metav1.ObjectMeta{
 					Annotations: map[string]string{
-						"cluster.x-k8s.io/conversion-data": "{\"spec\":{\"flavor\":\"\",\"image\":{}},\"status\":{\"dependentResources\":{},\"ready\":false,\"referencedResources\":{}}}",
+						"cluster.x-k8s.io/conversion-data": "{\"spec\":{\"flavor\":\"\",\"image\":{}},\"status\":{\"ready\":false,\"resolved\":{},\"resources\":{}}}",
 					},
 				},
 			},

api/v1alpha5/zz_generated.conversion.go

@@ -368,10 +368,10 @@ func restorev1beta1ClusterStatus(previous *infrav1.OpenStackClusterStatus, dst *
 	dst.BastionSecurityGroup = previous.BastionSecurityGroup
 
 	if previous.Bastion != nil {
-		dst.Bastion.ReferencedResources = previous.Bastion.ReferencedResources
+		dst.Bastion.Resolved = previous.Bastion.Resolved
 	}
-	if previous.Bastion != nil && previous.Bastion.DependentResources.Ports != nil {
-		dst.Bastion.DependentResources.Ports = previous.Bastion.DependentResources.Ports
+	if previous.Bastion != nil && previous.Bastion.Resources.Ports != nil {
+		dst.Bastion.Resources.Ports = previous.Bastion.Resources.Ports
 	}
 }
 

api/v1alpha6/openstackcluster_conversion.go

@@ -90,14 +90,14 @@ var v1beta1OpenStackMachineRestorer = conversion.RestorerFor[*infrav1.OpenStackM
 		restorev1beta1MachineSpec,
 	),
 	"depresources": conversion.UnconditionalFieldRestorer(
-		func(c *infrav1.OpenStackMachine) *infrav1.DependentMachineResources {
-			return &c.Status.DependentResources
+		func(c *infrav1.OpenStackMachine) *infrav1.MachineResources {
+			return &c.Status.Resources
 		},
 	),
 	// No equivalent in v1alpha6
 	"refresources": conversion.UnconditionalFieldRestorer(
-		func(c *infrav1.OpenStackMachine) *infrav1.ReferencedMachineResources {
-			return &c.Status.ReferencedResources
+		func(c *infrav1.OpenStackMachine) *infrav1.ResolvedMachineSpec {
+			return &c.Status.Resolved
 		},
 	),
 }

api/v1alpha6/openstackmachine_conversion.go

@@ -350,11 +350,11 @@ func restorev1alpha7ClusterStatus(previous *OpenStackClusterStatus, dst *OpenSta
 func restorev1beta1ClusterStatus(previous *infrav1.OpenStackClusterStatus, dst *infrav1.OpenStackClusterStatus) {
 	// ReferencedResources have no equivalent in v1alpha7
 	if previous.Bastion != nil {
-		dst.Bastion.ReferencedResources = previous.Bastion.ReferencedResources
+		dst.Bastion.Resolved = previous.Bastion.Resolved
 	}
 
-	if previous.Bastion != nil && previous.Bastion.DependentResources.Ports != nil {
-		dst.Bastion.DependentResources.Ports = previous.Bastion.DependentResources.Ports
+	if previous.Bastion != nil && previous.Bastion.Resources.Ports != nil {
+		dst.Bastion.Resources.Ports = previous.Bastion.Resources.Ports
 	}
 }
 

api/v1alpha6/zz_generated.conversion.go

@@ -77,14 +77,14 @@ var v1beta1OpenStackMachineRestorer = conversion.RestorerFor[*infrav1.OpenStackM
 		restorev1beta1MachineSpec,
 	),
 	"depresources": conversion.UnconditionalFieldRestorer(
-		func(c *infrav1.OpenStackMachine) *infrav1.DependentMachineResources {
-			return &c.Status.DependentResources
+		func(c *infrav1.OpenStackMachine) *infrav1.MachineResources {
+			return &c.Status.Resources
 		},
 	),
 	// No equivalent in v1alpha7
 	"refresources": conversion.UnconditionalFieldRestorer(
-		func(c *infrav1.OpenStackMachine) *infrav1.ReferencedMachineResources {
-			return &c.Status.ReferencedResources
+		func(c *infrav1.OpenStackMachine) *infrav1.ResolvedMachineSpec {
+			return &c.Status.Resolved
 		},
 	),
 }

api/v1alpha7/openstackcluster_conversion.go

@@ -126,11 +126,12 @@ type OpenStackMachineStatus struct {
 	// +optional
 	InstanceState *InstanceState `json:"instanceState,omitempty"`
 
-	// ReferencedResources contains resolved references to resources that the machine depends on.
-	ReferencedResources ReferencedMachineResources `json:"referencedResources,omitempty"`
+	// Resolved contains parts of the machine spec with all external
+	// references fully resolved.
+	Resolved ResolvedMachineSpec `json:"resolved,omitempty"`
 
-	// DependentResources contains resolved dependent resources that were created by the machine.
-	DependentResources DependentMachineResources `json:"dependentResources,omitempty"`
+	// Resources contains references to OpenStack resources created for the machine.
+	Resources MachineResources `json:"resources,omitempty"`
 
 	FailureReason *errors.MachineStatusError `json:"failureReason,omitempty"`