github/open-cluster-management
1
0
Fork 0
mirror of https://github.com/open-cluster-management-io/ocm.git synced 2026-05-23 09:33:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix migration issue (#328)

Browse Source 
Signed-off-by: ldpliu <daliu@redhat.com>
This commit is contained in:
DangPeng Liu
2023-02-28 17:27:14 +08:00
committed by GitHub
parent 5b5c587664
commit bf0eeb0775
2 changed files with 1 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_crd_reconcile.go
View File

@@ -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 {

35
test/e2e/clusterset_test.go
View File

@@ -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())
})
})