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

🐛 test/e2e: use topology cluster-template for clusterctl upgrade mgmt cluster #8311

Merged
merged 1 commit into from
Mar 19, 2023
Merged

🐛 test/e2e: use topology cluster-template for clusterctl upgrade mgmt cluster #8311

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 17 additions & 1 deletion test/e2e/clusterctl_upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ var _ = Describe("When testing clusterctl upgrades (v0.3=>current)", func() {
UpgradeClusterctlVariables: map[string]string{
"CLUSTER_TOPOLOGY": "false",
},
MgmtFlavor: "topology",
WorkloadFlavor: "",
}
})
})
Expand All @@ -54,6 +56,8 @@ var _ = Describe("When testing clusterctl upgrades (v0.4=>current)", func() {
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.8/clusterctl-{OS}-{ARCH}",
InitWithProvidersContract: "v1alpha4",
InitWithKubernetesVersion: "v1.23.13",
MgmtFlavor: "topology",
WorkloadFlavor: "",
}
})
})
Expand All @@ -78,6 +82,8 @@ var _ = Describe("When testing clusterctl upgrades (v1.0=>current)", func() {
// try to deploy the latest version of our test-extension from docker.yaml.
InitWithRuntimeExtensionProviders: []string{},
InitWithKubernetesVersion: "v1.23.13",
MgmtFlavor: "topology",
WorkloadFlavor: "",
}
})
})
Expand All @@ -102,6 +108,10 @@ var _ = Describe("When testing clusterctl upgrades (v1.2=>current)", func() {
// try to deploy the latest version of our test-extension from docker.yaml.
InitWithRuntimeExtensionProviders: []string{},
InitWithKubernetesVersion: "v1.26.0",
// TODO(sbueringer) The topology flavor enables PSA.
// CAPD will only work with PSA after we have a release with https://github.com/kubernetes-sigs/cluster-api/pull/8313.
//MgmtFlavor: "topology",
WorkloadFlavor: "",
}
})
})
Expand All @@ -126,7 +136,10 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.2=>cur
// try to deploy the latest version of our test-extension from docker.yaml.
InitWithRuntimeExtensionProviders: []string{},
InitWithKubernetesVersion: "v1.26.0",
WorkloadFlavor: "topology",
// TODO(sbueringer) The topology flavor enables PSA.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I follow-up on this TODO once I'm back from PTO in April

// CAPD will only work with PSA after we have a release with https://github.com/kubernetes-sigs/cluster-api/pull/8313.
//MgmtFlavor: "topology",
WorkloadFlavor: "topology",
}
})
})
Expand All @@ -142,6 +155,8 @@ var _ = Describe("When testing clusterctl upgrades (v1.3=>current)", func() {
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.0/clusterctl-{OS}-{ARCH}",
InitWithProvidersContract: "v1beta1",
InitWithKubernetesVersion: "v1.26.0",
MgmtFlavor: "topology",
WorkloadFlavor: "",
}
})
})
Expand All @@ -157,6 +172,7 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.3=>cur
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.0/clusterctl-{OS}-{ARCH}",
InitWithProvidersContract: "v1beta1",
InitWithKubernetesVersion: "v1.26.0",
MgmtFlavor: "topology",
WorkloadFlavor: "topology",
}
})
Expand Down