Add feature flags for K8s 1.33 (#9706)

Author: rajeshvenkata

pkg/api/v1alpha1/cluster_types.go

@@ -844,6 +844,7 @@ const (
 	Kube130 KubernetesVersion = "1.30"
 	Kube131 KubernetesVersion = "1.31"
 	Kube132 KubernetesVersion = "1.32"
+	Kube133 KubernetesVersion = "1.33"
 )
 
 // KubeVersionToSemver converts kube version to semver for comparisons.

pkg/features/features.go

@@ -9,6 +9,7 @@ const (
 	VSphereInPlaceEnvVar              = "VSPHERE_IN_PLACE_UPGRADE"
 	APIServerExtraArgsEnabledEnvVar   = "API_SERVER_EXTRA_ARGS_ENABLED"
 	VSphereFailureDomainEnabledEnvVar = "VSPHERE_FAILURE_DOMAIN_ENABLED"
+	K8s133SupportEnvVar               = "K8S_1_33_SUPPORT"
 )
 
 func FeedGates(featureGates []string) {
@@ -73,3 +74,11 @@ func VsphereFailureDomainEnabled() Feature {
 		IsActive: globalFeatures.isActiveForEnvVar(VSphereFailureDomainEnabledEnvVar),
 	}
 }
+
+// K8s133Support is the feature flag for Kubernetes 1.33 support.
+func K8s133Support() Feature {
+	return Feature{
+		Name:     "Kubernetes version 1.33 support",
+		IsActive: globalFeatures.isActiveForEnvVar(K8s133SupportEnvVar),
+	}
+}

pkg/features/features_test.go

@@ -93,3 +93,11 @@ func TestWithVsphereFailureDomainsFeatureFlag(t *testing.T) {
 	g.Expect(os.Setenv(VSphereFailureDomainEnabledEnvVar, "true")).To(Succeed())
 	g.Expect(IsActive(VsphereFailureDomainEnabled())).To(BeTrue())
 }
+
+func TestWithK8s133FeatureFlag(t *testing.T) {
+	g := NewWithT(t)
+	setupContext(t)
+
+	g.Expect(os.Setenv(K8s133SupportEnvVar, "true")).To(Succeed())
+	g.Expect(IsActive(K8s133Support())).To(BeTrue())
+}

pkg/validations/cluster.go

@@ -10,6 +10,7 @@ import (
 	"github.com/aws/eks-anywhere/pkg/cluster"
 	"github.com/aws/eks-anywhere/pkg/config"
 	"github.com/aws/eks-anywhere/pkg/constants"
+	"github.com/aws/eks-anywhere/pkg/features"
 	"github.com/aws/eks-anywhere/pkg/logger"
 	"github.com/aws/eks-anywhere/pkg/manifests"
 	"github.com/aws/eks-anywhere/pkg/manifests/bundles"
@@ -318,3 +319,13 @@ func ValidateExtendedKubernetesSupport(ctx context.Context, clusterSpec v1alpha1
 	}
 	return ValidateExtendedK8sVersionSupport(ctx, clusterSpec, b, k)
 }
+
+// ValidateK8s133Support checks if the 1.33 feature flag is set when using k8s 1.33.
+func ValidateK8s133Support(clusterSpec *cluster.Spec) error {
+	if !features.IsActive(features.K8s133Support()) {
+		if clusterSpec.Cluster.Spec.KubernetesVersion == v1alpha1.Kube133 {
+			return fmt.Errorf("kubernetes version %s is not enabled. Please set the env variable %v", v1alpha1.Kube133, features.K8s133SupportEnvVar)
+		}
+	}
+	return nil
+}

pkg/validations/cluster_test.go

@@ -18,6 +18,7 @@ import (
 	internalmocks "github.com/aws/eks-anywhere/internal/test/mocks"
 	anywherev1 "github.com/aws/eks-anywhere/pkg/api/v1alpha1"
 	"github.com/aws/eks-anywhere/pkg/cluster"
+	"github.com/aws/eks-anywhere/pkg/features"
 	"github.com/aws/eks-anywhere/pkg/manifests"
 	"github.com/aws/eks-anywhere/pkg/manifests/releases"
 	"github.com/aws/eks-anywhere/pkg/providers"
@@ -1157,3 +1158,18 @@ spec:
 		})
 	}
 }
+
+func TestValidateK8s133Support(t *testing.T) {
+	tt := newTest(t)
+	tt.clusterSpec.Cluster.Spec.KubernetesVersion = anywherev1.Kube133
+	tt.Expect(validations.ValidateK8s133Support(tt.clusterSpec)).To(
+		MatchError(ContainSubstring("kubernetes version 1.33 is not enabled. Please set the env variable K8S_1_33_SUPPORT")))
+}
+
+func TestValidateK8s133SupportActive(t *testing.T) {
+	tt := newTest(t)
+	tt.clusterSpec.Cluster.Spec.KubernetesVersion = anywherev1.Kube133
+	features.ClearCache()
+	os.Setenv(features.K8s133SupportEnvVar, "true")
+	tt.Expect(validations.ValidateK8s133Support(tt.clusterSpec)).To(Succeed())
+}

pkg/validations/createvalidations/preflightvalidations.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/aws/eks-anywhere/pkg/api/v1alpha1"
 	anywherev1 "github.com/aws/eks-anywhere/pkg/api/v1alpha1"
 	"github.com/aws/eks-anywhere/pkg/config"
 	"github.com/aws/eks-anywhere/pkg/constants"
+	"github.com/aws/eks-anywhere/pkg/features"
 	"github.com/aws/eks-anywhere/pkg/types"
 	"github.com/aws/eks-anywhere/pkg/validations"
 )
@@ -57,11 +57,19 @@ func (v *CreateValidations) PreflightValidations(ctx context.Context) []validati
 				Err:         validations.ValidateExtendedKubernetesSupport(ctx, *v.Opts.Spec.Cluster, v.Opts.ManifestReader, v.Opts.KubeClient, v.Opts.BundlesOverride),
 			}
 		},
+		func() *validations.ValidationResult {
+			return &validations.ValidationResult{
+				Name:        "validate kubernetes version 1.33 support",
+				Remediation: fmt.Sprintf("ensure %v env variable is set", features.K8s133SupportEnvVar),
+				Err:         validations.ValidateK8s133Support(v.Opts.Spec),
+				Silent:      true,
+			}
+		},
 	}
 
 	if len(v.Opts.Spec.VSphereMachineConfigs) != 0 {
 		cpRef := v.Opts.Spec.Cluster.Spec.ControlPlaneConfiguration.MachineGroupRef.Name
-		if v.Opts.Spec.VSphereMachineConfigs[cpRef].Spec.OSFamily == v1alpha1.Bottlerocket {
+		if v.Opts.Spec.VSphereMachineConfigs[cpRef].Spec.OSFamily == anywherev1.Bottlerocket {
 			createValidations = append(createValidations,
 				func() *validations.ValidationResult {
 					return &validations.ValidationResult{

pkg/validations/upgradevalidations/preflightvalidations.go

@@ -9,6 +9,7 @@ import (
 	anywherev1 "github.com/aws/eks-anywhere/pkg/api/v1alpha1"
 	"github.com/aws/eks-anywhere/pkg/config"
 	"github.com/aws/eks-anywhere/pkg/constants"
+	"github.com/aws/eks-anywhere/pkg/features"
 	"github.com/aws/eks-anywhere/pkg/providers"
 	"github.com/aws/eks-anywhere/pkg/types"
 	"github.com/aws/eks-anywhere/pkg/validation"
@@ -129,6 +130,14 @@ func (u *UpgradeValidations) PreflightValidations(ctx context.Context) []validat
 				Err:         validations.ValidateExtendedKubernetesSupport(ctx, *u.Opts.Spec.Cluster, u.Opts.ManifestReader, u.Opts.KubeClient, u.Opts.BundlesOverride),
 			}
 		},
+		func() *validations.ValidationResult {
+			return &validations.ValidationResult{
+				Name:        "validate kubernetes version 1.33 support",
+				Remediation: fmt.Sprintf("ensure %v env variable is set", features.K8s133SupportEnvVar),
+				Err:         validations.ValidateK8s133Support(u.Opts.Spec),
+				Silent:      true,
+			}
+		},
 	}
 
 	if len(u.Opts.Spec.VSphereMachineConfigs) != 0 {

test/framework/cluster.go

@@ -36,6 +36,7 @@ import (
 	"github.com/aws/eks-anywhere/pkg/cluster"
 	"github.com/aws/eks-anywhere/pkg/constants"
 	"github.com/aws/eks-anywhere/pkg/executables"
+	"github.com/aws/eks-anywhere/pkg/features"
 	"github.com/aws/eks-anywhere/pkg/filewriter"
 	"github.com/aws/eks-anywhere/pkg/git"
 	"github.com/aws/eks-anywhere/pkg/providers/cloudstack/decoder"
@@ -2277,11 +2278,12 @@ func dumpFile(description, path string, t T) {
 func (e *ClusterE2ETest) setFeatureFlagForUnreleasedKubernetesVersion(version v1alpha1.KubernetesVersion) {
 	// Update this variable to equal the feature flagged k8s version when applicable.
 	// For example, if k8s 1.31 is under a feature flag, we would set this to v1alpha1.Kube131
-	var unreleasedK8sVersion v1alpha1.KubernetesVersion
+	unreleasedK8sVersion := v1alpha1.Kube133
 
 	if version == unreleasedK8sVersion {
 		// Set feature flag for the unreleased k8s version when applicable
 		e.T.Logf("Setting k8s version support feature flag...")
+		os.Setenv(features.K8s133SupportEnvVar, "true")
 	}
 }