Skip instance type support validation for custom AMI ID (#8303)

Author: ndbaker1

pkg/apis/eksctl.io/v1alpha5/gpu_validation_test.go

@@ -249,6 +249,23 @@ var _ = Describe("GPU instance support", func() {
 		}),
 	)
 
+	Describe("No GPU instance type support validation for custom AMI", func() {
+		amiFamily := api.NodeImageFamilyAmazonLinux2023
+		instanceType := "g5g.2xlarge"
+
+		ngFail := api.NewNodeGroup()
+		ngFail.AMIFamily = amiFamily
+		ngFail.InstanceType = instanceType
+
+		ngPass := api.NewNodeGroup()
+		ngPass.AMIFamily = amiFamily
+		ngPass.InstanceType = instanceType
+		ngPass.AMI = "ami-xxxx"
+
+		Expect(api.ValidateNodeGroup(0, ngFail, api.NewClusterConfig())).To(HaveOccurred())
+		Expect(api.ValidateNodeGroup(0, ngPass, api.NewClusterConfig())).NotTo(HaveOccurred())
+	})
+
 	DescribeTable("ARM-based GPU instance type support", func(amiFamily string, expectErr bool) {
 		ng := api.NewNodeGroup()
 		ng.InstanceType = "g5g.2xlarge"
@@ -261,6 +278,7 @@ var _ = Describe("GPU instance support", func() {
 		}
 	},
 		Entry("AmazonLinux2", api.NodeImageFamilyAmazonLinux2, true),
+		Entry("AmazonLinux2023", api.NodeImageFamilyAmazonLinux2023, true),
 		Entry("Ubuntu2004", api.NodeImageFamilyUbuntu2004, true),
 		Entry("Ubuntu1804", api.NodeImageFamilyUbuntu1804, true),
 		Entry("Windows2019Full", api.NodeImageFamilyWindowsServer2019FullContainer, true),

pkg/apis/eksctl.io/v1alpha5/validation.go

@@ -973,8 +973,8 @@ func ValidateNodeGroup(i int, ng *NodeGroup, cfg *ClusterConfig) error {
 		return err
 	}
 
-	if instanceutils.IsARMGPUInstanceType(SelectInstanceType(ng)) && ng.AMIFamily != NodeImageFamilyBottlerocket {
-		return fmt.Errorf("ARM GPU instance types are not supported for unmanaged nodegroups with AMIFamily %s", ng.AMIFamily)
+	if err := validateInstanceTypeSupport(ng); err != nil {
+		return err
 	}
 
 	if err := validateInstancesDistribution(ng); err != nil {
@@ -1045,6 +1045,23 @@ func ValidateNodeGroup(i int, ng *NodeGroup, cfg *ClusterConfig) error {
 	return nil
 }
 
+// validateInstanceTypeSupport checks if the provided instance types are
+// supported by the AMIFamily. If a custom AMI is provided then it will skip the
+// validation, as it could be a derivative of a supported family type.
+func validateInstanceTypeSupport(ng *NodeGroup) error {
+	if IsAMI(ng.AMI) {
+		return nil
+	}
+	if instanceutils.IsARMGPUInstanceType(SelectInstanceType(ng)) {
+		switch ng.AMIFamily {
+		case NodeImageFamilyBottlerocket:
+		default:
+			return fmt.Errorf("ARM GPU instance types are not supported for unmanaged nodegroups with AMIFamily %s", ng.AMIFamily)
+		}
+	}
+	return nil
+}
+
 func validateOutpostARN(val string) error {
 	parsed, err := arn.Parse(val)
 	if err != nil {

pkg/nodebootstrap/managed_al2.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"io"
 	"mime/multipart"
-	"strings"
 
 	nodeadm "github.com/awslabs/amazon-eks-ami/nodeadm/api/v1alpha1"
 	"sigs.k8s.io/yaml"
@@ -32,7 +31,7 @@ func NewManagedAL2Bootstrapper(ng *api.ManagedNodeGroup) *ManagedAL2 {
 func (m *ManagedAL2) UserData() (string, error) {
 	ng := m.ng
 
-	if strings.HasPrefix(ng.AMI, "ami-") {
+	if api.IsAMI(ng.AMI) {
 		return makeCustomAMIUserData(ng.NodeGroupBase, m.UserDataMimeBoundary)
 	}