From c145c799a25c40b52ad44dd73af5a8ae1a99ce2f Mon Sep 17 00:00:00 2001 From: mitalipaygude Date: Fri, 5 Aug 2022 10:21:50 -0700 Subject: [PATCH] Remove feature flag for kubernetes version 1.23 --- docs/content/en/docs/reference/changelog.md | 3 ++ pkg/features/features.go | 8 ----- pkg/validations/cluster.go | 11 ------- pkg/validations/cluster_test.go | 7 ---- .../createvalidations/preflightvalidations.go | 7 ---- .../preflightvalidations.go | 7 ---- test/e2e/awsiam_test.go | 6 ---- test/e2e/conformance_test.go | 4 --- test/e2e/flux_test.go | 14 -------- test/e2e/labels_test.go | 9 ------ test/e2e/multiple_worker_node_groups_test.go | 5 --- test/e2e/oidc_test.go | 5 --- test/e2e/proxy_test.go | 3 -- test/e2e/registry_mirror_test.go | 3 -- test/e2e/simpleflow_test.go | 10 ------ test/e2e/stackedetcd_test.go | 4 +-- test/e2e/taints_test.go | 9 ------ test/e2e/upgrade_from_latest_test.go | 5 --- test/e2e/upgrade_test.go | 32 ------------------- test/e2e/vsphere_autoimport_test.go | 3 -- 20 files changed, 4 insertions(+), 151 deletions(-) diff --git a/docs/content/en/docs/reference/changelog.md b/docs/content/en/docs/reference/changelog.md index 3ab21387cc3b..a8db4569aceb 100644 --- a/docs/content/en/docs/reference/changelog.md +++ b/docs/content/en/docs/reference/changelog.md @@ -5,6 +5,9 @@ weight: 35 --- ## Unreleased +### Added +- Add support for Kubernetes 1.23 [#2159](https://github.com/aws/eks-anywhere/issues/2159) + ## [v0.10.1](https://github.com/aws/eks-anywhere/releases/tag/v0.10.1) diff --git a/pkg/features/features.go b/pkg/features/features.go index 6f595758eeff..db289296c1cc 100644 --- a/pkg/features/features.go +++ b/pkg/features/features.go @@ -7,7 +7,6 @@ const ( FullLifecycleAPIEnvVar = "FULL_LIFECYCLE_API" FullLifecycleGate = "FullLifecycleAPI" CuratedPackagesEnvVar = "CURATED_PACKAGES_SUPPORT" - K8s123SupportEnvVar = "K8S_1_23_SUPPORT" CheckpointEnabledEnvVar = "CHECKPOINT_ENABLED" ) @@ -64,13 +63,6 @@ func CuratedPackagesSupport() Feature { } } -func K8s123Support() Feature { - return Feature{ - Name: "Kubernetes version 1.23 support", - IsActive: globalFeatures.isActiveForEnvVar(K8s123SupportEnvVar), - } -} - func CheckpointEnabled() Feature { return Feature{ Name: "Checkpoint to rerun commands enabled", diff --git a/pkg/validations/cluster.go b/pkg/validations/cluster.go index fb3a51bebe81..804a4396f1a2 100644 --- a/pkg/validations/cluster.go +++ b/pkg/validations/cluster.go @@ -3,9 +3,7 @@ package validations import ( "fmt" - "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/logger" ) @@ -42,12 +40,3 @@ func ValidateCertForRegistryMirror(clusterSpec *cluster.Spec, tlsValidator TlsVa return nil } - -func ValidateK8s123Support(clusterSpec *cluster.Spec) error { - if !features.IsActive(features.K8s123Support()) { - if clusterSpec.Cluster.Spec.KubernetesVersion == v1alpha1.Kube123 { - return fmt.Errorf("kubernetes version %s is not enabled. Please set the env variable %v", v1alpha1.Kube123, features.K8s123SupportEnvVar) - } - } - return nil -} diff --git a/pkg/validations/cluster_test.go b/pkg/validations/cluster_test.go index d3c44e3e2ac1..4e65251b49c5 100644 --- a/pkg/validations/cluster_test.go +++ b/pkg/validations/cluster_test.go @@ -93,10 +93,3 @@ func TestValidateCertForRegistryMirrorInsecureSkip(t *testing.T) { tt.Expect(validations.ValidateCertForRegistryMirror(tt.clusterSpec, tt.tlsValidator)).To(Succeed()) } - -func TestValidateK8s123Support(t *testing.T) { - tt := newTlsTest(t) - tt.clusterSpec.Cluster.Spec.KubernetesVersion = anywherev1.Kube123 - tt.Expect(validations.ValidateK8s123Support(tt.clusterSpec)).To( - MatchError(ContainSubstring("kubernetes version 1.23 is not enabled. Please set the env variable K8S_1_23_SUPPORT"))) -} diff --git a/pkg/validations/createvalidations/preflightvalidations.go b/pkg/validations/createvalidations/preflightvalidations.go index 2f2be920ade1..9def2294ff64 100644 --- a/pkg/validations/createvalidations/preflightvalidations.go +++ b/pkg/validations/createvalidations/preflightvalidations.go @@ -5,7 +5,6 @@ import ( "fmt" anywherev1 "github.com/aws/eks-anywhere/pkg/api/v1alpha1" - "github.com/aws/eks-anywhere/pkg/features" "github.com/aws/eks-anywhere/pkg/types" "github.com/aws/eks-anywhere/pkg/validations" ) @@ -24,12 +23,6 @@ func (u *CreateValidations) PreflightValidations(ctx context.Context) (err error Remediation: fmt.Sprintf("provide a valid certificate for you registry endpoint using %s env var", anywherev1.RegistryMirrorCAKey), Err: validations.ValidateCertForRegistryMirror(u.Opts.Spec, u.Opts.TlsValidator), }, - { - Name: "validate kubernetes version 1.23 support", - Remediation: fmt.Sprintf("ensure %v env variable is set", features.K8s123SupportEnvVar), - Err: validations.ValidateK8s123Support(u.Opts.Spec), - Silent: true, - }, } if u.Opts.Spec.Cluster.IsManaged() { diff --git a/pkg/validations/upgradevalidations/preflightvalidations.go b/pkg/validations/upgradevalidations/preflightvalidations.go index 4d8a13a094f1..9187b3cc89f3 100644 --- a/pkg/validations/upgradevalidations/preflightvalidations.go +++ b/pkg/validations/upgradevalidations/preflightvalidations.go @@ -7,7 +7,6 @@ import ( clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" anywherev1 "github.com/aws/eks-anywhere/pkg/api/v1alpha1" - "github.com/aws/eks-anywhere/pkg/features" "github.com/aws/eks-anywhere/pkg/types" "github.com/aws/eks-anywhere/pkg/validations" ) @@ -25,12 +24,6 @@ func (u *UpgradeValidations) PreflightValidations(ctx context.Context) (err erro Remediation: fmt.Sprintf("provide a valid certificate for you registry endpoint using %s env var", anywherev1.RegistryMirrorCAKey), Err: validations.ValidateCertForRegistryMirror(u.Opts.Spec, u.Opts.TlsValidator), }, - { - Name: "validate kubernetes version 1.23 support", - Remediation: fmt.Sprintf("ensure %v env variable is set", features.K8s123SupportEnvVar), - Err: validations.ValidateK8s123Support(u.Opts.Spec), - Silent: true, - }, { Name: "control plane ready", Remediation: fmt.Sprintf("ensure control plane nodes and pods for cluster %s are Ready", u.Opts.WorkloadCluster.Name), diff --git a/test/e2e/awsiam_test.go b/test/e2e/awsiam_test.go index 1be7aa6601bd..bc19a0c91269 100644 --- a/test/e2e/awsiam_test.go +++ b/test/e2e/awsiam_test.go @@ -8,7 +8,6 @@ import ( "github.com/aws/eks-anywhere/internal/pkg/api" "github.com/aws/eks-anywhere/pkg/api/v1alpha1" - "github.com/aws/eks-anywhere/pkg/features" "github.com/aws/eks-anywhere/test/framework" ) @@ -63,7 +62,6 @@ func TestDockerKubernetes123AWSIamAuth(t *testing.T) { framework.NewDocker(t), framework.WithAWSIam(), framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runAWSIamAuthFlow(test) } @@ -104,7 +102,6 @@ func TestVSphereKubernetes123AWSIamAuth(t *testing.T) { framework.NewVSphere(t, framework.WithUbuntu123()), framework.WithAWSIam(), framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runAWSIamAuthFlow(test) } @@ -145,7 +142,6 @@ func TestVSphereKubernetes123BottleRocketAWSIamAuth(t *testing.T) { framework.NewVSphere(t, framework.WithBottleRocket123()), framework.WithAWSIam(), framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runAWSIamAuthFlow(test) } @@ -157,13 +153,11 @@ func TestVSphereKubernetes122To123AWSIamAuthUpgrade(t *testing.T) { provider, framework.WithAWSIam(), framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube122)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runUpgradeFlowWithAWSIamAuth( test, v1alpha1.Kube123, framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube123)), provider.WithProviderUpgrade(framework.UpdateUbuntuTemplate123Var()), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) } diff --git a/test/e2e/conformance_test.go b/test/e2e/conformance_test.go index 3619544cb65b..ffca2e67d399 100644 --- a/test/e2e/conformance_test.go +++ b/test/e2e/conformance_test.go @@ -8,7 +8,6 @@ import ( "github.com/aws/eks-anywhere/internal/pkg/api" "github.com/aws/eks-anywhere/pkg/api/v1alpha1" - "github.com/aws/eks-anywhere/pkg/features" "github.com/aws/eks-anywhere/test/framework" ) @@ -67,7 +66,6 @@ func TestDockerKubernetes123ThreeWorkersConformanceFlow(t *testing.T) { framework.NewDocker(t), framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithClusterFiller(api.WithWorkerNodeCount(3)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runConformanceFlow(test) } @@ -108,7 +106,6 @@ func TestVSphereKubernetes123ThreeWorkersConformanceFlow(t *testing.T) { framework.NewVSphere(t, framework.WithUbuntu123()), framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithClusterFiller(api.WithWorkerNodeCount(3)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runConformanceFlow(test) } @@ -149,7 +146,6 @@ func TestVSphereKubernetes123BottleRocketThreeWorkersConformanceFlow(t *testing. framework.NewVSphere(t, framework.WithBottleRocket123()), framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithClusterFiller(api.WithWorkerNodeCount(3)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runConformanceFlow(test) } diff --git a/test/e2e/flux_test.go b/test/e2e/flux_test.go index b118864755d9..d91e27599a3f 100644 --- a/test/e2e/flux_test.go +++ b/test/e2e/flux_test.go @@ -8,7 +8,6 @@ import ( "github.com/aws/eks-anywhere/internal/pkg/api" "github.com/aws/eks-anywhere/pkg/api/v1alpha1" - "github.com/aws/eks-anywhere/pkg/features" "github.com/aws/eks-anywhere/test/framework" ) @@ -50,7 +49,6 @@ func TestDockerKubernetes123GithubFlux(t *testing.T) { framework.NewDocker(t), framework.WithFluxGithub(), framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runFluxFlow(test) } @@ -60,7 +58,6 @@ func TestDockerKubernetes123GitFlux(t *testing.T) { framework.NewDocker(t), framework.WithFluxGit(), framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runFluxFlow(test) } @@ -79,7 +76,6 @@ func TestDockerKubernetes123FluxLegacy(t *testing.T) { framework.NewDocker(t), framework.WithFluxLegacy(), framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runFluxFlow(test) } @@ -116,7 +112,6 @@ func TestVSphereKubernetes123FluxLegacy(t *testing.T) { framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runFluxFlow(test) } @@ -129,7 +124,6 @@ func TestVSphereKubernetes123GithubFlux(t *testing.T) { framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runFluxFlow(test) } @@ -142,7 +136,6 @@ func TestVSphereKubernetes123GitFlux(t *testing.T) { framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runFluxFlow(test) } @@ -202,7 +195,6 @@ func TestVSphereKubernetes123ThreeReplicasThreeWorkersFluxLegacy(t *testing.T) { framework.WithClusterFiller(api.WithControlPlaneCount(3)), framework.WithClusterFiller(api.WithWorkerNodeCount(3)), framework.WithFluxLegacy(), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runFluxFlow(test) } @@ -218,7 +210,6 @@ func TestDockerKubernetes123GitopsOptionsFluxLegacy(t *testing.T) { api.WithFluxNamespace(fluxUserProvidedNamespace), api.WithFluxConfigurationPath(fluxUserProvidedPath), ), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runFluxFlow(test) } @@ -235,7 +226,6 @@ func TestVSphereKubernetes123GitopsOptionsFluxLegacy(t *testing.T) { api.WithFluxNamespace(fluxUserProvidedNamespace), api.WithFluxConfigurationPath(fluxUserProvidedPath), ), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runFluxFlow(test) } @@ -273,14 +263,12 @@ func TestVSphereKubernetes122To123FluxUpgradeLegacy(t *testing.T) { framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runUpgradeFlowWithFlux( test, v1alpha1.Kube123, framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube123)), provider.WithProviderUpgrade(framework.UpdateUbuntuTemplate123Var()), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) } @@ -293,13 +281,11 @@ func TestVSphereKubernetes122To123GitFluxUpgrade(t *testing.T) { framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runUpgradeFlowWithFlux( test, v1alpha1.Kube123, framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube123)), provider.WithProviderUpgrade(framework.UpdateUbuntuTemplate123Var()), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) } diff --git a/test/e2e/labels_test.go b/test/e2e/labels_test.go index 06f48893e13c..392f48463c1d 100644 --- a/test/e2e/labels_test.go +++ b/test/e2e/labels_test.go @@ -8,7 +8,6 @@ import ( "github.com/aws/eks-anywhere/internal/pkg/api" "github.com/aws/eks-anywhere/pkg/api/v1alpha1" - "github.com/aws/eks-anywhere/pkg/features" "github.com/aws/eks-anywhere/test/framework" ) @@ -51,7 +50,6 @@ func TestDockerKubernetes123Labels(t *testing.T) { api.WithWorkerNodeGroup(worker2, api.WithCount(1), api.WithLabel(key2, val2)), ), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runLabelsUpgradeFlow( @@ -63,7 +61,6 @@ func TestDockerKubernetes123Labels(t *testing.T) { api.WithWorkerNodeGroup(worker2), api.WithControlPlaneLabel(cpKey1, cpVal1), ), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) } @@ -79,7 +76,6 @@ func TestVSphereKubernetes123Labels(t *testing.T) { api.WithControlPlaneCount(1), api.RemoveAllWorkerNodeGroups(), // This gives us a blank slate ), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runLabelsUpgradeFlow( @@ -91,7 +87,6 @@ func TestVSphereKubernetes123Labels(t *testing.T) { api.WithWorkerNodeGroup(worker2), api.WithControlPlaneLabel(cpKey1, cpVal1), ), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) } @@ -107,7 +102,6 @@ func TestVSphereKubernetes123LabelsBottlerocket(t *testing.T) { api.WithControlPlaneCount(1), api.RemoveAllWorkerNodeGroups(), // This gives us a blank slate ), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runLabelsUpgradeFlow( @@ -119,7 +113,6 @@ func TestVSphereKubernetes123LabelsBottlerocket(t *testing.T) { api.WithWorkerNodeGroup(worker2), api.WithControlPlaneLabel(cpKey1, cpVal1), ), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) } @@ -145,7 +138,6 @@ func TestSnowKubernetes123LabelsUbuntu(t *testing.T) { api.RemoveAllWorkerNodeGroups(), ), framework.WithEnvVar("SNOW_PROVIDER", "true"), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runLabelsUpgradeFlow( @@ -157,7 +149,6 @@ func TestSnowKubernetes123LabelsUbuntu(t *testing.T) { api.WithControlPlaneLabel(cpKey1, cpVal1), ), framework.WithEnvVar("SNOW_PROVIDER", "true"), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) } diff --git a/test/e2e/multiple_worker_node_groups_test.go b/test/e2e/multiple_worker_node_groups_test.go index 517c5e2ee7f9..a4351bdc70e7 100644 --- a/test/e2e/multiple_worker_node_groups_test.go +++ b/test/e2e/multiple_worker_node_groups_test.go @@ -8,7 +8,6 @@ import ( "github.com/aws/eks-anywhere/internal/pkg/api" anywherev1 "github.com/aws/eks-anywhere/pkg/api/v1alpha1" - "github.com/aws/eks-anywhere/pkg/features" "github.com/aws/eks-anywhere/test/framework" ) @@ -33,7 +32,6 @@ func TestVSphereKubernetes123BottlerocketAndAndRemoveWorkerNodeGroups(t *testing api.WithControlPlaneCount(1), api.RemoveAllWorkerNodeGroups(), // This gives us a blank slate ), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runSimpleUpgradeFlow( @@ -50,7 +48,6 @@ func TestVSphereKubernetes123BottlerocketAndAndRemoveWorkerNodeGroups(t *testing api.WithCount(1), ), ), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) } @@ -115,7 +112,6 @@ func TestSnowKubernetes123UbuntuRemoveWorkerNodeGroups(t *testing.T) { api.RemoveAllWorkerNodeGroups(), ), framework.WithEnvVar("SNOW_PROVIDER", "true"), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runSimpleUpgradeFlow( @@ -133,6 +129,5 @@ func TestSnowKubernetes123UbuntuRemoveWorkerNodeGroups(t *testing.T) { ), ), framework.WithEnvVar("SNOW_PROVIDER", "true"), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) } diff --git a/test/e2e/oidc_test.go b/test/e2e/oidc_test.go index 76bdfb73b1ec..790eb1f76fa6 100644 --- a/test/e2e/oidc_test.go +++ b/test/e2e/oidc_test.go @@ -8,7 +8,6 @@ import ( "github.com/aws/eks-anywhere/internal/pkg/api" "github.com/aws/eks-anywhere/pkg/api/v1alpha1" - "github.com/aws/eks-anywhere/pkg/features" "github.com/aws/eks-anywhere/test/framework" ) @@ -74,7 +73,6 @@ func TestDockerKubernetes123OIDC(t *testing.T) { framework.NewDocker(t), framework.WithOIDC(), framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runOIDCFlow(test) } @@ -168,7 +166,6 @@ func TestVSphereKubernetes123OIDC(t *testing.T) { framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runOIDCFlow(test) } @@ -183,14 +180,12 @@ func TestVSphereKubernetes122To123OIDCUpgrade(t *testing.T) { framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runUpgradeFlowWithOIDC( test, v1alpha1.Kube123, framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube123)), provider.WithProviderUpgrade(framework.UpdateUbuntuTemplate123Var()), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) } diff --git a/test/e2e/proxy_test.go b/test/e2e/proxy_test.go index 417717f694b0..4b8997b4bfb1 100644 --- a/test/e2e/proxy_test.go +++ b/test/e2e/proxy_test.go @@ -8,7 +8,6 @@ import ( "github.com/aws/eks-anywhere/internal/pkg/api" "github.com/aws/eks-anywhere/pkg/api/v1alpha1" - "github.com/aws/eks-anywhere/pkg/features" "github.com/aws/eks-anywhere/test/framework" ) @@ -28,7 +27,6 @@ func TestVSphereKubernetes123UbuntuProxyConfig(t *testing.T) { framework.WithClusterFiller(api.WithWorkerNodeCount(1)), framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithProxy(framework.VsphereProxyRequiredEnvVars), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runProxyConfigFlow(test) } @@ -43,7 +41,6 @@ func TestVSphereKubernetes123BottlerocketProxyConfig(t *testing.T) { framework.WithClusterFiller(api.WithWorkerNodeCount(1)), framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithProxy(framework.VsphereProxyRequiredEnvVars), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runProxyConfigFlow(test) } diff --git a/test/e2e/registry_mirror_test.go b/test/e2e/registry_mirror_test.go index 991dab464b97..c6c4a46068fa 100644 --- a/test/e2e/registry_mirror_test.go +++ b/test/e2e/registry_mirror_test.go @@ -8,7 +8,6 @@ import ( "github.com/aws/eks-anywhere/internal/pkg/api" "github.com/aws/eks-anywhere/pkg/api/v1alpha1" - "github.com/aws/eks-anywhere/pkg/features" "github.com/aws/eks-anywhere/test/framework" ) @@ -29,7 +28,6 @@ func TestVSphereKubernetes123UbuntuRegistryMirrorAndCert(t *testing.T) { framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithRegistryMirrorEndpointAndCert(), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runRegistryMirrorConfigFlow(test) } @@ -43,7 +41,6 @@ func TestVSphereKubernetes123BottlerocketRegistryMirrorAndCert(t *testing.T) { framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithRegistryMirrorEndpointAndCert(), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runRegistryMirrorConfigFlow(test) } diff --git a/test/e2e/simpleflow_test.go b/test/e2e/simpleflow_test.go index 0c0c82608a68..09db41d04562 100644 --- a/test/e2e/simpleflow_test.go +++ b/test/e2e/simpleflow_test.go @@ -10,7 +10,6 @@ import ( "github.com/aws/eks-anywhere/internal/pkg/api" "github.com/aws/eks-anywhere/pkg/api/v1alpha1" - "github.com/aws/eks-anywhere/pkg/features" "github.com/aws/eks-anywhere/pkg/logger" "github.com/aws/eks-anywhere/test/framework" ) @@ -75,7 +74,6 @@ func TestDockerKubernetes123SimpleFlow(t *testing.T) { t, framework.NewDocker(t), framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runSimpleFlow(test) } @@ -112,7 +110,6 @@ func TestVSphereKubernetes123SimpleFlow(t *testing.T) { t, framework.NewVSphere(t, framework.WithUbuntu123()), framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runSimpleFlow(test) } @@ -124,7 +121,6 @@ func TestVSphereKubernetes123ThreeReplicasFiveWorkersSimpleFlow(t *testing.T) { framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithClusterFiller(api.WithControlPlaneCount(3)), framework.WithClusterFiller(api.WithWorkerNodeCount(5)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runSimpleFlow(test) } @@ -135,7 +131,6 @@ func TestVSphereKubernetes123DifferentNamespaceSimpleFlow(t *testing.T) { framework.NewVSphere(t, framework.WithUbuntu123(), framework.WithVSphereFillers(api.WithVSphereConfigNamespaceForAllMachinesAndDatacenter(clusterNamespace))), framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithClusterFiller(api.WithClusterNamespace(clusterNamespace)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runSimpleFlow(test) } @@ -145,7 +140,6 @@ func TestVSphereKubernetes123BottleRocketSimpleFlow(t *testing.T) { t, framework.NewVSphere(t, framework.WithBottleRocket123()), framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runSimpleFlow(test) } @@ -157,7 +151,6 @@ func TestVSphereKubernetes123BottleRocketThreeReplicasFiveWorkersSimpleFlow(t *t framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithClusterFiller(api.WithControlPlaneCount(3)), framework.WithClusterFiller(api.WithWorkerNodeCount(5)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runSimpleFlow(test) } @@ -168,7 +161,6 @@ func TestVSphereKubernetes123BottleRocketDifferentNamespaceSimpleFlow(t *testing framework.NewVSphere(t, framework.WithBottleRocket123(), framework.WithVSphereFillers(api.WithVSphereConfigNamespaceForAllMachinesAndDatacenter(clusterNamespace))), framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithClusterFiller(api.WithClusterNamespace(clusterNamespace)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runSimpleFlow(test) } @@ -262,7 +254,6 @@ func TestTinkerbellKubernetes123SimpleFlow(t *testing.T) { framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithControlPlaneHardware(1), framework.WithWorkerHardware(1), - framework.WithEnvVar("K8S_1_23_SUPPORT", "true"), ) runTinkerbellSimpleFlow(test) } @@ -379,7 +370,6 @@ func TestSnowKubernetes123SimpleFlow(t *testing.T) { framework.NewSnow(t, framework.WithSnowUbuntu123()), framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithEnvVar("SNOW_PROVIDER", "true"), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runSimpleFlow(test) } diff --git a/test/e2e/stackedetcd_test.go b/test/e2e/stackedetcd_test.go index 11f7af483d57..33fced92840a 100644 --- a/test/e2e/stackedetcd_test.go +++ b/test/e2e/stackedetcd_test.go @@ -8,7 +8,6 @@ import ( "github.com/aws/eks-anywhere/internal/pkg/api" "github.com/aws/eks-anywhere/pkg/api/v1alpha1" - "github.com/aws/eks-anywhere/pkg/features" "github.com/aws/eks-anywhere/test/framework" ) @@ -68,8 +67,7 @@ func TestVSphereKubernetes123StackedEtcdUbuntu(t *testing.T) { framework.NewVSphere(t, framework.WithUbuntu123()), framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithClusterFiller(api.WithControlPlaneCount(3)), - framework.WithClusterFiller(api.WithStackedEtcdTopology()), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true")) + framework.WithClusterFiller(api.WithStackedEtcdTopology())) runStackedEtcdFlow(test) } diff --git a/test/e2e/taints_test.go b/test/e2e/taints_test.go index ce3be1c99f20..168259744bd6 100644 --- a/test/e2e/taints_test.go +++ b/test/e2e/taints_test.go @@ -10,7 +10,6 @@ import ( "github.com/aws/eks-anywhere/internal/pkg/api" "github.com/aws/eks-anywhere/pkg/api/v1alpha1" - "github.com/aws/eks-anywhere/pkg/features" "github.com/aws/eks-anywhere/test/framework" ) @@ -47,7 +46,6 @@ func TestDockerKubernetes123Taints(t *testing.T) { api.WithWorkerNodeGroup(worker1, api.WithCount(1)), api.WithWorkerNodeGroup(worker2, api.WithTaint(framework.PreferNoScheduleTaint()), api.WithCount(1)), ), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runTaintsUpgradeFlow( @@ -59,7 +57,6 @@ func TestDockerKubernetes123Taints(t *testing.T) { api.WithWorkerNodeGroup(worker2, api.WithNoTaints()), api.WithControlPlaneTaints([]corev1.Taint{framework.PreferNoScheduleTaint()}), ), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) } @@ -75,7 +72,6 @@ func TestVSphereKubernetes123Taints(t *testing.T) { api.WithControlPlaneCount(1), api.RemoveAllWorkerNodeGroups(), // This gives us a blank slate ), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runTaintsUpgradeFlow( @@ -87,7 +83,6 @@ func TestVSphereKubernetes123Taints(t *testing.T) { api.WithWorkerNodeGroup(worker2, api.WithNoTaints()), api.WithControlPlaneTaints([]corev1.Taint{framework.PreferNoScheduleTaint()}), ), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) } @@ -103,7 +98,6 @@ func TestVSphereKubernetes123TaintsBottlerocket(t *testing.T) { api.WithControlPlaneCount(1), api.RemoveAllWorkerNodeGroups(), // This gives us a blank slate ), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runTaintsUpgradeFlow( @@ -115,7 +109,6 @@ func TestVSphereKubernetes123TaintsBottlerocket(t *testing.T) { api.WithWorkerNodeGroup(worker2, api.WithNoTaints()), api.WithControlPlaneTaints([]corev1.Taint{framework.PreferNoScheduleTaint()}), ), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) } @@ -145,7 +138,6 @@ func TestSnowKubernetes123TaintsUbuntu(t *testing.T) { api.RemoveAllWorkerNodeGroups(), ), framework.WithEnvVar("SNOW_PROVIDER", "true"), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runTaintsUpgradeFlow( @@ -158,7 +150,6 @@ func TestSnowKubernetes123TaintsUbuntu(t *testing.T) { api.WithControlPlaneTaints([]corev1.Taint{framework.PreferNoScheduleTaint()}), ), framework.WithEnvVar("SNOW_PROVIDER", "true"), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) } diff --git a/test/e2e/upgrade_from_latest_test.go b/test/e2e/upgrade_from_latest_test.go index 01d772d684f1..52a9b8922af4 100644 --- a/test/e2e/upgrade_from_latest_test.go +++ b/test/e2e/upgrade_from_latest_test.go @@ -8,7 +8,6 @@ import ( "github.com/aws/eks-anywhere/internal/pkg/api" anywherev1 "github.com/aws/eks-anywhere/pkg/api/v1alpha1" - "github.com/aws/eks-anywhere/pkg/features" "github.com/aws/eks-anywhere/test/framework" ) @@ -207,7 +206,6 @@ func TestVSphereKubernetes122To123UbuntuUpgradeFromLatestMinorRelease(t *testing framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runUpgradeFromLatestReleaseFlow( test, @@ -216,7 +214,6 @@ func TestVSphereKubernetes122To123UbuntuUpgradeFromLatestMinorRelease(t *testing framework.UpdateUbuntuTemplate123Var(), // Set the template so it doesn't get autoimported ), framework.WithClusterUpgrade(api.WithKubernetesVersion(anywherev1.Kube123)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) } @@ -246,12 +243,10 @@ func TestDockerKubernetes122to123UpgradeFromLatestMinorRelease(t *testing.T) { framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runUpgradeFromLatestReleaseFlow( test, anywherev1.Kube123, framework.WithClusterUpgrade(api.WithKubernetesVersion(anywherev1.Kube123)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) } diff --git a/test/e2e/upgrade_test.go b/test/e2e/upgrade_test.go index 2fcf675015ce..614d18e408a9 100644 --- a/test/e2e/upgrade_test.go +++ b/test/e2e/upgrade_test.go @@ -85,13 +85,11 @@ func TestVSphereKubernetes122UbuntuTo123Upgrade(t *testing.T) { t, provider, framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube122)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runSimpleUpgradeFlow( test, v1alpha1.Kube123, framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube123)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), provider.WithProviderUpgrade(framework.UpdateUbuntuTemplate123Var()), ) } @@ -105,7 +103,6 @@ func TestVSphereKubernetes122UbuntuTo123UpgradeCiliumPolicyEnforcementMode(t *te framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runSimpleUpgradeFlow( test, @@ -113,7 +110,6 @@ func TestVSphereKubernetes122UbuntuTo123UpgradeCiliumPolicyEnforcementMode(t *te framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithClusterFiller(api.WithCiliumPolicyEnforcementMode(v1alpha1.CiliumPolicyModeAlways)), provider.WithProviderUpgrade(framework.UpdateUbuntuTemplate123Var()), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) } @@ -141,7 +137,6 @@ func TestVSphereKubernetes122UbuntuTo123MultipleFieldsUpgrade(t *testing.T) { // Uncomment the network field once upgrade starts working with it // api.WithNetwork(vsphereNetwork2UpdateVar), ), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) } @@ -154,14 +149,12 @@ func TestVSphereKubernetes122UbuntuTo123WithFluxLegacyUpgrade(t *testing.T) { framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runUpgradeFlowWithFlux( test, v1alpha1.Kube123, framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube123)), provider.WithProviderUpgrade(framework.UpdateUbuntuTemplate123Var()), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) } @@ -175,14 +168,12 @@ func TestVSphereKubernetes122UbuntuTo123DifferentNamespaceWithFluxLegacyUpgrade( framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runUpgradeFlowWithFlux( test, v1alpha1.Kube123, framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube123)), provider.WithProviderUpgrade(framework.UpdateUbuntuTemplate123Var()), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) } @@ -194,13 +185,11 @@ func TestVSphereKubernetes123UbuntuControlPlaneNodeUpgrade(t *testing.T) { framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(3)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runSimpleUpgradeFlow( test, v1alpha1.Kube123, framework.WithClusterUpgrade(api.WithControlPlaneCount(3)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) } @@ -212,13 +201,11 @@ func TestVSphereKubernetes123UbuntuWorkerNodeUpgrade(t *testing.T) { framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(3)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runSimpleUpgradeFlow( test, v1alpha1.Kube123, framework.WithClusterUpgrade(api.WithWorkerNodeCount(5)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) } @@ -228,14 +215,12 @@ func TestVSphereKubernetes122BottlerocketTo123Upgrade(t *testing.T) { t, provider, framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube122)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runSimpleUpgradeFlow( test, v1alpha1.Kube123, framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube123)), provider.WithProviderUpgrade(framework.UpdateBottlerocketTemplate123()), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) } @@ -245,7 +230,6 @@ func TestVSphereKubernetes122BottlerocketTo123MultipleFieldsUpgrade(t *testing.T t, provider, framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube122)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runSimpleUpgradeFlow( test, @@ -264,7 +248,6 @@ func TestVSphereKubernetes122BottlerocketTo123MultipleFieldsUpgrade(t *testing.T // Uncomment the network field once upgrade starts working with it // api.WithNetwork(vsphereNetwork2UpdateVar), ), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) } @@ -277,14 +260,12 @@ func TestVSphereKubernetes122BottlerocketTo123WithFluxLegacyUpgrade(t *testing.T framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runUpgradeFlowWithFlux( test, v1alpha1.Kube123, framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube123)), provider.WithProviderUpgrade(framework.UpdateBottlerocketTemplate123()), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) } @@ -298,14 +279,12 @@ func TestVSphereKubernetes122BottlerocketTo123DifferentNamespaceWithFluxLegacyUp framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runUpgradeFlowWithFlux( test, v1alpha1.Kube123, framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube123)), provider.WithProviderUpgrade(framework.UpdateBottlerocketTemplate123()), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) } @@ -317,13 +296,11 @@ func TestVSphereKubernetes123BottlerocketControlPlaneNodeUpgrade(t *testing.T) { framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(3)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runSimpleUpgradeFlow( test, v1alpha1.Kube123, framework.WithClusterUpgrade(api.WithControlPlaneCount(3)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) } @@ -335,13 +312,11 @@ func TestVSphereKubernetes123BottlerocketWorkerNodeUpgrade(t *testing.T) { framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(3)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runSimpleUpgradeFlow( test, v1alpha1.Kube123, framework.WithClusterUpgrade(api.WithWorkerNodeCount(5)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) } @@ -352,13 +327,11 @@ func TestDockerKubernetes122To123StackedEtcdUpgrade(t *testing.T) { provider, framework.WithClusterFiller(api.WithStackedEtcdTopology()), framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube122)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runSimpleUpgradeFlow( test, v1alpha1.Kube123, framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube123)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) } @@ -371,14 +344,12 @@ func TestVSphereKubernetes122UbuntuTo123StackedEtcdUpgrade(t *testing.T) { framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), framework.WithClusterFiller(api.WithStackedEtcdTopology()), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runSimpleUpgradeFlow( test, v1alpha1.Kube123, framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube123)), provider.WithProviderUpgrade(framework.UpdateUbuntuTemplate123Var()), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) } @@ -391,14 +362,12 @@ func TestVSphereKubernetes122BottlerocketTo123StackedEtcdUpgrade(t *testing.T) { framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), framework.WithClusterFiller(api.WithStackedEtcdTopology()), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runSimpleUpgradeFlow( test, v1alpha1.Kube123, framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube123)), provider.WithProviderUpgrade(framework.UpdateBottlerocketTemplate123()), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) } @@ -514,7 +483,6 @@ func TestSnowKubernetes122To123UbuntuMultipleFieldsUpgrade(t *testing.T) { api.WithSnowPhysicalNetworkConnectorForAllMachines(v1alpha1.QSFP), ), framework.WithEnvVar("SNOW_PROVIDER", "true"), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) } diff --git a/test/e2e/vsphere_autoimport_test.go b/test/e2e/vsphere_autoimport_test.go index ebfeddc52cf2..b1c947fc8aad 100644 --- a/test/e2e/vsphere_autoimport_test.go +++ b/test/e2e/vsphere_autoimport_test.go @@ -9,7 +9,6 @@ import ( "github.com/aws/eks-anywhere/internal/pkg/api" "github.com/aws/eks-anywhere/pkg/api/v1alpha1" - "github.com/aws/eks-anywhere/pkg/features" "github.com/aws/eks-anywhere/test/framework" ) @@ -99,7 +98,6 @@ func TestVSphereKubernetes123UbuntuAutoimport(t *testing.T) { t, provider, framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runAutoImportFlow(test, provider) } @@ -160,7 +158,6 @@ func TestVSphereKubernetes123BottlerocketAutoimport(t *testing.T) { t, provider, framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), - framework.WithEnvVar(features.K8s123SupportEnvVar, "true"), ) runAutoImportFlow(test, provider) }