fix: nodeadm kubelet config

Author: faiq

bootstrap/eks/controllers/nodeadmconfig_controller.go

@@ -222,11 +222,15 @@ func (r *NodeadmConfigReconciler) joinWorker(ctx context.Context, cluster *clust
 	}
 	if config.Spec.Kubelet != nil {
 		nodeInput.KubeletFlags = config.Spec.Kubelet.Flags
-		nodeInput.KubeletConfig = config.Spec.Kubelet.Config
+		if config.Spec.Kubelet.Config != nil {
+			nodeInput.KubeletConfig = config.Spec.Kubelet.Config
+		}
 	}
 	if config.Spec.Containerd != nil {
 		nodeInput.ContainerdConfig = config.Spec.Containerd.Config
-		nodeInput.ContainerdBaseRuntimeSpec = config.Spec.Containerd.BaseRuntimeSpec
+		if config.Spec.Containerd.BaseRuntimeSpec != nil {
+			nodeInput.ContainerdBaseRuntimeSpec = config.Spec.Containerd.BaseRuntimeSpec
+		}
 	}
 	if config.Spec.FeatureGates != nil {
 		nodeInput.FeatureGates = config.Spec.FeatureGates
@@ -328,21 +332,21 @@ func (r *NodeadmConfigReconciler) storeBootstrapData(ctx context.Context, cluste
 	}, secret); err != nil {
 		if apierrors.IsNotFound(err) {
 			if secret, err = r.createBootstrapSecret(ctx, cluster, config, data); err != nil {
-				return errors.Wrap(err, "failed to create bootstrap data secret for EKSConfig")
+				return errors.Wrap(err, "failed to create bootstrap data secret for NodeadmConfig")
 			}
-			log.Info("created bootstrap data secret for EKSConfig", "secret", klog.KObj(secret))
+			log.Info("created bootstrap data secret for NodeadmConfig", "secret", klog.KObj(secret))
 		} else {
-			return errors.Wrap(err, "failed to get data secret for EKSConfig")
+			return errors.Wrap(err, "failed to get data secret for NodeadmConfig")
 		}
 	} else {
 		updated, err := r.updateBootstrapSecret(ctx, secret, data)
 		if err != nil {
-			return errors.Wrap(err, "failed to update data secret for EKSConfig")
+			return errors.Wrap(err, "failed to update data secret for NodeadmConfig")
 		}
 		if updated {
-			log.Info("updated bootstrap data secret for EKSConfig", "secret", klog.KObj(secret))
+			log.Info("updated bootstrap data secret for NodeadmConfig", "secret", klog.KObj(secret))
 		} else {
-			log.Trace("no change in bootstrap data secret for EKSConfig", "secret", klog.KObj(secret))
+			log.Trace("no change in bootstrap data secret for NodeadmConfig", "secret", klog.KObj(secret))
 		}
 	}
 

bootstrap/eks/internal/userdata/nodeadm.go

@@ -98,7 +98,7 @@ spec:
   kubelet:
     {{- if .KubeletConfig }}
     config: |
-{{ Indent 6 .KubeletConfigRaw }}
+{{ Indent 6 .KubeletConfig }}
     {{- end }}
     flags:
     {{- range $flag := .KubeletFlags }}
@@ -112,7 +112,7 @@ spec:
     {{- end }}
     {{- if .ContainerdBaseRuntimeSpec }}
     baseRuntimeSpec: |
-{{ Indent 6 .ContainerdBaseRuntimeSpecRaw }}
+{{ Indent 6 .ContainerdBaseRuntimeSpec}}
     {{- end }}
   {{- end }}
   {{- if .Instance }}
@@ -224,28 +224,6 @@ func (input *NodeadmInput) getCapacityTypeString() string {
 	}
 }
 
-// ContainerdBaseRuntimeSpecRaw returns the raw JSON/YAML for inclusion into templates.
-func (input *NodeadmInput) ContainerdBaseRuntimeSpecRaw() string {
-	if input.ContainerdBaseRuntimeSpec == nil {
-		return ""
-	}
-	if len(input.ContainerdBaseRuntimeSpec.Raw) == 0 {
-		return ""
-	}
-	return string(input.ContainerdBaseRuntimeSpec.Raw)
-}
-
-// KubeletConfigRaw returns the raw JSON/YAML for inclusion into templates.
-func (input *NodeadmInput) KubeletConfigRaw() string {
-	if input.KubeletConfig == nil {
-		return ""
-	}
-	if len(input.KubeletConfig.Raw) == 0 {
-		return ""
-	}
-	return string(input.KubeletConfig.Raw)
-}
-
 // validateNodeInput validates the input for nodeadm user data generation.
 func validateNodeadmInput(input *NodeadmInput) error {
 	if input.APIServerEndpoint == "" {

bootstrap/eks/internal/userdata/nodeadm_test.go

@@ -160,6 +160,28 @@ func TestNodeadmUserdata(t *testing.T) {
 					strings.Contains(output, "apiVersion: node.eks.aws/v1alpha1")
 			},
 		},
+		{
+			name: "with kubelet config",
+			args: args{
+				input: &NodeadmInput{
+					ClusterName:       "test-cluster",
+					APIServerEndpoint: "https://example.com",
+					CACert:            "test-ca-cert",
+					NodeGroupName:     "test-nodegroup",
+					KubeletConfig: `
+evictionHard:
+  memory.available: "2000Mi"
+
+					`,
+				},
+			},
+			expectErr: false,
+			verifyOutput: func(output string) bool {
+				return strings.Contains(output, "evictionHard:") &&
+					strings.Contains(output, "memory.available: \"2000Mi\"") &&
+					strings.Contains(output, "apiVersion: node.eks.aws/v1alpha1")
+			},
+		},
 		{
 			name: "with pre bootstrap commands",
 			args: args{
@@ -365,7 +387,6 @@ func TestNodeadmUserdata(t *testing.T) {
 			expectErr: false,
 			verifyOutput: func(output string) bool {
 				boundary := "//" // default boundary
-				fmt.Println(output)
 				return strings.Contains(output, fmt.Sprintf(`boundary=%q`, boundary)) &&
 					strings.Contains(output, "Content-Type: application/node.eks.aws") &&
 					strings.Contains(output, "Content-Type: text/x-shellscript") &&