fix: we don't need to set eks specific labels

Author: faiq

bootstrap/eks/controllers/nodeadmconfig_controller.go

@@ -21,11 +21,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 
-	infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	eksbootstrapv1 "sigs.k8s.io/cluster-api-provider-aws/v2/bootstrap/eks/api/v1beta2"
 	"sigs.k8s.io/cluster-api-provider-aws/v2/bootstrap/eks/internal/userdata"
 	ekscontrolplanev1 "sigs.k8s.io/cluster-api-provider-aws/v2/controlplane/eks/api/v1beta2"
-	expinfrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/exp/api/v1beta2"
 	"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/logger"
 	"sigs.k8s.io/cluster-api-provider-aws/v2/util/paused"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
@@ -213,7 +211,6 @@ func (r *NodeadmConfigReconciler) joinWorker(ctx context.Context, cluster *clust
 		Files:                files,
 		ServiceCIDR:          serviceCIDR,
 		APIServerEndpoint:    controlPlane.Spec.ControlPlaneEndpoint.Host,
-		NodeGroupName:        config.Name,
 	}
 	if config.Spec.Kubelet != nil {
 		nodeInput.KubeletFlags = config.Spec.Kubelet.Flags
@@ -247,44 +244,6 @@ func (r *NodeadmConfigReconciler) joinWorker(ctx context.Context, cluster *clust
 	}
 	nodeInput.CACert = ca
 
-	// Get AMI ID and capacity type from owner resource
-	switch configOwner.GetKind() {
-	case "AWSManagedMachinePool":
-		amp := &expinfrav1.AWSManagedMachinePool{}
-		if err := r.Get(ctx, client.ObjectKey{Namespace: config.Namespace, Name: configOwner.GetName()}, amp); err == nil {
-			log.Info("Found AWSManagedMachinePool", "name", amp.Name, "launchTemplate", amp.Spec.AWSLaunchTemplate != nil)
-			if amp.Spec.AWSLaunchTemplate != nil && amp.Spec.AWSLaunchTemplate.AMI.ID != nil {
-				nodeInput.AMIImageID = *amp.Spec.AWSLaunchTemplate.AMI.ID
-				log.Info("Set AMI ID from AWSManagedMachinePool launch template", "amiID", nodeInput.AMIImageID)
-			} else {
-				log.Info("No AMI ID found in AWSManagedMachinePool launch template")
-			}
-			if amp.Spec.CapacityType != nil {
-				nodeInput.CapacityType = amp.Spec.CapacityType
-				log.Info("Set capacity type from AWSManagedMachinePool", "capacityType", *amp.Spec.CapacityType)
-			} else {
-				log.Info("No capacity type found in AWSManagedMachinePool")
-			}
-		} else {
-			log.Info("Failed to get AWSManagedMachinePool", "error", err)
-		}
-	case "AWSMachineTemplate":
-		awsmt := &infrav1.AWSMachineTemplate{}
-		var awsMTGetErr error
-		if awsMTGetErr = r.Get(ctx, client.ObjectKey{Namespace: config.Namespace, Name: configOwner.GetName()}, awsmt); awsMTGetErr == nil {
-			log.Info("Found AWSMachineTemplate", "name", awsmt.Name)
-			if awsmt.Spec.Template.Spec.AMI.ID != nil {
-				nodeInput.AMIImageID = *awsmt.Spec.Template.Spec.AMI.ID
-				log.Info("Set AMI ID from AWSMachineTemplate", "amiID", nodeInput.AMIImageID)
-			} else {
-				log.Info("No AMI ID found in AWSMachineTemplate")
-			}
-		}
-		log.Info("Failed to get AWSMachineTemplate", "error", awsMTGetErr)
-	default:
-		log.Info("Config owner kind not recognized for AMI extraction", "kind", configOwner.GetKind())
-	}
-
 	log.Info("Generating nodeadm userdata",
 		"cluster", controlPlane.Spec.EKSClusterName,
 		"endpoint", nodeInput.APIServerEndpoint)

bootstrap/eks/internal/userdata/nodeadm.go

@@ -19,14 +19,12 @@ package userdata
 import (
 	"bytes"
 	"fmt"
-	"strings"
 	"text/template"
 
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/klog/v2"
 
 	eksbootstrapv1 "sigs.k8s.io/cluster-api-provider-aws/v2/bootstrap/eks/api/v1beta2"
-	"sigs.k8s.io/cluster-api-provider-aws/v2/exp/api/v1beta2"
 )
 
 const (
@@ -95,14 +93,16 @@ spec:
     {{$k}}: {{$v}}
   {{- end }}
   {{- end }}
+{{- if .KubeletConfig }}
   kubelet:
-    {{- if .KubeletConfig }}
     config:
 {{ Indent 6 (toYaml .KubeletConfig) }}
     {{- end }}
+    {{- if .KubeletFlags }}
     flags:
-    {{- range $flag := .KubeletFlags }}
-    - "{{$flag}}"
+      {{- range $flag := .KubeletFlags }}
+       - "{{$flag}}"
+      {{- end }}
     {{- end }}
   {{- if or .ContainerdConfig .ContainerdBaseRuntimeSpec }}
   containerd:
@@ -133,10 +133,6 @@ spec:
   {{- end }}
 
 --{{.Boundary}}`
-
-	nodeLabelImage        = "eks.amazonaws.com/nodegroup-image"
-	nodeLabelNodeGroup    = "eks.amazonaws.com/nodegroup"
-	nodeLabelCapacityType = "eks.amazonaws.com/capacityType"
 )
 
 // NodeadmInput contains all the information required to generate user data for a node.
@@ -160,68 +156,8 @@ type NodeadmInput struct {
 	APIServerEndpoint string
 	Boundary          string
 	CACert            string
-	CapacityType      *v1beta2.ManagedMachinePoolCapacityType
 	ServiceCIDR       string // Service CIDR range for the cluster
 	ClusterDNS        string
-	NodeGroupName     string
-	NodeLabels        string // Not exposed in CRD, computed from user input
-}
-
-func (input *NodeadmInput) setKubeletFlags() error {
-	var nodeLabels string
-	newFlags := []string{}
-	for _, flag := range input.KubeletFlags {
-		if strings.HasPrefix(flag, "--node-labels=") {
-			nodeLabels = strings.TrimPrefix(flag, "--node-labels=")
-		} else {
-			newFlags = append(newFlags, flag)
-		}
-	}
-	labelsMap := make(map[string]string)
-	if nodeLabels != "" {
-		labels := strings.Split(nodeLabels, ",")
-		for _, label := range labels {
-			labelSplit := strings.Split(label, "=")
-			if len(labelSplit) != 2 {
-				return fmt.Errorf("invalid label: %s", label)
-			}
-			labelKey := labelSplit[0]
-			labelValue := labelSplit[1]
-			labelsMap[labelKey] = labelValue
-		}
-	}
-	if _, ok := labelsMap[nodeLabelImage]; !ok && input.AMIImageID != "" {
-		labelsMap[nodeLabelImage] = input.AMIImageID
-	}
-	if _, ok := labelsMap[nodeLabelNodeGroup]; !ok && input.NodeGroupName != "" {
-		labelsMap[nodeLabelNodeGroup] = input.NodeGroupName
-	}
-	if _, ok := labelsMap[nodeLabelCapacityType]; !ok {
-		labelsMap[nodeLabelCapacityType] = input.getCapacityTypeString()
-	}
-	stringBuilder := strings.Builder{}
-	for key, value := range labelsMap {
-		stringBuilder.WriteString(fmt.Sprintf("%s=%s,", key, value))
-	}
-	newLabels := stringBuilder.String()[:len(stringBuilder.String())-1] // remove the last comma
-	newFlags = append(newFlags, fmt.Sprintf("--node-labels=%s", newLabels))
-	input.KubeletFlags = newFlags
-	return nil
-}
-
-// getCapacityTypeString returns the string representation of the capacity type.
-func (input *NodeadmInput) getCapacityTypeString() string {
-	if input.CapacityType == nil {
-		return "ON_DEMAND"
-	}
-	switch *input.CapacityType {
-	case v1beta2.ManagedMachinePoolCapacityTypeSpot:
-		return "SPOT"
-	case v1beta2.ManagedMachinePoolCapacityTypeOnDemand:
-		return "ON_DEMAND"
-	default:
-		return strings.ToUpper(string(*input.CapacityType))
-	}
 }
 
 // validateNodeInput validates the input for nodeadm user data generation.
@@ -235,18 +171,11 @@ func validateNodeadmInput(input *NodeadmInput) error {
 	if input.ClusterName == "" {
 		return fmt.Errorf("cluster name is required for nodeadm")
 	}
-	if input.NodeGroupName == "" {
-		return fmt.Errorf("node group name is required for nodeadm")
-	}
 	if input.Boundary == "" {
 		input.Boundary = boundary
 	}
-	err := input.setKubeletFlags()
-	if err != nil {
-		return err
-	}
 
-	klog.V(2).Infof("Nodeadm Userdata Generation - node-labels: %s", input.NodeLabels)
+	klog.V(2).Infof("Nodeadm Userdata Generation %v", input)
 
 	return nil
 }