Skip to content

feat: Nodeadm custom ami #8511

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

feat: Nodeadm custom ami #8511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7b7212
add custom nodeadm
garvinp-stripe Sep 19, 2025
d682d77
remove wrong file
garvinp-stripe Sep 19, 2025
f8a5ec7
add custom nodeadm family
garvinp-stripe Sep 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/apis/v1/ec2nodeclass_validation_cel_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ var _ = Describe("CEL/Validation", func() {
})
})
Context("AMIFamily", func() {
amiFamilies := []string{v1.AMIFamilyAL2, v1.AMIFamilyAL2023, v1.AMIFamilyBottlerocket, v1.AMIFamilyWindows2019, v1.AMIFamilyWindows2022, v1.AMIFamilyCustom}
amiFamilies := []string{v1.AMIFamilyAL2, v1.AMIFamilyAL2023, v1.AMIFamilyBottlerocket, v1.AMIFamilyWindows2019, v1.AMIFamilyWindows2022, v1.AMIFamilyCustom, v1.AMIFamilyCustomNodeadm}
DescribeTable("should succeed with valid families", func() []interface{} {
f := func(amiFamily string) {
// Set a custom AMI family so it's compatible with all ami family types
Expand Down
1 change: 1 addition & 0 deletions pkg/apis/v1/labels.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ var (
AMIFamilyWindows2019 = "Windows2019"
AMIFamilyWindows2022 = "Windows2022"
AMIFamilyCustom = "Custom"
AMIFamilyCustomNodeadm = "CustomNodeadm"
Windows2019 = "2019"
Windows2022 = "2022"
WindowsCore = "Core"
Expand Down
36 changes: 31 additions & 5 deletions pkg/providers/amifamily/custom.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,40 @@ import (
type Custom struct {
DefaultFamily
*Options
OutputOption OutputOption
}

// Enum for the output option
type OutputOption string

const (
OutputOptionBase64 OutputOption = "base64"
OutputOptionNodeadm OutputOption = "nodeadm"
)

// UserData returns the default userdata script for the AMI Family
func (c Custom) UserData(_ *v1.KubeletConfiguration, _ []corev1.Taint, _ map[string]string, _ *string, _ []*cloudprovider.InstanceType, customUserData *string, _ *v1.InstanceStorePolicy) bootstrap.Bootstrapper {
return bootstrap.Custom{
Options: bootstrap.Options{
CustomUserData: customUserData,
},
func (c Custom) UserData(kubeletConfig *v1.KubeletConfiguration, taints []corev1.Taint, labels map[string]string, caBundle *string, _ []*cloudprovider.InstanceType, customUserData *string, instanceStorePolicy *v1.InstanceStorePolicy) bootstrap.Bootstrapper {
switch c.OutputOption {
case OutputOptionBase64:
return bootstrap.Custom{
Options: bootstrap.Options{
CustomUserData: customUserData,
},
}
case OutputOptionNodeadm:
return bootstrap.Nodeadm{
Options: bootstrap.Options{
ClusterName: c.ClusterName,
ClusterEndpoint: c.ClusterEndpoint,
ClusterCIDR: c.ClusterCIDR,
KubeletConfig: kubeletConfig,
Taints: taints,
Labels: labels,
CABundle: caBundle,
CustomUserData: customUserData,
InstanceStorePolicy: instanceStorePolicy,
},
}
}
}

Expand Down
4 changes: 3 additions & 1 deletion pkg/providers/amifamily/resolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,9 @@ func GetAMIFamily(amiFamily string, options *Options) AMIFamily {
case v1.AMIFamilyWindows2022:
return &Windows{Options: options, Version: v1.Windows2022, Build: v1.Windows2022Build}
case v1.AMIFamilyCustom:
return &Custom{Options: options}
return &Custom{Options: options, OutputOption: OutputOptionBase64}
case v1.AMIFamilyCustomNodeadm:
return &Custom{Options: options, OutputOption: OutputOptionNodeadm}
case v1.AMIFamilyAL2023:
return &AL2023{Options: options}
default:
Expand Down