Skip to content

Commit 9128301

Browse files
authored
Merge pull request #2792 from Nordix/lentzi90/docker-cluster
🌱 E2E: Use kind cluster for clusterctl upgrade tests
2 parents 5584da2 + e7c1b8d commit 9128301

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

test/e2e/data/e2e_conf.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ variables:
218218
CNI: "../../data/cni/calico.yaml"
219219
CCM: "../../data/ccm/cloud-controller-manager.yaml"
220220
EXP_CLUSTER_RESOURCE_SET: "true"
221+
IP_FAMILY: "ipv4"
221222
OPENSTACK_BASTION_IMAGE_NAME: "cirros-0.6.1-x86_64-disk"
222223
OPENSTACK_BASTION_IMAGE_URL: https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/cirros/2022-12-05/cirros-0.6.1-x86_64-disk.img
223224
OPENSTACK_BASTION_IMAGE_HASH: 0c839612eb3f2469420f2ccae990827f

test/e2e/suites/e2e/clusterctl_upgrade_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ var _ = Describe("When testing clusterctl upgrades for CAPO (v0.11=>current) and
6868
WorkloadFlavor: shared.FlavorCapiV1Beta1,
6969
InitWithKubernetesVersion: e2eCtx.E2EConfig.MustGetVariable(shared.KubernetesVersion),
7070
InitWithRuntimeExtensionProviders: []string{"openstack-resource-controller:v1.0.2"},
71+
UseKindForManagementCluster: true,
7172
}
7273
})
7374
})
@@ -102,6 +103,7 @@ var _ = Describe("When testing clusterctl upgrades for CAPO (v0.12=>current) and
102103
WorkloadFlavor: shared.FlavorCapiV1Beta1,
103104
InitWithKubernetesVersion: e2eCtx.E2EConfig.MustGetVariable(shared.KubernetesVersion),
104105
InitWithRuntimeExtensionProviders: []string{"openstack-resource-controller:v1.0.2"},
106+
UseKindForManagementCluster: true,
105107
}
106108
})
107109
})
@@ -136,6 +138,7 @@ var _ = Describe("When testing clusterctl upgrades for CAPO (v0.13=>current) and
136138
WorkloadFlavor: shared.FlavorDefault,
137139
InitWithKubernetesVersion: e2eCtx.E2EConfig.MustGetVariable(shared.KubernetesVersion),
138140
InitWithRuntimeExtensionProviders: []string{"openstack-resource-controller:v1.0.2"},
141+
UseKindForManagementCluster: true,
139142
}
140143
})
141144
})

0 commit comments

Comments
 (0)