fix: allows nodeadm template spec to be nullable

Author: faiq

bootstrap/eks/api/v1beta2/nodeadmconfigtemplate_type.go

@@ -27,6 +27,11 @@ type NodeadmConfigTemplateSpec struct {
 
 // NodeadmConfigTemplateResource defines the Template structure.
 type NodeadmConfigTemplateResource struct {
+	// Spec represents the NodeadmConfig each object created from the template will become.
+	// We are setting nullable to avoid this issue:
+	// https://github.com/kubernetes/kubernetes/issues/117447#issuecomment-2127733969
+	// where we cannot remove all fields with an SSA patch if they were previously set.
+	// +nullable
 	Spec NodeadmConfigSpec `json:"spec,omitempty"`
 }
 

bootstrap/eks/controllers/nodeadmconfig_controller.go

@@ -209,7 +209,7 @@ func (r *NodeadmConfigReconciler) joinWorker(ctx context.Context, cluster *clust
 		Mounts:             config.Spec.Mounts,
 		Files:              files,
 		ServiceCIDR:        serviceCIDR,
-		APIServerEndpoint:  controlPlane.Spec.ControlPlaneEndpoint.Host,
+		APIServerEndpoint:  cluster.Spec.ControlPlaneEndpoint.Host,
 	}
 	if config.Spec.Kubelet != nil {
 		nodeInput.KubeletFlags = config.Spec.Kubelet.Flags

bootstrap/eks/controllers/nodeadmconfig_controller_reconciler_test.go

@@ -39,6 +39,7 @@ func TestNodeadmConfigReconciler_CreateSecret(t *testing.T) {
 	endpoint := clusterv1.APIEndpoint{Host: "https://9.9.9.9", Port: 6443}
 	amcp.Spec.ControlPlaneEndpoint = endpoint
 	cluster := newCluster(amcp.Name)
+	cluster.Spec.ControlPlaneEndpoint = endpoint
 	newStatus := cluster.Status
 	amcpStatus := amcp.Status
 	g.Expect(testEnv.Client.Create(ctx, amcp)).To(Succeed())
@@ -77,6 +78,7 @@ func TestNodeadmConfigReconciler_UpdateSecret_ForMachinePool(t *testing.T) {
 	endpoint := clusterv1.APIEndpoint{Host: "https://9.9.9.9", Port: 6443}
 	amcp.Spec.ControlPlaneEndpoint = endpoint
 	cluster := newCluster(amcp.Name)
+	cluster.Spec.ControlPlaneEndpoint = endpoint
 	newStatus := cluster.Status
 	amcpStatus := amcp.Status
 	g.Expect(testEnv.Client.Create(ctx, amcp)).To(Succeed())
@@ -137,6 +139,7 @@ func TestNodeadmConfigReconciler_ResolvesSecretFileReference(t *testing.T) {
 	endpoint := clusterv1.APIEndpoint{Host: "https://9.9.9.9", Port: 6443}
 	amcp.Spec.ControlPlaneEndpoint = endpoint
 	cluster := newCluster(amcp.Name)
+	cluster.Spec.ControlPlaneEndpoint = endpoint
 	newStatus := cluster.Status
 	amcpStatus := amcp.Status
 	g.Expect(testEnv.Client.Create(ctx, amcp)).To(Succeed())

config/crd/bases/bootstrap.cluster.x-k8s.io_nodeadmconfigs.yaml

@@ -39,12 +39,6 @@ spec:
           spec:
             description: NodeadmConfigSpec defines the desired state of NodeadmConfig.
             properties:
-              PreNodeadmCommands:
-                description: PreNodeadmCommands specifies extra commands to run before
-                  bootstrapping nodes.
-                items:
-                  type: string
-                type: array
               containerd:
                 description: Containerd contains options for containerd.
                 properties:
@@ -233,6 +227,12 @@ spec:
                       type: string
                     type: array
                 type: object
+              preNodeadmCommands:
+                description: PreNodeadmCommands specifies extra commands to run before
+                  bootstrapping nodes.
+                items:
+                  type: string
+                type: array
               users:
                 description: Users specifies extra users to add.
                 items:

config/crd/bases/bootstrap.cluster.x-k8s.io_nodeadmconfigtemplates.yaml

@@ -49,14 +49,13 @@ spec:
                 description: NodeadmConfigTemplateResource defines the Template structure.
                 properties:
                   spec:
-                    description: NodeadmConfigSpec defines the desired state of NodeadmConfig.
+                    description: |-
+                      Spec represents the NodeadmConfig each object created from the template will become.
+                      We are setting nullable to avoid this issue:
+                      https://github.com/kubernetes/kubernetes/issues/117447#issuecomment-2127733969
+                      where we cannot remove all fields with an SSA patch if they were previously set.
+                    nullable: true
                     properties:
-                      PreNodeadmCommands:
-                        description: PreNodeadmCommands specifies extra commands to
-                          run before bootstrapping nodes.
-                        items:
-                          type: string
-                        type: array
                       containerd:
                         description: Containerd contains options for containerd.
                         properties:
@@ -252,6 +251,12 @@ spec:
                               type: string
                             type: array
                         type: object
+                      preNodeadmCommands:
+                        description: PreNodeadmCommands specifies extra commands to
+                          run before bootstrapping nodes.
+                        items:
+                          type: string
+                        type: array
                       users:
                         description: Users specifies extra users to add.
                         items: