Set LicenseToken field only when version is greater than v0.22

cmd/integration_test/build/buildspecs/quick-test-eks-a-cli.yml

@@ -265,4 +265,4 @@ reports:
   e2e-reports:
     files:
       - reports/junit-testing-*.xml
-    file-format: "JUNITXML"
+    file-format: "JUNITXML"

test/e2e/side_effects.go

@@ -41,6 +41,11 @@ func runFlowUpgradeManagementClusterCheckForSideEffects(test *framework.Multiclu
 	printStateOfMachines(test.ManagementCluster.ClusterConfig.Cluster, preUpgradeWorkloadClustersState)
 
 	test.T.Logf("Upgrading management cluster with EKS-A version %s", newEKSA.Version())
+
+	// Since we do not generate cluster config from the new binary and update the existing cluster config,
+	// we will need to manually add the license token for upgrade tests as long as the latest minor is 'v0.21.*'.
+	licenseToken := os.Getenv(framework.LicenseTokenEnvVar)
+	test.ManagementCluster.ClusterConfig.Cluster.Spec.LicenseToken = licenseToken
 	test.ManagementCluster.UpgradeClusterWithNewConfig(clusterOpts, framework.ExecuteWithBinary(newEKSA))
 
 	checker := machineSideEffectChecker{

test/framework/cluster.go

@@ -69,6 +69,7 @@ const (
 	hardwareCsvPath                        = "hardware.csv"
 	EksaPackagesInstallation               = "eks-anywhere-packages"
 	bundleReleasePathFromArtifacts         = "./eks-anywhere-downloads/bundle-release.yaml"
+	releaseV022                            = "v0.22.0"
 )
 
 //go:embed testdata/oidc-roles.yaml
@@ -144,11 +145,6 @@ func NewClusterE2ETest(t T, provider Provider, opts ...ClusterE2ETestOpt) *Clust
 
 	e.ClusterConfigLocation = filepath.Join(e.ClusterConfigFolder, e.ClusterName+"-eks-a.yaml")
 
-	licenseToken := getLicenseToken()
-	if licenseToken != "" {
-		e.clusterFillers = append(e.clusterFillers, api.WithLicenseToken(licenseToken))
-	}
-
 	if err := os.MkdirAll(e.ClusterConfigFolder, os.ModePerm); err != nil {
 		t.Fatalf("Failed creating cluster config folder for test: %s", err)
 	}
@@ -357,6 +353,10 @@ type Provider interface {
 }
 
 func (e *ClusterE2ETest) GenerateClusterConfig(opts ...CommandOpt) {
+	licenseToken := getLicenseToken()
+	if licenseToken != "" {
+		e.clusterFillers = append(e.clusterFillers, api.WithLicenseToken(licenseToken))
+	}
 	e.GenerateClusterConfigForVersion("", opts...)
 }
 
@@ -481,9 +481,23 @@ func (e *ClusterE2ETest) generateHardwareConfig(opts ...CommandOpt) {
 func (e *ClusterE2ETest) GenerateClusterConfigForVersion(eksaVersion string, opts ...CommandOpt) {
 	e.generateClusterConfigObjects(opts...)
 	if eksaVersion != "" {
-		err := cleanUpClusterForVersion(e.ClusterConfig, eksaVersion)
+		// LicenseToken field was introduced in cluster spec only in release-22
+		// attempting to populate the field for any prior versions would break the api.
+		// We will need the conditional check as long as the latest minor is 'v0.21.*'.
+		currentSemver, err := semver.New(eksaVersion)
 		if err != nil {
-			e.T.Fatal(err)
+			e.T.Fatal("parsing esk-a version", err)
+		}
+		semverV022, err := semver.New(releaseV022)
+		if err != nil {
+			e.T.Fatal("parsing esk-a version", err)
+		}
+
+		if currentSemver.Compare(semverV022) != -1 {
+			licenseToken := getLicenseToken()
+			if licenseToken != "" {
+				e.clusterFillers = append(e.clusterFillers, api.WithLicenseToken(licenseToken))
+			}
 		}
 	}