fix: use prenodeadm commands name

Author: faiq

bootstrap/eks/api/v1beta2/nodeadmconfig_types.go

@@ -21,9 +21,9 @@ type NodeadmConfigSpec struct {
 	// +optional
 	FeatureGates map[Feature]bool `json:"featureGates,omitempty"`
 
-	// PreBootstrapCommands specifies extra commands to run before bootstrapping nodes.
+	// PreNodeadmCommands specifies extra commands to run before bootstrapping nodes.
 	// +optional
-	PreBootstrapCommands []string `json:"preBootstrapCommands,omitempty"`
+	PreNodeadmCommands []string `json:"PreNodeadmCommands,omitempty"`
 
 	// Files specifies extra files to be passed to user_data upon creation.
 	// +optional

bootstrap/eks/api/v1beta2/zz_generated.deepcopy.go

@@ -201,15 +201,15 @@ func (r *NodeadmConfigReconciler) joinWorker(ctx context.Context, cluster *clust
 	}
 	nodeInput := &userdata.NodeadmInput{
 		// AWSManagedControlPlane webhooks default and validate EKSClusterName
-		ClusterName:          controlPlane.Spec.EKSClusterName,
-		PreBootstrapCommands: config.Spec.PreBootstrapCommands,
-		Users:                config.Spec.Users,
-		NTP:                  config.Spec.NTP,
-		DiskSetup:            config.Spec.DiskSetup,
-		Mounts:               config.Spec.Mounts,
-		Files:                files,
-		ServiceCIDR:          serviceCIDR,
-		APIServerEndpoint:    controlPlane.Spec.ControlPlaneEndpoint.Host,
+		ClusterName:        controlPlane.Spec.EKSClusterName,
+		PreNodeadmCommands: config.Spec.PreNodeadmCommands,
+		Users:              config.Spec.Users,
+		NTP:                config.Spec.NTP,
+		DiskSetup:          config.Spec.DiskSetup,
+		Mounts:             config.Spec.Mounts,
+		Files:              files,
+		ServiceCIDR:        serviceCIDR,
+		APIServerEndpoint:  controlPlane.Spec.ControlPlaneEndpoint.Host,
 	}
 	if config.Spec.Kubelet != nil {
 		nodeInput.KubeletFlags = config.Spec.Kubelet.Flags

bootstrap/eks/controllers/nodeadmconfig_controller.go

@@ -68,7 +68,7 @@ Content-Disposition: attachment; filename="commands.sh"
 set -o errexit
 set -o pipefail
 set -o nounset
-{{- range .PreBootstrapCommands}}
+{{- range .PreNodeadmCommands}}
 {{.}}
 {{- end}}
 --{{ .Boundary }}`
@@ -144,12 +144,12 @@ type NodeadmInput struct {
 	ContainerdBaseRuntimeSpec *runtime.RawExtension
 	FeatureGates              map[eksbootstrapv1.Feature]bool
 
-	PreBootstrapCommands []string
-	Files                []eksbootstrapv1.File
-	DiskSetup            *eksbootstrapv1.DiskSetup
-	Mounts               []eksbootstrapv1.MountPoints
-	Users                []eksbootstrapv1.User
-	NTP                  *eksbootstrapv1.NTP
+	PreNodeadmCommands []string
+	Files              []eksbootstrapv1.File
+	DiskSetup          *eksbootstrapv1.DiskSetup
+	Mounts             []eksbootstrapv1.MountPoints
+	Users              []eksbootstrapv1.User
+	NTP                *eksbootstrapv1.NTP
 
 	AMIImageID        string
 	APIServerEndpoint string
@@ -193,7 +193,7 @@ func NewNodeadmUserdata(input *NodeadmInput) ([]byte, error) {
 	}
 
 	// Write shell script part if needed
-	if len(input.PreBootstrapCommands) > 0 {
+	if len(input.PreNodeadmCommands) > 0 {
 		shellScriptTemplate := template.Must(template.New("shell").Parse(shellScriptPartTemplate))
 		if err := shellScriptTemplate.Execute(&buf, input); err != nil {
 			return nil, fmt.Errorf("failed to execute shell script template: %v", err)

bootstrap/eks/internal/userdata/nodeadm.go

@@ -110,7 +110,7 @@ evictionHard:
 					ClusterName:       "test-cluster",
 					APIServerEndpoint: "https://example.com",
 					CACert:            "test-ca-cert",
-					PreBootstrapCommands: []string{
+					PreNodeadmCommands: []string{
 						"echo 'pre-bootstrap'",
 						"yum install -y htop",
 					},
@@ -238,11 +238,11 @@ evictionHard:
 			name: "boundary verification - all three parts with custom boundary",
 			args: args{
 				input: &NodeadmInput{
-					ClusterName:          "test-cluster",
-					APIServerEndpoint:    "https://example.com",
-					CACert:               "test-ca-cert",
-					Boundary:             "CUSTOMBOUNDARY123",
-					PreBootstrapCommands: []string{"echo 'pre-bootstrap'"},
+					ClusterName:        "test-cluster",
+					APIServerEndpoint:  "https://example.com",
+					CACert:             "test-ca-cert",
+					Boundary:           "CUSTOMBOUNDARY123",
+					PreNodeadmCommands: []string{"echo 'pre-bootstrap'"},
 					NTP: &eksbootstrapv1.NTP{
 						Enabled: ptr.To(true),
 						Servers: []string{"time.google.com"},
@@ -285,10 +285,10 @@ evictionHard:
 			name: "boundary verification - all 3 parts",
 			args: args{
 				input: &NodeadmInput{
-					ClusterName:          "test-cluster",
-					APIServerEndpoint:    "https://example.com",
-					CACert:               "test-ca-cert",
-					PreBootstrapCommands: []string{"echo 'test'"},
+					ClusterName:        "test-cluster",
+					APIServerEndpoint:  "https://example.com",
+					CACert:             "test-ca-cert",
+					PreNodeadmCommands: []string{"echo 'test'"},
 					NTP: &eksbootstrapv1.NTP{
 						Enabled: ptr.To(true),
 						Servers: []string{"time.google.com"},

bootstrap/eks/internal/userdata/nodeadm_test.go

@@ -39,6 +39,12 @@ 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:
@@ -227,12 +233,6 @@ spec:
                       type: string
                     type: array
                 type: object
-              preBootstrapCommands:
-                description: PreBootstrapCommands 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_nodeadmconfigs.yaml

@@ -51,6 +51,12 @@ 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:
@@ -246,12 +252,6 @@ spec:
                               type: string
                             type: array
                         type: object
-                      preBootstrapCommands:
-                        description: PreBootstrapCommands 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

@@ -135,7 +135,7 @@ var _ = ginkgo.Describe("EKS Cluster upgrade test", func() {
 				Spec: eksbootstrapv1.NodeadmConfigTemplateSpec{
 					Template: eksbootstrapv1.NodeadmConfigTemplateResource{
 						Spec: eksbootstrapv1.NodeadmConfigSpec{
-							PreBootstrapCommands: []string{
+							PreNodeadmCommands: []string{
 								"echo \"hello world\"",
 							},
 						},