Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1 28 snow #6777

Merged
merged 2 commits into from
Oct 6, 2023
Merged

1 28 snow #6777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dde6d3b
Add 1-28 Snow E2E
tatlat Oct 5, 2023
61d6172
update snow skipped tests
tatlat Oct 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions test/e2e/SKIPPED_TESTS.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,31 +36,30 @@ skipped_tests:
# Nutanix

# Snow
- TestSnowKubernetes127UbuntuAWSIamAuth
- TestSnowKubernetes126To127AWSIamAuthUpgrade
- TestSnowKubernetes127UbuntuLabelsUpgradeFlow
- TestSnowKubernetes127UbuntuRemoveWorkerNodeGroups
- TestSnowKubernetes127OIDC
- TestSnowKubernetes127UbuntuProxyConfig
# - TestSnowKubernetes123SimpleFlow
- TestSnowKubernetes128UbuntuAWSIamAuth
- TestSnowKubernetes127To128AWSIamAuthUpgrade
- TestSnowKubernetes128UbuntuLabelsUpgradeFlow
- TestSnowKubernetes128UbuntuRemoveWorkerNodeGroups
- TestSnowKubernetes128OIDC
- TestSnowKubernetes128UbuntuProxyConfig
# - TestSnowKubernetes124SimpleFlow
# - TestSnowKubernetes125SimpleFlow
# - TestSnowKubernetes126SimpleFlow
- TestSnowKubernetes123UbuntuTo124Upgrade
- TestSnowKubernetes127UbuntuTo128Upgrade
- TestSnowKubernetes124UbuntuTo125Upgrade
- TestSnowKubernetes125UbuntuTo126Upgrade
- TestSnowKubernetes126UbuntuTo127Upgrade
- TestSnowKubernetes123BottlerocketTo124Upgrade
- TestSnowKubernetes127BottlerocketTo128Upgrade
- TestSnowKubernetes124BottlerocketTo125Upgrade
- TestSnowKubernetes125BottlerocketTo126Upgrade
- TestSnowKubernetes126BottlerocketTo127Upgrade
- TestSnowKubernetes123To124BottlerocketStaticIPUpgrade
- TestSnowKubernetes127To128BottlerocketStaticIPUpgrade
- TestSnowKubernetes124To125BottlerocketStaticIPUpgrade
- TestSnowKubernetes125To126BottlerocketStaticIPUpgrade
- TestSnowKubernetes126To127BottlerocketStaticIPUpgrade
- TestSnowMulticlusterWorkloadClusterAPI
- TestSnowKubernetes127UbuntuTaintsUpgradeFlow
- TestSnowKubernetes126To127UbuntuMultipleFieldsUpgrade
- TestSnowKubernetes128UbuntuTaintsUpgradeFlow
- TestSnowKubernetes127To128UbuntuMultipleFieldsUpgrade
# Tinkerbell
# Skipping Workload upgrade tests due to hardware limitation
- TestTinkerbellUpgradeMulticlusterWorkloadClusterK8sUpgrade
Expand Down
91 changes: 41 additions & 50 deletions test/e2e/snow_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,33 +15,33 @@ import (
)

// AWS IAM Auth
func TestSnowKubernetes127UbuntuAWSIamAuth(t *testing.T) {
func TestSnowKubernetes128UbuntuAWSIamAuth(t *testing.T) {
test := framework.NewClusterE2ETest(
t,
framework.NewSnow(t, framework.WithSnowUbuntu127()),
framework.NewSnow(t, framework.WithSnowUbuntu128()),
framework.WithAWSIam(),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube127)),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)),
)
runAWSIamAuthFlow(test)
}

func TestSnowKubernetes126To127AWSIamAuthUpgrade(t *testing.T) {
provider := framework.NewSnow(t, framework.WithSnowUbuntu126())
func TestSnowKubernetes127To128AWSIamAuthUpgrade(t *testing.T) {
provider := framework.NewSnow(t, framework.WithSnowUbuntu127())
test := framework.NewClusterE2ETest(
t,
provider,
framework.WithAWSIam(),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube126)),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube127)),
)
runUpgradeFlowWithAWSIamAuth(
test,
v1alpha1.Kube127,
framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube127)),
v1alpha1.Kube128,
framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube128)),
)
}

// Labels
func TestSnowKubernetes127UbuntuLabelsUpgradeFlow(t *testing.T) {
func TestSnowKubernetes128UbuntuLabelsUpgradeFlow(t *testing.T) {
provider := framework.NewSnow(t,
framework.WithSnowWorkerNodeGroup(
worker0,
Expand All @@ -51,22 +51,22 @@ func TestSnowKubernetes127UbuntuLabelsUpgradeFlow(t *testing.T) {
worker1,
framework.WithWorkerNodeGroup(worker1, api.WithCount(1), api.WithLabel(key2, val2)),
),
framework.WithSnowUbuntu127(),
framework.WithSnowUbuntu128(),
)

test := framework.NewClusterE2ETest(
t,
provider,
framework.WithClusterFiller(
api.WithKubernetesVersion(v1alpha1.Kube127),
api.WithKubernetesVersion(v1alpha1.Kube128),
api.WithControlPlaneCount(1),
api.RemoveAllWorkerNodeGroups(),
),
)

runLabelsUpgradeFlow(
test,
v1alpha1.Kube127,
v1alpha1.Kube128,
framework.WithClusterUpgrade(
api.WithWorkerNodeGroup(worker0, api.WithLabel(key1, val2)),
api.WithWorkerNodeGroup(worker1, api.WithLabel(key2, val1)),
Expand All @@ -76,24 +76,24 @@ func TestSnowKubernetes127UbuntuLabelsUpgradeFlow(t *testing.T) {
}

// OIDC
func TestSnowKubernetes127OIDC(t *testing.T) {
func TestSnowKubernetes128OIDC(t *testing.T) {
test := framework.NewClusterE2ETest(
t,
framework.NewSnow(t, framework.WithSnowUbuntu127()),
framework.NewSnow(t, framework.WithSnowUbuntu128()),
framework.WithOIDC(),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube127)),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)),
framework.WithClusterFiller(api.WithControlPlaneCount(1)),
framework.WithClusterFiller(api.WithWorkerNodeCount(1)),
)
runOIDCFlow(test)
}

// Proxy config
func TestSnowKubernetes127UbuntuProxyConfig(t *testing.T) {
func TestSnowKubernetes128UbuntuProxyConfig(t *testing.T) {
test := framework.NewClusterE2ETest(
t,
framework.NewSnow(t, framework.WithSnowUbuntu127()),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube127)),
framework.NewSnow(t, framework.WithSnowUbuntu128()),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)),
framework.WithClusterFiller(api.WithControlPlaneCount(1)),
framework.WithClusterFiller(api.WithWorkerNodeCount(1)),
// TODO: provide separate Proxy Env Vars for Snow provider. Leaving VSphere for backwards compatibility
Expand All @@ -103,15 +103,6 @@ func TestSnowKubernetes127UbuntuProxyConfig(t *testing.T) {
}

// Simpleflow
func TestSnowKubernetes123SimpleFlow(t *testing.T) {
test := framework.NewClusterE2ETest(
t,
framework.NewSnow(t, framework.WithSnowUbuntu123()),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)),
)
runSimpleFlow(test)
}

func TestSnowKubernetes124SimpleFlow(t *testing.T) {
test := framework.NewClusterE2ETest(
t,
Expand Down Expand Up @@ -158,7 +149,7 @@ func TestSnowKubernetes128SimpleFlow(t *testing.T) {
}

// Taints
func TestSnowKubernetes127UbuntuTaintsUpgradeFlow(t *testing.T) {
func TestSnowKubernetes128UbuntuTaintsUpgradeFlow(t *testing.T) {
provider := framework.NewSnow(t,
framework.WithSnowWorkerNodeGroup(
worker0,
Expand All @@ -172,22 +163,22 @@ func TestSnowKubernetes127UbuntuTaintsUpgradeFlow(t *testing.T) {
worker2,
framework.PreferNoScheduleWorkerNodeGroup(worker2, 1),
),
framework.WithSnowUbuntu127(),
framework.WithSnowUbuntu128(),
)

test := framework.NewClusterE2ETest(
t,
provider,
framework.WithClusterFiller(
api.WithKubernetesVersion(v1alpha1.Kube127),
api.WithKubernetesVersion(v1alpha1.Kube128),
api.WithControlPlaneCount(1),
api.RemoveAllWorkerNodeGroups(),
),
)

runTaintsUpgradeFlow(
test,
v1alpha1.Kube127,
v1alpha1.Kube128,
framework.WithClusterUpgrade(
api.WithWorkerNodeGroup(worker0, api.WithTaint(framework.NoExecuteTaint())),
api.WithWorkerNodeGroup(worker1, api.WithTaint(framework.NoExecuteTaint())),
Expand All @@ -198,21 +189,21 @@ func TestSnowKubernetes127UbuntuTaintsUpgradeFlow(t *testing.T) {
}

// Upgrade
func TestSnowKubernetes126To127UbuntuMultipleFieldsUpgrade(t *testing.T) {
provider := framework.NewSnow(t, framework.WithSnowUbuntu126())
func TestSnowKubernetes127To128UbuntuMultipleFieldsUpgrade(t *testing.T) {
provider := framework.NewSnow(t, framework.WithSnowUbuntu127())
test := framework.NewClusterE2ETest(
t,
provider,
framework.WithClusterFiller(
api.WithKubernetesVersion(v1alpha1.Kube126),
api.WithKubernetesVersion(v1alpha1.Kube127),
api.WithControlPlaneCount(3),
api.WithWorkerNodeCount(1),
),
)
runSimpleUpgradeFlow(
test,
v1alpha1.Kube127,
framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube127)),
framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube128)),
framework.WithClusterFiller(
api.WithControlPlaneCount(1),
api.WithWorkerNodeCount(2),
Expand All @@ -224,7 +215,7 @@ func TestSnowKubernetes126To127UbuntuMultipleFieldsUpgrade(t *testing.T) {
)
}

func TestSnowKubernetes127UbuntuRemoveWorkerNodeGroups(t *testing.T) {
func TestSnowKubernetes128UbuntuRemoveWorkerNodeGroups(t *testing.T) {
provider := framework.NewSnow(t,
framework.WithSnowWorkerNodeGroup(
worker0,
Expand All @@ -234,21 +225,21 @@ func TestSnowKubernetes127UbuntuRemoveWorkerNodeGroups(t *testing.T) {
worker1,
framework.WithWorkerNodeGroup(worker1, api.WithCount(1)),
),
framework.WithSnowUbuntu127(),
framework.WithSnowUbuntu128(),
)
test := framework.NewClusterE2ETest(
t,
provider,
framework.WithClusterFiller(
api.WithKubernetesVersion(v1alpha1.Kube127),
api.WithKubernetesVersion(v1alpha1.Kube128),
api.WithControlPlaneCount(1),
api.RemoveAllWorkerNodeGroups(),
),
)

runSimpleUpgradeFlow(
test,
v1alpha1.Kube127,
v1alpha1.Kube128,
framework.WithClusterUpgrade(
api.RemoveWorkerNodeGroup(worker1),
api.WithWorkerNodeGroup(worker0, api.WithCount(1)),
Expand All @@ -263,11 +254,11 @@ func TestSnowKubernetes127UbuntuRemoveWorkerNodeGroups(t *testing.T) {
)
}

func TestSnowKubernetes123UbuntuTo124Upgrade(t *testing.T) {
func TestSnowKubernetes127UbuntuTo128Upgrade(t *testing.T) {
snow := framework.NewSnow(t)
test := framework.NewClusterE2ETest(t, snow)

runSnowUpgradeTest(test, snow, snow.WithUbuntu123(), snow.WithUbuntu124())
runSnowUpgradeTest(test, snow, snow.WithUbuntu127(), snow.WithUbuntu128())
}

func TestSnowKubernetes124UbuntuTo125Upgrade(t *testing.T) {
Expand All @@ -291,11 +282,11 @@ func TestSnowKubernetes126UbuntuTo127Upgrade(t *testing.T) {
runSnowUpgradeTest(test, snow, snow.WithUbuntu126(), snow.WithUbuntu127())
}

func TestSnowKubernetes123BottlerocketTo124Upgrade(t *testing.T) {
func TestSnowKubernetes127BottlerocketTo128Upgrade(t *testing.T) {
snow := framework.NewSnow(t)
test := framework.NewClusterE2ETest(t, snow)

runSnowUpgradeTest(test, snow, snow.WithBottlerocket123(), snow.WithBottlerocket124())
runSnowUpgradeTest(test, snow, snow.WithBottlerocket127(), snow.WithBottlerocket128())
}

func TestSnowKubernetes124BottlerocketTo125Upgrade(t *testing.T) {
Expand All @@ -319,11 +310,11 @@ func TestSnowKubernetes126BottlerocketTo127Upgrade(t *testing.T) {
runSnowUpgradeTest(test, snow, snow.WithBottlerocket126(), snow.WithBottlerocket127())
}

func TestSnowKubernetes123To124BottlerocketStaticIPUpgrade(t *testing.T) {
func TestSnowKubernetes127To128BottlerocketStaticIPUpgrade(t *testing.T) {
snow := framework.NewSnow(t)
test := framework.NewClusterE2ETest(t, snow)

runSnowUpgradeTest(test, snow, snow.WithBottlerocketStaticIP123(), snow.WithBottlerocketStaticIP124())
runSnowUpgradeTest(test, snow, snow.WithBottlerocketStaticIP127(), snow.WithBottlerocketStaticIP128())
}

func TestSnowKubernetes124To125BottlerocketStaticIPUpgrade(t *testing.T) {
Expand Down Expand Up @@ -358,7 +349,7 @@ func TestSnowMulticlusterWorkloadClusterAPI(t *testing.T) {
api.WithWorkerNodeCount(1),
api.WithStackedEtcdTopology(),
),
snow.WithBottlerocket124(),
snow.WithBottlerocket126(),
)
test := framework.NewMulticlusterE2ETest(t, managementCluster)
test.WithWorkloadClusters(
Expand All @@ -371,7 +362,7 @@ func TestSnowMulticlusterWorkloadClusterAPI(t *testing.T) {
api.WithWorkerNodeCount(1),
api.WithStackedEtcdTopology(),
),
snow.WithBottlerocket123(),
snow.WithBottlerocket125(),
),
framework.NewClusterE2ETest(
t, snow, framework.WithClusterName(test.NewWorkloadClusterName()),
Expand All @@ -382,7 +373,7 @@ func TestSnowMulticlusterWorkloadClusterAPI(t *testing.T) {
api.WithWorkerNodeCount(1),
api.WithStackedEtcdTopology(),
),
snow.WithBottlerocket124(),
snow.WithBottlerocket126(),
),
framework.NewClusterE2ETest(
t, snow, framework.WithClusterName(test.NewWorkloadClusterName()),
Expand All @@ -393,7 +384,7 @@ func TestSnowMulticlusterWorkloadClusterAPI(t *testing.T) {
api.WithWorkerNodeCount(1),
api.WithStackedEtcdTopology(),
),
snow.WithBottlerocket125(),
snow.WithBottlerocket127(),
),
framework.NewClusterE2ETest(
t, snow, framework.WithClusterName(test.NewWorkloadClusterName()),
Expand All @@ -404,7 +395,7 @@ func TestSnowMulticlusterWorkloadClusterAPI(t *testing.T) {
api.WithWorkerNodeCount(1),
api.WithStackedEtcdTopology(),
),
snow.WithBottlerocket126(),
snow.WithBottlerocket128(),
),
)
test.CreateManagementCluster()
Expand Down