From 569a99c926f457b0c8eef5026c4f7af8afdbb11a Mon Sep 17 00:00:00 2001 From: Jont828 Date: Thu, 18 Jan 2024 12:37:39 -0500 Subject: [PATCH] Actually call ensure calico after quick start --- config/default/manager_image_patch.yaml | 2 +- scripts/ci-e2e.sh | 1 - test/e2e/common.go | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/config/default/manager_image_patch.yaml b/config/default/manager_image_patch.yaml index 5366d7d7..64ef7f25 100644 --- a/config/default/manager_image_patch.yaml +++ b/config/default/manager_image_patch.yaml @@ -7,5 +7,5 @@ spec: template: spec: containers: - - image: docker.io/jont828/cluster-api-helm-controller-amd64:20240118172216 + - image: docker.io/jont828/cluster-api-helm-controller-amd64:20240118172356 name: manager diff --git a/scripts/ci-e2e.sh b/scripts/ci-e2e.sh index bdc24030..0e80ef03 100755 --- a/scripts/ci-e2e.sh +++ b/scripts/ci-e2e.sh @@ -40,7 +40,6 @@ fi export GINKGO_NODES=10 -trap capz::ci-e2e::cleanup EXIT # Image is configured as `${CONTROLLER_IMG}-${ARCH}:${TAG}` where `CONTROLLER_IMG` is defaulted to `${REGISTRY}/${IMAGE_NAME}`. if [[ "${BUILD_MANAGER_IMAGE}" == "false" ]]; then # Load an existing image, skip docker-build and docker-push. diff --git a/test/e2e/common.go b/test/e2e/common.go index d8730f71..1ca88aa3 100644 --- a/test/e2e/common.go +++ b/test/e2e/common.go @@ -61,6 +61,9 @@ func EnsureControlPlaneInitialized(ctx context.Context, input clusterctl.ApplyCu // g.Expect(clusterProxy.GetClient().Get(ctx, client.ObjectKey{Name: kubesystem}, ns)).To(Succeed(), "Failed to get kube-system namespace") // }, input.WaitForControlPlaneIntervals...).Should(Succeed(), "API Server was not reachable in time") + By("Ensure calico is ready after control plane is installed") + EnsureCalicoIsReady(ctx, input, result) + result.ControlPlane = framework.DiscoveryAndWaitForControlPlaneInitialized(ctx, framework.DiscoveryAndWaitForControlPlaneInitializedInput{ Lister: input.ClusterProxy.GetClient(), Cluster: result.Cluster, @@ -83,9 +86,6 @@ const ( func EnsureCalicoIsReady(ctx context.Context, input clusterctl.ApplyCustomClusterTemplateAndWaitInput, result *clusterctl.ApplyCustomClusterTemplateAndWaitResult) { specName := "ensure-calico" - // Wait for control plane since the CAAPH install is blocked on the workload cluster kubeconfig being available. - EnsureControlPlaneInitialized(ctx, input, result) - clusterProxy := input.ClusterProxy.GetWorkloadCluster(ctx, input.Namespace, input.ClusterName) By("Waiting for Ready tigera-operator deployment pods")