Merge pull request #418 from Danil-Grigorev/reg-method-default

Make control plane endpoint default registration method

Author: Danil-Grigorev

controlplane/api/v1beta1/rke2controlplane_types.go

@@ -77,9 +77,9 @@ type RKE2ControlPlaneSpec struct {
 	NodeDrainTimeout *metav1.Duration `json:"nodeDrainTimeout,omitempty"`
 
 	// 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
+	// +kubebuilder:validation:Enum=internal-first;internal-only-ips;external-only-ips;address;control-plane-endpoint;""
 	// +optional
-	RegistrationMethod RegistrationMethod `json:"registrationMethod"`
+	RegistrationMethod RegistrationMethod `json:"registrationMethod,omitempty"`
 
 	// 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.

controlplane/api/v1beta1/rke2controlplane_webhook.go

@@ -85,9 +85,10 @@ func (r *RKE2ControlPlane) ValidateUpdate(old runtime.Object) (admission.Warning
 	allErrs = append(allErrs, bootstrapv1.ValidateRKE2ConfigSpec(r.Name, &r.Spec.RKE2ConfigSpec)...)
 	allErrs = append(allErrs, r.validateCNI()...)
 
-	if r.Spec.RegistrationMethod != oldControlplane.Spec.RegistrationMethod {
+	oldSet := oldControlplane.Spec.RegistrationMethod != ""
+	if oldSet && r.Spec.RegistrationMethod != oldControlplane.Spec.RegistrationMethod {
 		allErrs = append(allErrs,
-			field.Invalid(field.NewPath("spec", "registrationMethod"), r.Spec.RegistrationMethod, "field is immutable"),
+			field.Invalid(field.NewPath("spec", "registrationMethod"), r.Spec.RegistrationMethod, "field value is immutable once set"),
 		)
 	}
 

controlplane/api/v1beta1/rke2controlplanetemplate_webhook.go

@@ -81,9 +81,10 @@ func (r *RKE2ControlPlaneTemplate) ValidateUpdate(old runtime.Object) (admission
 	allErrs = append(allErrs, bootstrapv1.ValidateRKE2ConfigSpec(r.Name, &r.Spec.Template.Spec.RKE2ConfigSpec)...)
 	allErrs = append(allErrs, r.validateCNI()...)
 
-	if r.Spec.Template.Spec.RegistrationMethod != oldControlplane.Spec.Template.Spec.RegistrationMethod {
+	oldSet := oldControlplane.Spec.Template.Spec.RegistrationMethod != ""
+	if oldSet && r.Spec.Template.Spec.RegistrationMethod != oldControlplane.Spec.Template.Spec.RegistrationMethod {
 		allErrs = append(allErrs,
-			field.Invalid(field.NewPath("spec", "registrationMethod"), r.Spec.Template.Spec.RegistrationMethod, "field is immutable"),
+			field.Invalid(field.NewPath("spec", "registrationMethod"), r.Spec.Template.Spec.RegistrationMethod, "field value is immutable once set"),
 		)
 	}
 

controlplane/config/crd/bases/controlplane.cluster.x-k8s.io_rke2controlplanes.yaml

@@ -1949,6 +1949,7 @@ spec:
                 - external-only-ips
                 - address
                 - control-plane-endpoint
+                - ""
                 type: string
               replicas:
                 description: Replicas is the number of replicas for the Control Plane.

controlplane/config/crd/bases/controlplane.cluster.x-k8s.io_rke2controlplanetemplates.yaml

@@ -782,6 +782,7 @@ spec:
                         - external-only-ips
                         - address
                         - control-plane-endpoint
+                        - ""
                         type: string
                       replicas:
                         description: Replicas is the number of replicas for the Control

pkg/registration/registration.go

@@ -43,7 +43,7 @@ func NewRegistrationMethod(method string) (GetRegistrationAddresses, error) {
 		return registrationMethodWithFilter(filterExternalOnly), nil
 	case "address":
 		return registrationMethodAddress, nil
-	case "control-plane-endpoint":
+	case "control-plane-endpoint", "":
 		return registrationMethodControlPlaneEndpoint, nil
 	default:
 		return nil, fmt.Errorf("unsupported registration method: %s", method)

pkg/registration/registration_test.go

@@ -53,6 +53,10 @@ func TestNewRegistrationMethod(t *testing.T) {
 			name:        "control-plane-endpoint",
 			expectError: false,
 		},
+		{
+			name:        "",
+			expectError: false,
+		},
 		{
 			name:        "unknownmethod",
 			expectError: true,

samples/aws/cluster-template.yaml

@@ -136,7 +136,6 @@ spec:
       backupConfig:
         retention: "10"
         scheduleCron: "*/15 * * * *"
-  registrationMethod: control-plane-endpoint
   rolloutStrategy:
     type: "RollingUpdate"
     rollingUpdate:

samples/docker/clusterclass/clusterclass-quick-start.yaml

@@ -159,7 +159,6 @@ spec:
         disableComponents:
           kubernetesComponents: [ "cloudController"]
       nodeDrainTimeout: 2m
-      registrationMethod: "control-plane-endpoint"
       rolloutStrategy:
         type: "RollingUpdate"
         rollingUpdate:

test/e2e/config/e2e_conf.yaml

@@ -44,6 +44,23 @@ providers:
           new: "--leader-elect=false"
         - old: --metrics-addr=127.0.0.1:8080
           new: --metrics-addr=:8080
+  - name: docker-updated
+    type: InfrastructureProvider
+    versions:
+    - name: "v1.7.2"
+      value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.2/infrastructure-components-development.yaml"
+      type: "url"
+      contract: v1beta1
+      files:
+        - sourcePath: "../data/infrastructure/cluster-template-docker-updated.yaml"
+        - sourcePath: "../data/shared/v1beta1/metadata.yaml"
+      replacements:
+        - old: "imagePullPolicy: Always"
+          new: "imagePullPolicy: IfNotPresent"
+        - old: "--leader-elect"
+          new: "--leader-elect=false"
+        - old: --metrics-addr=127.0.0.1:8080
+          new: --metrics-addr=:8080
   - name: rke2-control-plane
     type: ControlPlaneProvider
     versions: