Skip to content

Commit d3a0402

Browse files
committed
test: workerless upgrade
1 parent 5c7552a commit d3a0402

File tree

4 files changed

+7
-2
lines changed

4 files changed

+7
-2
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ test-e2e: manifests generate fmt vet ginkgo
147147
rm -rf $(ARTIFACTS)
148148

149149
$(KUSTOMIZE) build $(E2E_TEMPLATES)/upgrade --load-restrictor LoadRestrictionsNone > $(E2E_TEMPLATES)/cluster-template-upgrade.yaml
150+
$(KUSTOMIZE) build $(E2E_TEMPLATES)/upgrade-workerless --load-restrictor LoadRestrictionsNone > $(E2E_TEMPLATES)/cluster-template-upgrade-workerless.yaml
150151

151152
@METAL_API_URL=$(E2E_METAL_API_URL) \
152153
METAL_API_HMAC=$(E2E_METAL_API_HMAC) \

test/e2e/frmwrk/cluster_upgrade_kubernetes_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ var _ = Describe("Upgrade Kubernetes Cluster Version", Ordered, Label("upgrade")
5555
cfg.Variables["KUBERNETES_VERSION_UPGRADE_TO"] = toKubernetesVersion
5656
})
5757

58-
Context("rolling upgrade", func() {
58+
Context("rolling workerless upgrade", func() {
5959
capi_e2e_ClusterUpgradeConformanceSpec(ctx, func() capi_e2e.ClusterUpgradeConformanceSpecInput {
6060
Expect(cfg.Variables).NotTo(BeNil(), "E2E config variables map must be initialized")
6161
Expect(cfg.Variables).To(HaveKey("CONTROL_PLANE_IP"))
@@ -69,7 +69,7 @@ var _ = Describe("Upgrade Kubernetes Cluster Version", Ordered, Label("upgrade")
6969
SkipConformanceTests: true,
7070
ControlPlaneMachineCount: ptr.To[int64](1),
7171
WorkerMachineCount: ptr.To[int64](0),
72-
Flavor: ptr.To("upgrade"),
72+
Flavor: ptr.To("upgrade-workerless"),
7373
ControlPlaneWaiters: clusterctl.ControlPlaneWaiters{},
7474
InfrastructureProvider: new(string),
7575
PostNamespaceCreated: func(managementClusterProxy framework.ClusterProxy, workloadClusterNamespace string) {

test/e2e/frmwrk/config/capi-e2e-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ providers:
125125
- sourcePath: "../../../../config/clusterctl-templates/cluster-template-calico.yaml"
126126
- sourcePath: "../../../../config/clusterctl-templates/cluster-template-pre-v1.33.yaml"
127127
- sourcePath: "../data/clusterctl-templates/cluster-template-upgrade.yaml"
128+
- sourcePath: "../data/clusterctl-templates/cluster-template-upgrade-workerless.yaml"
128129
replacements:
129130
- old: --metrics-addr=127.0.0.1:8080
130131
new: --metrics-addr=:8080
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
resources:
2+
- ../../../../../../config/clusterctl-templates/cluster-template-calico.yaml
3+
- ../bases/cluster-template-mt-control-plane-upgrade-to.yaml

0 commit comments

Comments
 (0)