From bf0eeb0775dd9bbd1c14d9b2c57c77f6a08b837c Mon Sep 17 00:00:00 2001 From: DangPeng Liu Date: Tue, 28 Feb 2023 17:27:14 +0800 Subject: [PATCH] fix migration issue (#328) Signed-off-by: ldpliu --- .../clustermanager_crd_reconcile.go | 5 +-- test/e2e/clusterset_test.go | 35 ------------------- 2 files changed, 1 insertion(+), 39 deletions(-) diff --git a/pkg/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_crd_reconcile.go b/pkg/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_crd_reconcile.go index c84120bc0..5510c741a 100644 --- a/pkg/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_crd_reconcile.go +++ b/pkg/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_crd_reconcile.go @@ -51,10 +51,7 @@ var ( } // removed CRD StoredVersions - removedCRDStoredVersions = map[string]string{ - "managedclustersets.cluster.open-cluster-management.io": "v1beta1", - "managedclustersetbindings.cluster.open-cluster-management.io": "v1beta1", - } + removedCRDStoredVersions = map[string]string{} ) type crdReconcile struct { diff --git a/test/e2e/clusterset_test.go b/test/e2e/clusterset_test.go index 489763fd3..56d294625 100644 --- a/test/e2e/clusterset_test.go +++ b/test/e2e/clusterset_test.go @@ -12,11 +12,6 @@ import ( clusterv1beta2 "open-cluster-management.io/api/cluster/v1beta2" ) -const ( - clustersetCrdName = "managedclustersets.cluster.open-cluster-management.io" - clustersetBindingCrdName = "managedclustersetbindings.cluster.open-cluster-management.io" -) - var _ = ginkgo.Describe("Create v1beta2 managedclusterset", func() { ginkgo.It("Create a v1beta2 labelselector based ManagedClusterSet and get/update/delete with v1beta2 client", func() { ginkgo.By("Create a v1beta2 ManagedClusterSet") @@ -118,34 +113,4 @@ var _ = ginkgo.Describe("Create v1beta2 managedclusterset", func() { err := t.ClusterClient.ClusterV1beta1().ManagedClusterSets().Delete(context.Background(), managedClusterSetName, metav1.DeleteOptions{}) gomega.Expect(err).ToNot(gomega.HaveOccurred()) }) - ginkgo.It("Check if the v1beta1 storageversion is removed from clusterset crd", func() { - gomega.Eventually(func() error { - clustersetCrd, err := t.HubAPIExtensionClient.ApiextensionsV1().CustomResourceDefinitions().Get(context.Background(), clustersetCrdName, metav1.GetOptions{}) - if err != nil { - return err - } - if len(clustersetCrd.Status.StoredVersions) != 1 { - return fmt.Errorf("clustersetCrd.Status.StoredVersions should be v1beta2, but got:%v", clustersetCrd.Status.StoredVersions) - } - if clustersetCrd.Status.StoredVersions[0] != "v1beta2" { - return fmt.Errorf("clustersetCrd.Status.StoredVersions should be v1beta2, but got:%v", clustersetCrd.Status.StoredVersions) - } - return nil - }, t.EventuallyTimeout*5, t.EventuallyInterval*5).Should(gomega.Succeed()) - }) - ginkgo.It("Check if the v1beta1 storageversion is removed from clustersetbinding crd", func() { - gomega.Eventually(func() error { - clustersetBindingCrd, err := t.HubAPIExtensionClient.ApiextensionsV1().CustomResourceDefinitions().Get(context.Background(), clustersetBindingCrdName, metav1.GetOptions{}) - if err != nil { - return err - } - if len(clustersetBindingCrd.Status.StoredVersions) != 1 { - return fmt.Errorf("clustersetBindingCrd.Status.StoredVersions should be v1beta2, but got:%v", clustersetBindingCrd.Status.StoredVersions) - } - if clustersetBindingCrd.Status.StoredVersions[0] != "v1beta2" { - return fmt.Errorf("clustersetBindingCrd.Status.StoredVersions should be v1beta2, but got:%v", clustersetBindingCrd.Status.StoredVersions) - } - return nil - }, t.EventuallyTimeout*5, t.EventuallyInterval*5).Should(gomega.Succeed()) - }) })