Skip to content

Commit

Permalink
Merge pull request #8311 from sbueringer/pr-fix-clusterctl-upgrade
Browse files Browse the repository at this point in the history
🐛 test/e2e: use topology cluster-template for clusterctl upgrade mgmt cluster
  • Loading branch information
k8s-ci-robot authored Mar 19, 2023
2 parents 96e4fd6 + 99761eb commit e7589e1
Showing 1 changed file with 17 additions and 1 deletion.
18 changes: 17 additions & 1 deletion test/e2e/clusterctl_upgrade_test.go
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.
// 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

0 comments on commit e7589e1

Please sign in to comment.