wait clustermanager is applied

Signed-off-by: Zhiwei Yin <[email protected]>

Author: zhiweiyin318

test/e2e/clusteradm/addon_create_test.go

@@ -4,6 +4,7 @@ package clusteradme2e
 import (
 	"context"
 	"fmt"
+	"open-cluster-management.io/clusteradm/test/e2e/util"
 	"time"
 
 	"github.com/onsi/ginkgo/v2"
@@ -35,6 +36,8 @@ var _ = ginkgo.Describe("test clusteradm with addon create", func() {
 			)
 			gomega.Expect(err).NotTo(gomega.HaveOccurred(), "clusteradm init error")
 
+			util.WaitClusterManagerApplied(operatorClient)
+
 			ginkgo.By("managedcluster1 join hub")
 			err = e2e.Clusteradm().Join(
 				"--context", e2e.Cluster().ManagedCluster1().Context(),

test/e2e/clusteradm/init_test.go

@@ -33,6 +33,8 @@ var _ = ginkgo.Describe("test clusteradm with bootstrap token in singleton mode"
 			cm, err := operatorClient.OperatorV1().ClusterManagers().Get(context.TODO(), "cluster-manager", metav1.GetOptions{})
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 
+			util.WaitClusterManagerApplied(operatorClient)
+
 			// 2 featureGates: DefaultClusterSet and ResourceCleanup
 			gomega.Expect(len(cm.Spec.RegistrationConfiguration.FeatureGates)).Should(gomega.Equal(2))
 

test/e2e/clusteradm/joinhubscenario_annotate_test.go

@@ -30,6 +30,8 @@ var _ = ginkgo.Describe("test clusteradm join with annotations", func() {
 			)
 			gomega.Expect(err).NotTo(gomega.HaveOccurred(), "clusteradm init error")
 
+			util.WaitClusterManagerApplied(operatorClient)
+
 			ginkgo.By("managedcluster1 join hub with annotations")
 			err = e2e.Clusteradm().Join(
 				"--context", e2e.Cluster().ManagedCluster1().Context(),

test/e2e/clusteradm/joinhubscenario_bootstraptoken_singleton_test.go

@@ -28,6 +28,8 @@ var _ = ginkgo.Describe("test clusteradm with bootstrap token in singleton mode"
 			)
 			gomega.Expect(err).NotTo(gomega.HaveOccurred(), "clusteradm init error")
 
+			util.WaitClusterManagerApplied(operatorClient)
+
 			ginkgo.By("managedcluster1 join hub")
 			err = e2e.Clusteradm().Join(
 				"--context", e2e.Cluster().ManagedCluster1().Context(),

test/e2e/clusteradm/joinhubscenario_bootstrsptoken_test.go

@@ -4,6 +4,7 @@ package clusteradme2e
 import (
 	"github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
+	"open-cluster-management.io/clusteradm/test/e2e/util"
 )
 
 var _ = ginkgo.Describe("test clusteradm with bootstrap token", func() {
@@ -26,6 +27,8 @@ var _ = ginkgo.Describe("test clusteradm with bootstrap token", func() {
 			)
 			gomega.Expect(err).NotTo(gomega.HaveOccurred(), "clusteradm init error")
 
+			util.WaitClusterManagerApplied(operatorClient)
+
 			ginkgo.By("managedcluster1 join hub")
 			err = e2e.Clusteradm().Join(
 				"--context", e2e.Cluster().ManagedCluster1().Context(),

test/e2e/clusteradm/joinhubscenario_sa_test.go

@@ -4,6 +4,7 @@ package clusteradme2e
 import (
 	"github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
+	"open-cluster-management.io/clusteradm/test/e2e/util"
 )
 
 var _ = ginkgo.Describe("test clusteradm with service account", func() {
@@ -25,6 +26,8 @@ var _ = ginkgo.Describe("test clusteradm with service account", func() {
 			)
 			gomega.Expect(err).NotTo(gomega.HaveOccurred(), "clusteradm init error")
 
+			util.WaitClusterManagerApplied(operatorClient)
+
 			ginkgo.By("managedcluster1 join hub")
 			err = e2e.Clusteradm().Join(
 				"--context", e2e.Cluster().ManagedCluster1().Context(),

test/e2e/clusteradm/joinhubscenario_timeout_test.go

@@ -4,6 +4,7 @@ package clusteradme2e
 import (
 	"github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
+	"open-cluster-management.io/clusteradm/test/e2e/util"
 )
 
 var _ = ginkgo.Describe("test clusteradm with timeout", func() {
@@ -25,6 +26,8 @@ var _ = ginkgo.Describe("test clusteradm with timeout", func() {
 			)
 			gomega.Expect(err).NotTo(gomega.HaveOccurred(), "clusteradm init error")
 
+			util.WaitClusterManagerApplied(operatorClient)
+
 			ginkgo.By("managedcluster1 join hub")
 			err = e2e.Clusteradm().Join(
 				"--context", e2e.Cluster().ManagedCluster1().Context(),

test/e2e/util/helper.go

@@ -8,17 +8,19 @@ import (
 	"os"
 	"time"
 
-	"k8s.io/apimachinery/pkg/api/meta"
-	clusterapiv1 "open-cluster-management.io/api/cluster/v1"
-	"open-cluster-management.io/clusteradm/pkg/config"
-
+	"github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	clusterclient "open-cluster-management.io/api/client/cluster/clientset/versioned"
+	operatorclient "open-cluster-management.io/api/client/operator/clientset/versioned"
+	clusterapiv1 "open-cluster-management.io/api/cluster/v1"
+	operatorv1 "open-cluster-management.io/api/operator/v1"
+	"open-cluster-management.io/clusteradm/pkg/config"
 )
 
 // WaitNamespaceDeleted receive a kubeconfigpath, a context name and a namespace name,
@@ -153,3 +155,16 @@ func NewTestImagePullCredentialFile(fileName string) string {
 func CleanupTestImagePullCredentialFile(fileName string) {
 	_ = os.Remove(fileName)
 }
+
+func WaitClusterManagerApplied(operatorClient operatorclient.Interface) {
+	gomega.Eventually(func() error {
+		cm, err := operatorClient.OperatorV1().ClusterManagers().Get(context.TODO(), "cluster-manager", metav1.GetOptions{})
+		if err != nil {
+			return err
+		}
+		if meta.IsStatusConditionTrue(cm.Status.Conditions, operatorv1.ConditionClusterManagerApplied) {
+			return nil
+		}
+		return fmt.Errorf("wait the cluster manager applied condition to be true")
+	}, time.Second*60, time.Second*2).Should(gomega.Succeed())
+}