Merge pull request #812 from anmazzotti/implement_rke2controlplanetemplateresourcespec

feat: implement RKE2ControlPlaneTemplateResourceSpec

Author: anmazzotti

controlplane/api/v1beta1/conversion.go

@@ -19,6 +19,7 @@ package v1beta1
 import (
 	"fmt"
 	"reflect"
+	unsafe "unsafe"
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -187,6 +188,44 @@ func (dst *RKE2ControlPlaneTemplateList) ConvertFrom(srcRaw conversion.Hub) erro
 	return Convert_v1beta2_RKE2ControlPlaneTemplateList_To_v1beta1_RKE2ControlPlaneTemplateList(src, dst, nil)
 }
 
+// Convert_v1beta1_RKE2ControlPlaneSpec_To_v1beta2_RKE2ControlPlaneTemplateResourceSpec handles manual conversion of template spec fields.
+func Convert_v1beta1_RKE2ControlPlaneSpec_To_v1beta2_RKE2ControlPlaneTemplateResourceSpec(in *RKE2ControlPlaneSpec, out *controlplanev1.RKE2ControlPlaneTemplateResourceSpec, s apimachineryconversion.Scope) error {
+	if err := Convert_v1beta1_RKE2ConfigSpec_To_v1beta2_RKE2ConfigSpec(&in.RKE2ConfigSpec, &out.RKE2ConfigSpec, s); err != nil {
+		return err
+	}
+	if err := Convert_v1beta1_RKE2ControlPlaneMachineTemplate_To_v1beta2_RKE2ControlPlaneMachineTemplate(&in.MachineTemplate, &out.MachineTemplate, s); err != nil {
+		return err
+	}
+	if err := Convert_v1beta1_RKE2ServerConfig_To_v1beta2_RKE2ServerConfig(&in.ServerConfig, &out.ServerConfig, s); err != nil {
+		return err
+	}
+	out.ManifestsConfigMapReference = in.ManifestsConfigMapReference
+	out.RegistrationMethod = controlplanev1.RegistrationMethod(in.RegistrationMethod)
+	out.RegistrationAddress = in.RegistrationAddress
+	out.RolloutStrategy = (*controlplanev1.RolloutStrategy)(unsafe.Pointer(in.RolloutStrategy))
+	out.RemediationStrategy = (*controlplanev1.RemediationStrategy)(unsafe.Pointer(in.RemediationStrategy))
+	return nil
+}
+
+// Convert_v1beta2_RKE2ControlPlaneTemplateResourceSpec_To_v1beta1_RKE2ControlPlaneSpec handles manual conversion of template spec fields.
+func Convert_v1beta2_RKE2ControlPlaneTemplateResourceSpec_To_v1beta1_RKE2ControlPlaneSpec(in *controlplanev1.RKE2ControlPlaneTemplateResourceSpec, out *RKE2ControlPlaneSpec, s apimachineryconversion.Scope) error {
+	if err := Convert_v1beta2_RKE2ConfigSpec_To_v1beta1_RKE2ConfigSpec(&in.RKE2ConfigSpec, &out.RKE2ConfigSpec, s); err != nil {
+		return err
+	}
+	if err := Convert_v1beta2_RKE2ControlPlaneMachineTemplate_To_v1beta1_RKE2ControlPlaneMachineTemplate(&in.MachineTemplate, &out.MachineTemplate, s); err != nil {
+		return err
+	}
+	if err := Convert_v1beta2_RKE2ServerConfig_To_v1beta1_RKE2ServerConfig(&in.ServerConfig, &out.ServerConfig, s); err != nil {
+		return err
+	}
+	out.ManifestsConfigMapReference = in.ManifestsConfigMapReference
+	out.RegistrationMethod = RegistrationMethod(in.RegistrationMethod)
+	out.RegistrationAddress = in.RegistrationAddress
+	out.RolloutStrategy = (*RolloutStrategy)(unsafe.Pointer(in.RolloutStrategy))
+	out.RemediationStrategy = (*RemediationStrategy)(unsafe.Pointer(in.RemediationStrategy))
+	return nil
+}
+
 // Convert_v1beta1_RKE2ControlPlaneStatus_To_v1beta2_RKE2ControlPlaneStatus handles manual conversion of status fields.
 func Convert_v1beta1_RKE2ControlPlaneStatus_To_v1beta2_RKE2ControlPlaneStatus(in *RKE2ControlPlaneStatus, out *controlplanev1.RKE2ControlPlaneStatus, s apimachineryconversion.Scope) error {
 	if err := autoConvert_v1beta1_RKE2ControlPlaneStatus_To_v1beta2_RKE2ControlPlaneStatus(in, out, s); err != nil {

controlplane/api/v1beta1/zz_generated.conversion.go

@@ -77,7 +77,7 @@ type RKE2ControlPlaneSpec struct {
 
 	// Version defines the desired Kubernetes version.
 	// +kubebuilder:validation:Pattern="(v\\d\\.\\d{2}\\.\\d+\\+rke2r\\d)|^$"
-	// +optional
+	// +required
 	Version string `json:"version"`
 
 	// MachineTemplate contains information about how machines

controlplane/api/v1beta2/rke2controlplane_types.go

@@ -17,7 +17,10 @@ limitations under the License.
 package v1beta2
 
 import (
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta2"
 )
 
 // RKE2ControlPlaneTemplateSpec defines the desired state of RKE2ControlPlaneTemplate.
@@ -30,7 +33,44 @@ type RKE2ControlPlaneTemplateSpec struct {
 // RKE2ControlPlaneTemplateResource contains spec for RKE2ControlPlaneTemplate.
 type RKE2ControlPlaneTemplateResource struct {
 	// Spec is the specification of the desired behavior of the control plane.
-	Spec RKE2ControlPlaneSpec `json:"spec"`
+	Spec RKE2ControlPlaneTemplateResourceSpec `json:"spec"`
+}
+
+// RKE2ControlPlaneTemplateResourceSpec contains the spec for RKE2ControlPlaneTemplateResource.
+type RKE2ControlPlaneTemplateResourceSpec struct {
+	// RKE2AgentSpec contains the node spec for the RKE2 Control plane nodes.
+	bootstrapv1.RKE2ConfigSpec `json:",inline"`
+
+	// MachineTemplate contains information about how machines
+	// should be shaped when creating or updating a control plane.
+	// +optional
+	MachineTemplate RKE2ControlPlaneMachineTemplate `json:"machineTemplate,omitempty,omitzero"`
+
+	// ServerConfig specifies configuration for the agent nodes.
+	//+optional
+	ServerConfig RKE2ServerConfig `json:"serverConfig,omitempty,omitzero"`
+
+	// ManifestsConfigMapReference references a ConfigMap which contains Kubernetes manifests to be deployed automatically on the cluster
+	// Each data entry in the ConfigMap will be will be copied to a folder on the control plane nodes that RKE2 scans and uses to deploy manifests.
+	//+optional
+	ManifestsConfigMapReference corev1.ObjectReference `json:"manifestsConfigMapReference,omitempty,omitzero"`
+
+	// RegistrationMethod is the method to use for registering nodes into the RKE2 cluster.
+	// +kubebuilder:validation:Enum=internal-first;internal-only-ips;external-only-ips;address;control-plane-endpoint;""
+	// +optional
+	RegistrationMethod RegistrationMethod `json:"registrationMethod,omitempty,omitzero"`
+
+	// RegistrationAddress is an explicit address to use when registering a node. This is required if
+	// the registration type is "address". Its for scenarios where a load-balancer or VIP is used.
+	// +optional
+	RegistrationAddress string `json:"registrationAddress,omitempty"`
+
+	// The Rollout to use to replace control plane machines with new ones.
+	RolloutStrategy *RolloutStrategy `json:"rolloutStrategy"`
+
+	// remediationStrategy is the RemediationStrategy that controls how control plane machine remediation happens.
+	// +optional
+	RemediationStrategy *RemediationStrategy `json:"remediationStrategy,omitempty"`
 }
 
 // +kubebuilder:object:root=true

controlplane/api/v1beta2/rke2controlplanetemplate_types.go

@@ -33,7 +33,7 @@ func TestRKE2ControlPlaneTemplateValidateCreate(t *testing.T) {
 			inputTemplate: &RKE2ControlPlaneTemplate{
 				Spec: RKE2ControlPlaneTemplateSpec{
 					Template: RKE2ControlPlaneTemplateResource{
-						Spec: RKE2ControlPlaneSpec{
+						Spec: RKE2ControlPlaneTemplateResourceSpec{
 							ServerConfig: RKE2ServerConfig{
 								CNIMultusEnable: true,
 								CNI:             "",
@@ -64,7 +64,6 @@ func TestRKE2ControlPlaneTemplateValidateCreate(t *testing.T) {
 func TestRKE2ControlPlaneTemplateValidateUpdate(t *testing.T) {
 	g := NewWithT(t)
 
-	replicas := int32(3)
 	tests := []struct {
 		name        string
 		newTemplate *RKE2ControlPlaneTemplate
@@ -76,17 +75,17 @@ func TestRKE2ControlPlaneTemplateValidateUpdate(t *testing.T) {
 			newTemplate: &RKE2ControlPlaneTemplate{
 				Spec: RKE2ControlPlaneTemplateSpec{
 					Template: RKE2ControlPlaneTemplateResource{
-						Spec: RKE2ControlPlaneSpec{
-							Replicas: &replicas,
+						Spec: RKE2ControlPlaneTemplateResourceSpec{
+							RegistrationMethod: RegistrationMethodFavourInternalIPs,
 						},
 					},
 				},
 			},
 			oldTemplate: &RKE2ControlPlaneTemplate{
 				Spec: RKE2ControlPlaneTemplateSpec{
 					Template: RKE2ControlPlaneTemplateResource{
-						Spec: RKE2ControlPlaneSpec{
-							Replicas: &replicas,
+						Spec: RKE2ControlPlaneTemplateResourceSpec{
+							RegistrationMethod: RegistrationMethodFavourInternalIPs,
 						},
 					},
 				},

controlplane/api/v1beta2/rke2controlplanetemplate_webhook_test.go

@@ -2989,6 +2989,7 @@ spec:
                 type: string
             required:
             - rolloutStrategy
+            - version
             type: object
           status:
             description: RKE2ControlPlaneStatus defines the observed state of RKE2ControlPlane.

controlplane/api/v1beta2/zz_generated.deepcopy.go

@@ -2476,11 +2476,6 @@ spec:
                               If not set, a retry will happen immediately.
                             type: string
                         type: object
-                      replicas:
-                        description: Replicas is the number of replicas for the Control
-                          Plane.
-                        format: int32
-                        type: integer
                       rolloutStrategy:
                         description: The Rollout to use to replace control plane machines
                           with new ones.
@@ -3088,10 +3083,6 @@ spec:
                               type: string
                             type: array
                         type: object
-                      version:
-                        description: Version defines the desired Kubernetes version.
-                        pattern: (v\d\.\d{2}\.\d+\+rke2r\d)|^$
-                        type: string
                     required:
                     - rolloutStrategy
                     type: object