Add wait for api server available

kubernetes-sigs · Jan 19, 2024 · 875c7f6 · 875c7f6
1 parent 569a99c
commit 875c7f6
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/test/e2e/common.go b/test/e2e/common.go
@@ -25,6 +25,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	"github.com/onsi/ginkgo/v2/types"
 	. "github.com/onsi/gomega"
+	corev1 "k8s.io/api/core/v1"
 	kubeadmv1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1"
 	"sigs.k8s.io/cluster-api/test/framework"
 	"sigs.k8s.io/cluster-api/test/framework/clusterctl"
@@ -54,14 +55,14 @@ func EnsureControlPlaneInitialized(ctx context.Context, input clusterctl.ApplyCu
 		g.Expect(kubeadmControlPlane.Status.Initialized).To(BeTrue(), "KubeadmControlPlane is not yet initialized")
 	}, input.WaitForControlPlaneIntervals...).Should(Succeed(), "KubeadmControlPlane object %s/%s was not initialized in time", cluster.Spec.ControlPlaneRef.Namespace, cluster.Spec.ControlPlaneRef.Name)
 
-	// By("Ensuring API Server is reachable before applying Helm charts")
-	// Eventually(func(g Gomega) {
-	// 	ns := &corev1.Namespace{}
-	// 	clusterProxy := input.ClusterProxy.GetWorkloadCluster(ctx, input.Namespace, input.ClusterName)
-	// 	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("Ensuring API Server is reachable before querying Helm charts")
+	Eventually(func(g Gomega) {
+		ns := &corev1.Namespace{}
+		clusterProxy := input.ClusterProxy.GetWorkloadCluster(ctx, input.Namespace, input.ClusterName)
+		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")
+	By("Ensure calico is ready after control plane is initialized")
 	EnsureCalicoIsReady(ctx, input, result)
 
 	result.ControlPlane = framework.DiscoveryAndWaitForControlPlaneInitialized(ctx, framework.DiscoveryAndWaitForControlPlaneInitializedInput{