Merge pull request #12216 from sbueringer/pr-move-infra-naming-strategy

⚠️ Move infrastructure namingStrategy field in ClusterClass

Author: k8s-ci-robot

api/v1beta1/conversion.go

@@ -98,6 +98,48 @@ func (dst *MachineHealthCheck) ConvertFrom(srcRaw conversion.Hub) error {
 	return Convert_v1beta2_MachineHealthCheck_To_v1beta1_MachineHealthCheck(src, dst, nil)
 }
 
+func Convert_v1beta2_ClusterClassSpec_To_v1beta1_ClusterClassSpec(in *clusterv1.ClusterClassSpec, out *ClusterClassSpec, s apimachineryconversion.Scope) error {
+	if err := autoConvert_v1beta2_ClusterClassSpec_To_v1beta1_ClusterClassSpec(in, out, s); err != nil {
+		return err
+	}
+
+	if in.Infrastructure.NamingStrategy != nil {
+		out.InfrastructureNamingStrategy = &InfrastructureNamingStrategy{
+			Template: in.Infrastructure.NamingStrategy.Template,
+		}
+	}
+	return nil
+}
+
+func Convert_v1beta2_InfrastructureClass_To_v1beta1_LocalObjectTemplate(in *clusterv1.InfrastructureClass, out *LocalObjectTemplate, s apimachineryconversion.Scope) error {
+	if in == nil {
+		return nil
+	}
+
+	return autoConvert_v1beta2_LocalObjectTemplate_To_v1beta1_LocalObjectTemplate(&in.LocalObjectTemplate, out, s)
+}
+
+func Convert_v1beta1_ClusterClassSpec_To_v1beta2_ClusterClassSpec(in *ClusterClassSpec, out *clusterv1.ClusterClassSpec, s apimachineryconversion.Scope) error {
+	if err := autoConvert_v1beta1_ClusterClassSpec_To_v1beta2_ClusterClassSpec(in, out, s); err != nil {
+		return err
+	}
+
+	if in.InfrastructureNamingStrategy != nil {
+		out.Infrastructure.NamingStrategy = &clusterv1.InfrastructureClassNamingStrategy{
+			Template: in.InfrastructureNamingStrategy.Template,
+		}
+	}
+	return nil
+}
+
+func Convert_v1beta1_LocalObjectTemplate_To_v1beta2_InfrastructureClass(in *LocalObjectTemplate, out *clusterv1.InfrastructureClass, s apimachineryconversion.Scope) error {
+	if in == nil {
+		return nil
+	}
+
+	return autoConvert_v1beta1_LocalObjectTemplate_To_v1beta2_LocalObjectTemplate(in, &out.LocalObjectTemplate, s)
+}
+
 func Convert_v1beta2_ClusterClassStatus_To_v1beta1_ClusterClassStatus(in *clusterv1.ClusterClassStatus, out *ClusterClassStatus, s apimachineryconversion.Scope) error {
 	if err := autoConvert_v1beta2_ClusterClassStatus_To_v1beta1_ClusterClassStatus(in, out, s); err != nil {
 		return err

api/v1beta1/zz_generated.conversion.go

@@ -98,17 +98,10 @@ type ClusterClassSpec struct {
 	// +kubebuilder:validation:MaxItems=32
 	AvailabilityGates []ClusterAvailabilityGate `json:"availabilityGates,omitempty"`
 
-	// infrastructure is a reference to a provider-specific template that holds
-	// the details for provisioning infrastructure specific cluster
-	// for the underlying provider.
-	// The underlying provider is responsible for the implementation
-	// of the template to an infrastructure cluster.
+	// infrastructure is a reference to a local struct that holds the details
+	// for provisioning the infrastructure cluster for the Cluster.
 	// +optional
-	Infrastructure LocalObjectTemplate `json:"infrastructure,omitempty"`
-
-	// infrastructureNamingStrategy allows changing the naming pattern used when creating the infrastructure object.
-	// +optional
-	InfrastructureNamingStrategy *InfrastructureNamingStrategy `json:"infrastructureNamingStrategy,omitempty"`
+	Infrastructure InfrastructureClass `json:"infrastructure,omitempty"`
 
 	// controlPlane is a reference to a local struct that holds the details
 	// for provisioning the Control Plane for the Cluster.
@@ -135,6 +128,16 @@ type ClusterClassSpec struct {
 	Patches []ClusterClassPatch `json:"patches,omitempty"`
 }
 
+// InfrastructureClass defines the class for the infrastructure cluster.
+type InfrastructureClass struct {
+	// LocalObjectTemplate contains the reference to a provider-specific infrastructure cluster template.
+	LocalObjectTemplate `json:",inline"`
+
+	// namingStrategy allows changing the naming pattern used when creating the infrastructure cluster object.
+	// +optional
+	NamingStrategy *InfrastructureClassNamingStrategy `json:"namingStrategy,omitempty"`
+}
+
 // ControlPlaneClass defines the class for the control plane.
 type ControlPlaneClass struct {
 	// metadata is the metadata applied to the ControlPlane and the Machines of the ControlPlane
@@ -147,7 +150,7 @@ type ControlPlaneClass struct {
 	// +optional
 	Metadata ObjectMeta `json:"metadata,omitempty"`
 
-	// LocalObjectTemplate contains the reference to the control plane provider.
+	// LocalObjectTemplate contains the reference to a provider-specific control plane template.
 	LocalObjectTemplate `json:",inline"`
 
 	// machineInfrastructure defines the metadata and infrastructure information
@@ -221,8 +224,8 @@ type ControlPlaneClassNamingStrategy struct {
 	Template *string `json:"template,omitempty"`
 }
 
-// InfrastructureNamingStrategy defines the naming strategy for infrastructure objects.
-type InfrastructureNamingStrategy struct {
+// InfrastructureClassNamingStrategy defines the naming strategy for infrastructure objects.
+type InfrastructureClassNamingStrategy struct {
 	// template defines the template to use for generating the name of the Infrastructure object.
 	// If not defined, it will fallback to `{{ .cluster.name }}-{{ .random }}`.
 	// If the templated string exceeds 63 characters, it will be trimmed to 58 characters and will