Skip to content

Commit

Permalink
Add 1.28 Nutanix E2E (#6775)
Browse files Browse the repository at this point in the history 
* Add 1.28 Nutanix E2E

* update 1.28 nutanix integration test buildspecs
  • Loading branch information
@tatlat
tatlat authored Oct 6, 2023
1 parent 0ef99c3 commit cb73279
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 57 deletions.
1 change: 1 addition & 0 deletions cmd/integration_test/build/buildspecs/conformance-eks-a-cli.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ env:
T_NUTANIX_TEMPLATE_NAME_UBUNTU_1_25: "nutanix_ci:nutanix_template_ubuntu_1_25"
T_NUTANIX_TEMPLATE_NAME_UBUNTU_1_26: "nutanix_ci:nutanix_template_ubuntu_1_26"
T_NUTANIX_TEMPLATE_NAME_UBUNTU_1_27: "nutanix_ci:nutanix_template_ubuntu_1_27"
T_NUTANIX_TEMPLATE_NAME_UBUNTU_1_28: "nutanix_ci:nutanix_template_ubuntu_1_28"
phases:
pre_build:
commands:
Expand Down
1 change: 1 addition & 0 deletions cmd/integration_test/build/buildspecs/nutanix-test-eks-a-cli.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ env:
T_NUTANIX_TEMPLATE_NAME_UBUNTU_1_25: "nutanix_ci:nutanix_template_ubuntu_1_25"
T_NUTANIX_TEMPLATE_NAME_UBUNTU_1_26: "nutanix_ci:nutanix_template_ubuntu_1_26"
T_NUTANIX_TEMPLATE_NAME_UBUNTU_1_27: "nutanix_ci:nutanix_template_ubuntu_1_27"
T_NUTANIX_TEMPLATE_NAME_UBUNTU_1_28: "nutanix_ci:nutanix_template_ubuntu_1_28"
phases:
pre_build:
commands:
Expand Down
114 changes: 57 additions & 57 deletions test/e2e/nutanix_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,84 +301,84 @@ func TestNutanixKubernetes124UbuntuCuratedPackagesClusterAutoscalerSimpleFlow(t
runAutoscalerWithMetricsServerSimpleFlow(test)
}

func TestNutanixKubernetes123UbuntuCuratedPackagesSimpleFlow(t *testing.T) {
func TestNutanixKubernetes128UbuntuCuratedPackagesSimpleFlow(t *testing.T) {
test := framework.NewClusterE2ETest(t,
framework.NewNutanix(t, framework.WithUbuntu123Nutanix()),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)),
framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube123),
framework.NewNutanix(t, framework.WithUbuntu128Nutanix()),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)),
framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube128),
EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI,
EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil),
)
runCuratedPackageInstallSimpleFlow(test)
}

func TestNutanixKubernetes123UbuntuCuratedPackagesEmissarySimpleFlow(t *testing.T) {
func TestNutanixKubernetes128UbuntuCuratedPackagesEmissarySimpleFlow(t *testing.T) {
framework.CheckCuratedPackagesCredentials(t)
test := framework.NewClusterE2ETest(t,
framework.NewNutanix(t, framework.WithUbuntu123Nutanix()),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)),
framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube123),
framework.NewNutanix(t, framework.WithUbuntu128Nutanix()),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)),
framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube128),
EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI,
EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil),
)
runCuratedPackageEmissaryInstallSimpleFlow(test)
}

func TestNutanixKubernetes123UbuntuCuratedPackagesHarborSimpleFlow(t *testing.T) {
func TestNutanixKubernetes128UbuntuCuratedPackagesHarborSimpleFlow(t *testing.T) {
test := framework.NewClusterE2ETest(t,
framework.NewNutanix(t, framework.WithUbuntu123Nutanix()),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)),
framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube123),
framework.NewNutanix(t, framework.WithUbuntu128Nutanix()),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)),
framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube128),
EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI,
EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil),
)
runCuratedPackageHarborInstallSimpleFlowLocalStorageProvisioner(test)
}

func TestNutanixKubernetes123UbuntuCuratedPackagesAdotSimpleFlow(t *testing.T) {
func TestNutanixKubernetes128UbuntuCuratedPackagesAdotSimpleFlow(t *testing.T) {
framework.CheckCuratedPackagesCredentials(t)
test := framework.NewClusterE2ETest(t,
framework.NewNutanix(t, framework.WithUbuntu123Nutanix()),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)),
framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube123),
framework.NewNutanix(t, framework.WithUbuntu128Nutanix()),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)),
framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube128),
EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI,
EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil),
)
runCuratedPackagesAdotInstallSimpleFlow(test)
}

func TestNutanixKubernetes123UbuntuCuratedPackagesPrometheusSimpleFlow(t *testing.T) {
func TestNutanixKubernetes128UbuntuCuratedPackagesPrometheusSimpleFlow(t *testing.T) {
framework.CheckCuratedPackagesCredentials(t)
test := framework.NewClusterE2ETest(t,
framework.NewNutanix(t, framework.WithUbuntu123Nutanix()),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)),
framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube123),
framework.NewNutanix(t, framework.WithUbuntu128Nutanix()),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)),
framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube128),
EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI,
EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil),
)
runCuratedPackagesPrometheusInstallSimpleFlow(test)
}

func TestNutanixKubernetes123UbuntuCuratedPackagesClusterAutoscalerSimpleFlow(t *testing.T) {
func TestNutanixKubernetes128UbuntuCuratedPackagesClusterAutoscalerSimpleFlow(t *testing.T) {
minNodes := 1
maxNodes := 2
framework.CheckCuratedPackagesCredentials(t)
test := framework.NewClusterE2ETest(t,
framework.NewNutanix(t, framework.WithUbuntu123Nutanix()),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123), api.WithWorkerNodeAutoScalingConfig(minNodes, maxNodes)),
framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube123),
framework.NewNutanix(t, framework.WithUbuntu128Nutanix()),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128), api.WithWorkerNodeAutoScalingConfig(minNodes, maxNodes)),
framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube128),
EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI,
EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil),
)
runAutoscalerWithMetricsServerSimpleFlow(test)
}

// Simpleflow
func TestNutanixKubernetes123SimpleFlowWithName(t *testing.T) {
func TestNutanixKubernetes128SimpleFlowWithName(t *testing.T) {
test := framework.NewClusterE2ETest(
t,
framework.NewNutanix(t, framework.WithUbuntu123Nutanix()),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)),
framework.NewNutanix(t, framework.WithUbuntu128Nutanix()),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)),
)
runSimpleFlow(test)
}
Expand Down Expand Up @@ -419,13 +419,13 @@ func TestNutanixKubernetes127SimpleFlowWithName(t *testing.T) {
runSimpleFlow(test)
}

func TestNutanixKubernetes123SimpleFlowWithUUID(t *testing.T) {
func TestNutanixKubernetes128SimpleFlowWithUUID(t *testing.T) {
test := framework.NewClusterE2ETest(
t,
framework.NewNutanix(t, framework.WithUbuntu123NutanixUUID(),
framework.NewNutanix(t, framework.WithUbuntu128NutanixUUID(),
framework.WithPrismElementClusterUUID(),
framework.WithNutanixSubnetUUID()),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)),
)
runSimpleFlow(test)
}
Expand Down Expand Up @@ -475,18 +475,18 @@ func TestNutanixKubernetes127SimpleFlowWithUUID(t *testing.T) {
}

// Upgrade
func TestNutanixKubernetes123To124UbuntuUpgrade(t *testing.T) {
provider := framework.NewNutanix(t, framework.WithUbuntu123Nutanix())
func TestNutanixKubernetes127To128UbuntuUpgrade(t *testing.T) {
provider := framework.NewNutanix(t, framework.WithUbuntu127Nutanix())
test := framework.NewClusterE2ETest(
t,
provider,
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube127)),
)
runSimpleUpgradeFlow(
test,
v1alpha1.Kube124,
framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube124)),
provider.WithProviderUpgrade(provider.Ubuntu124Template()),
framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube128)),
provider.WithProviderUpgrade(provider.Ubuntu128Template()),
)
}

Expand Down Expand Up @@ -541,18 +541,18 @@ func TestNutanixKubernetes126To127UbuntuUpgrade(t *testing.T) {
)
}

func TestNutanixKubernetes123UbuntuWorkerNodeScaleUp1To3(t *testing.T) {
provider := framework.NewNutanix(t, framework.WithUbuntu123Nutanix())
func TestNutanixKubernetes128UbuntuWorkerNodeScaleUp1To3(t *testing.T) {
provider := framework.NewNutanix(t, framework.WithUbuntu128Nutanix())
test := framework.NewClusterE2ETest(
t,
provider,
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)),
framework.WithClusterFiller(api.WithControlPlaneCount(1)),
framework.WithClusterFiller(api.WithWorkerNodeCount(1)),
)
runSimpleUpgradeFlow(
test,
v1alpha1.Kube123,
v1alpha1.Kube128,
framework.WithClusterUpgrade(api.WithWorkerNodeCount(3)),
)
}
Expand Down Expand Up @@ -624,19 +624,19 @@ func TestNutanixKubernetes127UbuntuWorkerNodeScaleUp1To3(t *testing.T) {
)
}

func TestNutanixKubernetes123UbuntuControlPlaneNodeScaleUp1To3(t *testing.T) {
provider := framework.NewNutanix(t, framework.WithUbuntu123Nutanix())
func TestNutanixKubernetes128UbuntuControlPlaneNodeScaleUp1To3(t *testing.T) {
provider := framework.NewNutanix(t, framework.WithUbuntu128Nutanix())
test := framework.NewClusterE2ETest(
t,
provider,
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)),
framework.WithClusterFiller(api.WithControlPlaneCount(1)),
framework.WithClusterFiller(api.WithWorkerNodeCount(1)),
framework.WithEnvVar("features.NutanixProviderEnvVar", "true"),
)
runSimpleUpgradeFlow(
test,
v1alpha1.Kube123,
v1alpha1.Kube128,
framework.WithClusterFiller(api.WithControlPlaneCount(3)),
)
}
Expand Down Expand Up @@ -709,18 +709,18 @@ func TestNutanixKubernetes127UbuntuControlPlaneNodeScaleUp1To3(t *testing.T) {
)
}

func TestNutanixKubernetes123UbuntuWorkerNodeScaleDown3To1(t *testing.T) {
provider := framework.NewNutanix(t, framework.WithUbuntu123Nutanix())
func TestNutanixKubernetes128UbuntuWorkerNodeScaleDown3To1(t *testing.T) {
provider := framework.NewNutanix(t, framework.WithUbuntu128Nutanix())
test := framework.NewClusterE2ETest(
t,
provider,
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)),
framework.WithClusterFiller(api.WithControlPlaneCount(1)),
framework.WithClusterFiller(api.WithWorkerNodeCount(3)),
)
runSimpleUpgradeFlow(
test,
v1alpha1.Kube123,
v1alpha1.Kube128,
framework.WithClusterUpgrade(api.WithWorkerNodeCount(1)),
)
}
Expand Down Expand Up @@ -792,18 +792,18 @@ func TestNutanixKubernetes127UbuntuWorkerNodeScaleDown3To1(t *testing.T) {
)
}

func TestNutanixKubernetes123UbuntuControlPlaneNodeScaleDown3To1(t *testing.T) {
provider := framework.NewNutanix(t, framework.WithUbuntu123Nutanix())
func TestNutanixKubernetes128UbuntuControlPlaneNodeScaleDown3To1(t *testing.T) {
provider := framework.NewNutanix(t, framework.WithUbuntu128Nutanix())
test := framework.NewClusterE2ETest(
t,
provider,
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)),
framework.WithClusterFiller(api.WithControlPlaneCount(3)),
framework.WithClusterFiller(api.WithWorkerNodeCount(1)),
)
runSimpleUpgradeFlow(
test,
v1alpha1.Kube123,
v1alpha1.Kube128,
framework.WithClusterFiller(api.WithControlPlaneCount(1)),
)
}
Expand Down Expand Up @@ -876,12 +876,12 @@ func TestNutanixKubernetes127UbuntuControlPlaneNodeScaleDown3To1(t *testing.T) {
}

// OIDC Tests
func TestNutanixKubernetes123OIDC(t *testing.T) {
func TestNutanixKubernetes128OIDC(t *testing.T) {
test := framework.NewClusterE2ETest(
t,
framework.NewNutanix(t, framework.WithUbuntu123Nutanix()),
framework.NewNutanix(t, framework.WithUbuntu128Nutanix()),
framework.WithOIDC(),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)),
framework.WithClusterFiller(api.WithControlPlaneCount(1)),
framework.WithClusterFiller(api.WithWorkerNodeCount(1)),
)
Expand Down Expand Up @@ -937,12 +937,12 @@ func TestNutanixKubernetes127OIDC(t *testing.T) {
}

// IAMAuthenticator Tests
func TestNutanixKubernetes123AWSIamAuth(t *testing.T) {
func TestNutanixKubernetes128AWSIamAuth(t *testing.T) {
test := framework.NewClusterE2ETest(
t,
framework.NewNutanix(t, framework.WithUbuntu123Nutanix()),
framework.NewNutanix(t, framework.WithUbuntu128Nutanix()),
framework.WithAWSIam(),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)),
framework.WithClusterFiller(api.WithControlPlaneCount(1)),
framework.WithClusterFiller(api.WithWorkerNodeCount(1)),
)
Expand Down

0 comments on commit cb73279

Please sign in to comment.