From 9dbe868d3e70af7491f9c5dd2a7919dc8682af41 Mon Sep 17 00:00:00 2001 From: Hui Chen Date: Tue, 11 Jan 2022 14:34:12 +0800 Subject: [PATCH 1/2] Handle bundleLookupTag in e2e tests Signed-off-by: Hui Chen --- test/e2e/config/provider.yaml | 1 + .../infrastructure-provider-byoh/v1beta1/cluster-template.yaml | 2 +- .../infrastructure-provider-byoh/v1beta1/cluster-with-kcp.yaml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/e2e/config/provider.yaml b/test/e2e/config/provider.yaml index 7e8db9ebd..e44e99a17 100644 --- a/test/e2e/config/provider.yaml +++ b/test/e2e/config/provider.yaml @@ -95,6 +95,7 @@ variables: NODE_DRAIN_TIMEOUT: "60s" # NOTE: INIT_WITH_BINARY is used only by the clusterctl upgrade test to initialize the management cluster to be upgraded INIT_WITH_BINARY: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.0.0/clusterctl-{OS}-{ARCH}" + BUNDLE_LOOKUP_TAG: "v0.1.0_alpha.2" intervals: default/wait-controllers: ["3m", "10s"] diff --git a/test/e2e/data/infrastructure-provider-byoh/v1beta1/cluster-template.yaml b/test/e2e/data/infrastructure-provider-byoh/v1beta1/cluster-template.yaml index 3e3c4a307..1283c619a 100644 --- a/test/e2e/data/infrastructure-provider-byoh/v1beta1/cluster-template.yaml +++ b/test/e2e/data/infrastructure-provider-byoh/v1beta1/cluster-template.yaml @@ -184,7 +184,7 @@ metadata: name: ${CLUSTER_NAME} spec: bundleLookupBaseRegistry: projects.registry.vmware.com/cluster_api_provider_bringyourownhost - bundleLookupTag: v0.1.0_alpha.2 + bundleLookupTag: ${BUNDLE_LOOKUP_TAG} controlPlaneEndpoint: host: ${CONTROL_PLANE_ENDPOINT_IP} port: 6443 diff --git a/test/e2e/data/infrastructure-provider-byoh/v1beta1/cluster-with-kcp.yaml b/test/e2e/data/infrastructure-provider-byoh/v1beta1/cluster-with-kcp.yaml index 02e70b7e7..aae48f430 100644 --- a/test/e2e/data/infrastructure-provider-byoh/v1beta1/cluster-with-kcp.yaml +++ b/test/e2e/data/infrastructure-provider-byoh/v1beta1/cluster-with-kcp.yaml @@ -28,7 +28,7 @@ metadata: name: ${CLUSTER_NAME} spec: bundleLookupBaseRegistry: projects.registry.vmware.com/cluster_api_provider_bringyourownhost - bundleLookupTag: v0.1.0_alpha.2 + bundleLookupTag: ${BUNDLE_LOOKUP_TAG} controlPlaneEndpoint: host: ${CONTROL_PLANE_ENDPOINT_IP} port: 6443 From 02259d4e419f14594c39383b26b6713508c11deb Mon Sep 17 00:00:00 2001 From: chen hui Date: Wed, 12 Jan 2022 06:17:21 +0000 Subject: [PATCH 2/2] update document Signed-off-by: chen hui --- docs/local_dev.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/local_dev.md b/docs/local_dev.md index ca5331904..e93ee753c 100644 --- a/docs/local_dev.md +++ b/docs/local_dev.md @@ -135,6 +135,7 @@ export KUBERNETES_VERSION="v1.22.3" export CONTROL_PLANE_MACHINE_COUNT=1 export WORKER_MACHINE_COUNT=1 export CONTROL_PLANE_ENDPOINT_IP= +export BUNDLE_LOOKUP_TAG= ``` From ```cluster-api-provider-bringyourownhost``` folder