Merge pull request kubernetes-sigs#5700 from nutanix-cloud-native/faiq/nodeadm-upstream

✨  Implement nodeadm bootstrapping type

Author: k8s-ci-robot

.golangci.yml

@@ -323,6 +323,16 @@ linters:
       - linters:
           - goconst
         path: (.+)_test\.go
+      - linters:
+          - staticcheck
+        text: 'SA1019: "sigs.k8s.io/cluster-api/(.*)" is deprecated: This package is deprecated and is going to be removed when support for v1beta1 will be dropped.'
+      - linters:
+          - staticcheck
+        text: "s.scope.ControlPlaneLoadBalancer is deprecated"
+      - linters:
+          - staticcheck
+        path: bootstrap/eks/
+        text: 'SA1019: (.*)EKSConfig is deprecated'
     paths:
       - third_party$
       - builtin$

Makefile

@@ -451,7 +451,7 @@ test-e2e: $(KIND) $(SSM_PLUGIN) $(KUSTOMIZE) generate-test-flavors e2e-image ##
 
 .PHONY: test-e2e-eks ## Run EKS e2e tests using clusterctl
 test-e2e-eks: generate-test-flavors $(KIND) $(SSM_PLUGIN) $(KUSTOMIZE) e2e-image ## Run eks e2e tests
-	time go run github.com/onsi/ginkgo/v2/ginkgo -tags=e2e $(GINKGO_ARGS) ./test/e2e/suites/managed/... -- -config-path="$(E2E_EKS_CONF_PATH)" --source-template="$(EKS_SOURCE_TEMPLATE)" $(E2E_ARGS) $(EKS_E2E_ARGS)
+	time go run github.com/onsi/ginkgo/v2/ginkgo -tags=e2e $(GINKGO_ARGS) -nodes 2 ./test/e2e/suites/managed/... -- -config-path="$(E2E_EKS_CONF_PATH)" --source-template="$(EKS_SOURCE_TEMPLATE)" $(E2E_ARGS) $(EKS_E2E_ARGS)
 
 CONFORMANCE_E2E_ARGS ?= -kubetest.config-file=$(KUBETEST_CONF_PATH)
 CONFORMANCE_E2E_ARGS += $(E2E_ARGS)

bootstrap/eks/PROJECT

@@ -15,4 +15,4 @@ resources:
 - group: bootstrap
   kind: EKSConfigTemplate
   version: v1beta2
-version: "2"
+version: "3"

bootstrap/eks/api/v1beta2/eksconfig_types.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2022 The Kubernetes Authors.
+Copyright 2026 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -110,203 +110,6 @@ type EKSConfigStatus struct {
 	Conditions clusterv1.Conditions `json:"conditions,omitempty"`
 }
 
-// Encoding specifies the cloud-init file encoding.
-// +kubebuilder:validation:Enum=base64;gzip;gzip+base64
-type Encoding string
-
-const (
-	// Base64 implies the contents of the file are encoded as base64.
-	Base64 Encoding = "base64"
-	// Gzip implies the contents of the file are encoded with gzip.
-	Gzip Encoding = "gzip"
-	// GzipBase64 implies the contents of the file are first base64 encoded and then gzip encoded.
-	GzipBase64 Encoding = "gzip+base64"
-)
-
-// File defines the input for generating write_files in cloud-init.
-type File struct {
-	// Path specifies the full path on disk where to store the file.
-	Path string `json:"path"`
-
-	// Owner specifies the ownership of the file, e.g. "root:root".
-	// +optional
-	Owner string `json:"owner,omitempty"`
-
-	// Permissions specifies the permissions to assign to the file, e.g. "0640".
-	// +optional
-	Permissions string `json:"permissions,omitempty"`
-
-	// Encoding specifies the encoding of the file contents.
-	// +optional
-	Encoding Encoding `json:"encoding,omitempty"`
-
-	// Append specifies whether to append Content to existing file if Path exists.
-	// +optional
-	Append bool `json:"append,omitempty"`
-
-	// Content is the actual content of the file.
-	// +optional
-	Content string `json:"content,omitempty"`
-
-	// ContentFrom is a referenced source of content to populate the file.
-	// +optional
-	ContentFrom *FileSource `json:"contentFrom,omitempty"`
-}
-
-// FileSource is a union of all possible external source types for file data.
-// Only one field may be populated in any given instance. Developers adding new
-// sources of data for target systems should add them here.
-type FileSource struct {
-	// Secret represents a secret that should populate this file.
-	Secret SecretFileSource `json:"secret"`
-}
-
-// SecretFileSource adapts a Secret into a FileSource.
-//
-// The contents of the target Secret's Data field will be presented
-// as files using the keys in the Data field as the file names.
-type SecretFileSource struct {
-	// Name of the secret in the KubeadmBootstrapConfig's namespace to use.
-	Name string `json:"name"`
-
-	// Key is the key in the secret's data map for this value.
-	Key string `json:"key"`
-}
-
-// PasswdSource is a union of all possible external source types for passwd data.
-// Only one field may be populated in any given instance. Developers adding new
-// sources of data for target systems should add them here.
-type PasswdSource struct {
-	// Secret represents a secret that should populate this password.
-	Secret SecretPasswdSource `json:"secret"`
-}
-
-// SecretPasswdSource adapts a Secret into a PasswdSource.
-//
-// The contents of the target Secret's Data field will be presented
-// as passwd using the keys in the Data field as the file names.
-type SecretPasswdSource struct {
-	// Name of the secret in the KubeadmBootstrapConfig's namespace to use.
-	Name string `json:"name"`
-
-	// Key is the key in the secret's data map for this value.
-	Key string `json:"key"`
-}
-
-// User defines the input for a generated user in cloud-init.
-type User struct {
-	// Name specifies the username
-	Name string `json:"name"`
-
-	// Gecos specifies the gecos to use for the user
-	// +optional
-	Gecos *string `json:"gecos,omitempty"`
-
-	// Groups specifies the additional groups for the user
-	// +optional
-	Groups *string `json:"groups,omitempty"`
-
-	// HomeDir specifies the home directory to use for the user
-	// +optional
-	HomeDir *string `json:"homeDir,omitempty"`
-
-	// Inactive specifies whether to mark the user as inactive
-	// +optional
-	Inactive *bool `json:"inactive,omitempty"`
-
-	// Shell specifies the user's shell
-	// +optional
-	Shell *string `json:"shell,omitempty"`
-
-	// Passwd specifies a hashed password for the user
-	// +optional
-	Passwd *string `json:"passwd,omitempty"`
-
-	// PasswdFrom is a referenced source of passwd to populate the passwd.
-	// +optional
-	PasswdFrom *PasswdSource `json:"passwdFrom,omitempty"`
-
-	// PrimaryGroup specifies the primary group for the user
-	// +optional
-	PrimaryGroup *string `json:"primaryGroup,omitempty"`
-
-	// LockPassword specifies if password login should be disabled
-	// +optional
-	LockPassword *bool `json:"lockPassword,omitempty"`
-
-	// Sudo specifies a sudo role for the user
-	// +optional
-	Sudo *string `json:"sudo,omitempty"`
-
-	// SSHAuthorizedKeys specifies a list of ssh authorized keys for the user
-	// +optional
-	SSHAuthorizedKeys []string `json:"sshAuthorizedKeys,omitempty"`
-}
-
-// NTP defines input for generated ntp in cloud-init.
-type NTP struct {
-	// Servers specifies which NTP servers to use
-	// +optional
-	Servers []string `json:"servers,omitempty"`
-
-	// Enabled specifies whether NTP should be enabled
-	// +optional
-	Enabled *bool `json:"enabled,omitempty"`
-}
-
-// DiskSetup defines input for generated disk_setup and fs_setup in cloud-init.
-type DiskSetup struct {
-	// Partitions specifies the list of the partitions to setup.
-	// +optional
-	Partitions []Partition `json:"partitions,omitempty"`
-
-	// Filesystems specifies the list of file systems to setup.
-	// +optional
-	Filesystems []Filesystem `json:"filesystems,omitempty"`
-}
-
-// Partition defines how to create and layout a partition.
-type Partition struct {
-	// Device is the name of the device.
-	Device string `json:"device"`
-	// Layout specifies the device layout.
-	// If it is true, a single partition will be created for the entire device.
-	// When layout is false, it means don't partition or ignore existing partitioning.
-	Layout bool `json:"layout"`
-	// Overwrite describes whether to skip checks and create the partition if a partition or filesystem is found on the device.
-	// Use with caution. Default is 'false'.
-	// +optional
-	Overwrite *bool `json:"overwrite,omitempty"`
-	// TableType specifies the tupe of partition table. The following are supported:
-	// 'mbr': default and setups a MS-DOS partition table
-	// 'gpt': setups a GPT partition table
-	// +optional
-	TableType *string `json:"tableType,omitempty"`
-}
-
-// Filesystem defines the file systems to be created.
-type Filesystem struct {
-	// Device specifies the device name
-	Device string `json:"device"`
-	// Filesystem specifies the file system type.
-	Filesystem string `json:"filesystem"`
-	// Label specifies the file system label to be used. If set to None, no label is used.
-	Label string `json:"label"`
-	// Partition specifies the partition to use. The valid options are: "auto|any", "auto", "any", "none", and <NUM>, where NUM is the actual partition number.
-	// +optional
-	Partition *string `json:"partition,omitempty"`
-	// Overwrite defines whether or not to overwrite any existing filesystem.
-	// If true, any pre-existing file system will be destroyed. Use with Caution.
-	// +optional
-	Overwrite *bool `json:"overwrite,omitempty"`
-	// ExtraOpts defined extra options to add to the command for creating the file system.
-	// +optional
-	ExtraOpts []string `json:"extraOpts,omitempty"`
-}
-
-// MountPoints defines input for generated mounts in cloud-init.
-type MountPoints []string
-
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:path=eksconfigs,scope=Namespaced,categories=cluster-api,shortName=eksc
 // +kubebuilder:storageversion
@@ -315,6 +118,10 @@ type MountPoints []string
 // +kubebuilder:printcolumn:name="DataSecretName",type="string",JSONPath=".status.dataSecretName",description="Name of Secret containing bootstrap data"
 
 // EKSConfig is the schema for the Amazon EKS Machine Bootstrap Configuration API.
+//
+// Deprecated: EKSConfig is deprecated and will be removed in a future release.
+// Amazon Linux 2 (AL2) reaches end-of-life in June 2026 see: https://aws.amazon.com/amazon-linux-2/faqs/
+// Please use NodeadmConfig with Amazon Linux 2023 (AL2023) instead.
 type EKSConfig struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`