chore: Add error for AL2 with K8s 1.33+ (#8151)

Co-authored-by: Jason Deal <dealj@umich.edu>

Author: rayanelahmadi

pkg/controllers/nodeclass/ami.go

@@ -47,6 +47,10 @@ func NewAMIReconciler(provider amifamily.Provider) *AMI {
 func (a *AMI) Reconcile(ctx context.Context, nodeClass *v1.EC2NodeClass) (reconcile.Result, error) {
 	amis, err := a.amiProvider.List(ctx, nodeClass)
 	if err != nil {
+		if amifamily.IsAl2DeprecationError(err) {
+			nodeClass.StatusConditions().SetFalse(v1.ConditionTypeAMIsReady, "UnsupportedAlias", err.Error())
+			return reconcile.Result{}, reconcile.TerminalError(fmt.Errorf("getting amis, %w", err))
+		}
 		return reconcile.Result{}, fmt.Errorf("getting amis, %w", err)
 	}
 	if len(amis) == 0 {

pkg/providers/amifamily/ami.go

@@ -17,6 +17,7 @@ package amifamily
 import (
 	"context"
 	"fmt"
+	"strconv"
 	"strings"
 	"sync"
 
@@ -87,6 +88,14 @@ func (p *DefaultProvider) DescribeImageQueries(ctx context.Context, nodeClass *v
 	// This is enforced by a CEL validation, we will treat this as an invariant.
 	if alias := nodeClass.Alias(); alias != nil {
 		kubernetesVersion := p.versionProvider.Get(ctx)
+		if alias.Family == v1.AMIFamilyAL2 {
+			minorVersion, err := strconv.Atoi(strings.Split(kubernetesVersion, ".")[1])
+			if err == nil && minorVersion >= 33 {
+				return nil, &AL2DeprecationError{
+					error: fmt.Errorf("AL2 aliases are no longer supported on EKS 1.33+ (see https://docs.aws.amazon.com/eks/latest/userguide/kubernetes-versions-standard.html#kubernetes-1-33)"),
+				}
+			}
+		}
 		query, err := GetAMIFamily(alias.Family, nil).DescribeImageQuery(ctx, p.ssmProvider, kubernetesVersion, alias.Version)
 		if err != nil {
 			return []DescribeImageQuery{}, err

pkg/providers/amifamily/suite_test.go

@@ -132,12 +132,43 @@ var _ = AfterSuite(func() {
 	Expect(env.Stop()).To(Succeed(), "Failed to stop environment")
 })
 
+type MockVersionProvider struct {
+	version string
+}
+
+func (m *MockVersionProvider) Get(ctx context.Context) string {
+	return m.version
+}
+
+func amiProviderWithEKSVersionOverride(version string) *amifamily.DefaultProvider {
+	mockVersionProvider := &MockVersionProvider{version: version}
+	return amifamily.NewDefaultProvider(awsEnv.Clock, mockVersionProvider, awsEnv.SSMProvider, awsEnv.EC2API, awsEnv.EC2Cache)
+}
+
 var _ = Describe("AMIProvider", func() {
 	var version string
 	BeforeEach(func() {
 		version = awsEnv.VersionProvider.Get(ctx)
 		nodeClass = test.EC2NodeClass()
 	})
+	DescribeTable(
+		"should fail when AL2 is used with Kubernetes version 1.33 or greater",
+		func(k8sVersion string, amiAlias string, expectError bool) {
+			amiProvider := amiProviderWithEKSVersionOverride(k8sVersion)
+			nodeClass.Spec.AMISelectorTerms = []v1.AMISelectorTerm{{Alias: amiAlias}}
+			_, err := amiProvider.DescribeImageQueries(ctx, nodeClass)
+			if expectError {
+				Expect(err).To(HaveOccurred())
+			} else {
+				Expect(err).ToNot(HaveOccurred())
+			}
+		},
+		Entry("should fail for AL2 on 1.33.0", "1.33.0", "al2@latest", true),
+		Entry("should fail for AL2 on 1.34.2", "1.34.2", "al2@latest", true),
+		Entry("should succeed for AL2 on 1.32.0", "1.32.0", "al2@latest", false),
+		Entry("should succeed for AL2023 on 1.33.0", "1.33.0", "al2023@latest", false),
+	)
+
 	It("should succeed to resolve AMIs (AL2)", func() {
 		nodeClass.Spec.AMISelectorTerms = []v1.AMISelectorTerm{{Alias: "al2@latest"}}
 		awsEnv.SSMAPI.Parameters = map[string]string{

pkg/providers/amifamily/types.go

@@ -15,6 +15,7 @@ limitations under the License.
 package amifamily
 
 import (
+	"errors"
 	"fmt"
 	"math"
 	"sort"
@@ -128,3 +129,15 @@ func (q DescribeImageQuery) RequirementsForImageWithArchitecture(image string, a
 	}
 	return []scheduling.Requirements{scheduling.NewRequirements(scheduling.NewRequirement(corev1.LabelArchStable, corev1.NodeSelectorOpIn, arch))}
 }
+
+type AL2DeprecationError struct {
+	error
+}
+
+func IsAl2DeprecationError(err error) bool {
+	if err == nil {
+		return false
+	}
+	var al2Err *AL2DeprecationError
+	return errors.As(err, &al2Err)
+}

pkg/test/environment.go

@@ -95,6 +95,7 @@ type Environment struct {
 	AMIResolver                 *amifamily.DefaultResolver
 	VersionProvider             *version.DefaultProvider
 	LaunchTemplateProvider      *launchtemplate.DefaultProvider
+	SSMProvider                 *ssmp.DefaultProvider
 }
 
 func NewEnvironment(ctx context.Context, env *coretest.Environment) *Environment {
@@ -205,6 +206,7 @@ func NewEnvironment(ctx context.Context, env *coretest.Environment) *Environment
 		AMIProvider:                 amiProvider,
 		AMIResolver:                 amiResolver,
 		VersionProvider:             versionProvider,
+		SSMProvider:                 ssmProvider,
 	}
 }