Fix e2e test issue for upgrade

Signed-off-by: Jian Qiu <jqiu@redhat.com>
open-cluster-management-io · Aug 18, 2022 · 45679c8 · 45679c8
1 parent 0646e7d
commit 45679c8
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 12 deletions.
diff --git a/go.mod b/go.mod
@@ -23,6 +23,7 @@ require (
 	k8s.io/component-base v0.24.3
 	k8s.io/klog/v2 v2.60.1
 	k8s.io/kubectl v0.24.3
+	k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
 	open-cluster-management.io/api v0.8.0
 	open-cluster-management.io/cluster-proxy v0.1.2
 	open-cluster-management.io/managed-serviceaccount v0.2.1-0.20220427065210-de6a7b7b5be8
@@ -109,7 +110,6 @@ require (
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 	k8s.io/kube-aggregator v0.24.0 // indirect
-	k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
 	sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
 	sigs.k8s.io/kube-storage-version-migrator v0.0.5 // indirect
 	sigs.k8s.io/kustomize/api v0.11.4 // indirect

diff --git a/test/e2e/clusteradm/joinhubscenario_bootstrsptoken_test.go b/test/e2e/clusteradm/joinhubscenario_bootstrsptoken_test.go
@@ -37,7 +37,7 @@ var _ = ginkgo.Describe("test clusteradm with bootstrap token", func() {
 			ginkgo.By("hub accept managedcluster1")
 			err = e2e.Clusteradm().Accept(
 				"--clusters", e2e.Cluster().ManagedCluster1().Name(),
-				"--wait", "30",
+				"--wait",
 				"--context", e2e.Cluster().Hub().Context(),
 			)
 			gomega.Expect(err).NotTo(gomega.HaveOccurred(), "clusteradm accept error")
@@ -64,7 +64,7 @@ var _ = ginkgo.Describe("test clusteradm with bootstrap token", func() {
 			ginkgo.By("hub accept managedcluster2")
 			err = e2e.Clusteradm().Accept(
 				"--clusters", e2e.Cluster().ManagedCluster2().Name(),
-				"--wait", "30",
+				"--wait",
 				"--context", e2e.Cluster().Hub().Context(),
 			)
 			gomega.Expect(err).NotTo(gomega.HaveOccurred(), "clusteradm accept error")

diff --git a/test/e2e/clusteradm/joinhubscenario_sa_test.go b/test/e2e/clusteradm/joinhubscenario_sa_test.go
@@ -36,7 +36,7 @@ var _ = ginkgo.Describe("test clusteradm with service account", func() {
 			ginkgo.By("hub accept managedcluster1")
 			err = e2e.Clusteradm().Accept(
 				"--clusters", e2e.Cluster().ManagedCluster1().Name(),
-				"--wait", "30",
+				"--wait",
 				"--context", e2e.Cluster().Hub().Context(),
 			)
 			gomega.Expect(err).NotTo(gomega.HaveOccurred(), "clusteradm accept error")
@@ -60,7 +60,7 @@ var _ = ginkgo.Describe("test clusteradm with service account", func() {
 			ginkgo.By("hub accept managedcluster2")
 			err = e2e.Clusteradm().Accept(
 				"--clusters", e2e.Cluster().ManagedCluster2().Name(),
-				"--wait", "30",
+				"--wait",
 				"--context", e2e.Cluster().Hub().Context(),
 			)
 			gomega.Expect(err).NotTo(gomega.HaveOccurred(), "clusteradm accept error")

diff --git a/test/e2e/clusteradm/joinhubscenario_skip_approve_test.go b/test/e2e/clusteradm/joinhubscenario_skip_approve_test.go
@@ -77,7 +77,7 @@ var _ = ginkgo.Describe("test clusteradm with manual bootstrap token", func() {
 			ginkgo.By("hub accept managedcluster1")
 			err = e2e.Clusteradm().Accept(
 				"--clusters", e2e.Cluster().ManagedCluster1().Name(),
-				"--wait", "30",
+				"--wait",
 				"--context", e2e.Cluster().Hub().Context(),
 				"--skip-approve-check",
 			)

diff --git a/test/e2e/clusteradm/joinhubscenario_timeout_test.go b/test/e2e/clusteradm/joinhubscenario_timeout_test.go
@@ -36,7 +36,7 @@ var _ = ginkgo.Describe("test clusteradm with timeout", func() {
 			ginkgo.By("hub accept managedcluster1")
 			err = e2e.Clusteradm().Accept(
 				"--clusters", e2e.Cluster().ManagedCluster1().Name(),
-				"--wait", "30",
+				"--wait",
 				"--context", e2e.Cluster().Hub().Context(),
 			)
 			gomega.Expect(err).NotTo(gomega.HaveOccurred(), "clusteradm accept error")

diff --git a/test/e2e/clusteradm/upgrade_test.go b/test/e2e/clusteradm/upgrade_test.go
@@ -16,19 +16,19 @@ var _ = ginkgo.Describe("test clusteradm upgrade clustermanager and Klusterlets"
 
 	var err error
 
-	ginkgo.It("run cluster manager upgrade version 0.6.0 ", func() {
+	ginkgo.It("run cluster manager upgrade version 0.8.0 ", func() {
 		err = e2e.Clusteradm().Upgrade(
 			"clustermanager",
-			"--bundle-version", "0.6.0",
+			"--bundle-version", "0.8.0",
 			"--context", e2e.Cluster().Hub().Context(),
 		)
 	})
 	gomega.Expect(err).NotTo(gomega.HaveOccurred(), "clusteradm upgrade error")
 
-	ginkgo.It("run klusterlet upgrade version 0.6.0 ", func() {
+	ginkgo.It("run klusterlet upgrade version 0.8.0 ", func() {
 		err = e2e.Clusteradm().Upgrade(
 			"klusterlet",
-			"--bundle-version", "0.6.0",
+			"--bundle-version", "0.8.0",
 			"--context", e2e.Cluster().ManagedCluster1().Context(),
 		)
 	})

diff --git a/test/e2e/util/helper.go b/test/e2e/util/helper.go
@@ -40,6 +40,22 @@ func WaitNamespaceDeleted(kubeconfigpath string, ctx string, namespace string) e
 	})
 }
 
+func DeleteClusterCSRs(kubeconfigpath string, ctx string) error {
+	restcfg, err := buildConfigFromFlags(ctx, kubeconfigpath)
+	if err != nil {
+		return fmt.Errorf("error occurred while build rest config: %s", err)
+	}
+
+	clientset, err := kubernetes.NewForConfig(restcfg)
+	if err != nil {
+		return err
+	}
+
+	return clientset.CertificatesV1().CertificateSigningRequests().DeleteCollection(context.TODO(), metav1.DeleteOptions{}, metav1.ListOptions{
+		LabelSelector: "open-cluster-management.io/cluster-name",
+	})
+}
+
 func WaitCRDDeleted(kubeconfigpath string, ctx string, name string) error {
 	restcfg, err := buildConfigFromFlags(ctx, kubeconfigpath)
 	if err != nil {

diff --git a/test/e2e/util/util.go b/test/e2e/util/util.go
@@ -79,6 +79,10 @@ func initE2E() *TestE2eConfig {
 		if err != nil {
 			panic(fmt.Sprintf("error occurred while cleaning hub: %s", err.Error()))
 		}
+		err = DeleteClusterCSRs(e2eConf.Kubeconfigpath, e2eConf.Cluster().Hub().Context())
+		if err != nil {
+			panic(fmt.Sprintf("error occurred while cleaning hub: %s", err.Error()))
+		}
 		err = WaitNamespaceDeleted(e2eConf.Kubeconfigpath, e2eConf.Cluster().Hub().Context(), config.HubClusterNamespace)
 		if err != nil {
 			panic(fmt.Sprintf("error occurred while cleaning hub: %s", err.Error()))
@@ -135,7 +139,7 @@ func (tec *TestE2eConfig) ResetEnv() {
 
 	err = tec.Clusteradm().Accept(
 		"--clusters", tec.Cluster().ManagedCluster1().Name(),
-		"--wait", "30",
+		"--wait",
 		"--context", tec.Cluster().Hub().Context(),
 	)
 	if err != nil {