use latest api to migrate clusterset (open-cluster-management-io#297)

Signed-off-by: ldpliu <daliu@redhat.com>
mprahl · Feb 14, 2023 · 28255f6 · 28255f6
1 parent 6f94ec2
commit 28255f6
Show file tree

Hide file tree

Showing 14 changed files with 46 additions and 25 deletions.
diff --git a/deploy/hub/0000_00_clusters.open-cluster-management.io_managedclustersets.crd.yaml b/deploy/hub/0000_00_clusters.open-cluster-management.io_managedclustersets.crd.yaml
@@ -26,7 +26,7 @@ spec:
       deprecated: true
       deprecationWarning: "cluster.open-cluster-management.io/v1beta1 ManagedClusterSet is deprecated; use cluster.open-cluster-management.io/v1beta2 ManagedClusterSet"
       served: true
-      storage: true
+      storage: false
       subresources:
         status: {}
       "schema":
@@ -149,7 +149,7 @@ spec:
           type: date
       name: v1beta2
       served: true
-      storage: false
+      storage: true
       subresources:
         status: {}
       "schema":

diff --git a/deploy/hub/0000_00_work.open-cluster-management.io_manifestworks.crd.yaml b/deploy/hub/0000_00_work.open-cluster-management.io_manifestworks.crd.yaml
@@ -163,7 +163,7 @@ spec:
                             description: Resource is the resource name of the Kubernetes resource.
                             type: string
                       updateStrategy:
-                        description: UpdateStrategy defines the strategy to update this manifest. UpdateStrategy is Update if it is not set, optional
+                        description: UpdateStrategy defines the strategy to update this manifest. UpdateStrategy is Update if it is not set.
                         type: object
                         required:
                           - type

diff --git a/deploy/hub/0000_01_clusters.open-cluster-management.io_managedclustersetbindings.crd.yaml b/deploy/hub/0000_01_clusters.open-cluster-management.io_managedclustersetbindings.crd.yaml
@@ -88,7 +88,7 @@ spec:
                         maxLength: 316
                         pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
       served: true
-      storage: true
+      storage: false
       subresources:
         status: {}
     - name: v1beta2
@@ -162,7 +162,7 @@ spec:
                         maxLength: 316
                         pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
       served: true
-      storage: false
+      storage: true
       subresources:
         status: {}
 status:

diff --git a/go.mod b/go.mod
@@ -22,7 +22,7 @@ require (
 	k8s.io/component-base v0.24.3
 	k8s.io/klog/v2 v2.70.1
 	k8s.io/utils v0.0.0-20220713171938-56c0de1e6f5e
-	open-cluster-management.io/api v0.9.1-0.20221212072517-d2016d321f33
+	open-cluster-management.io/api v0.10.1-0.20230213013136-b33259f037ca
 	sigs.k8s.io/controller-runtime v0.12.3
 )
 

diff --git a/go.sum b/go.sum
@@ -1252,8 +1252,8 @@ modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
 modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
 modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs=
 modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I=
-open-cluster-management.io/api v0.9.1-0.20221212072517-d2016d321f33 h1:uHTEdlnjyTt6+9LTWJREWMQHzuVToWVNd7FbSjvFcqY=
-open-cluster-management.io/api v0.9.1-0.20221212072517-d2016d321f33/go.mod h1:6BB/Y6r3hXlPjpJgDwIs6Ubxyx/kXXOg6D9Cntg1I9E=
+open-cluster-management.io/api v0.10.1-0.20230213013136-b33259f037ca h1:wQOnoT5rGENu1yNBiyd4EWxDx64esomSCIIb7klBmWI=
+open-cluster-management.io/api v0.10.1-0.20230213013136-b33259f037ca/go.mod h1:3u4r42Zbg0utOdgarQEgAR35NAKcHgkt9xZWUTW6VAw=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -1224,7 +1224,7 @@ k8s.io/utils/path
 k8s.io/utils/pointer
 k8s.io/utils/strings/slices
 k8s.io/utils/trace
-# open-cluster-management.io/api v0.9.1-0.20221212072517-d2016d321f33
+# open-cluster-management.io/api v0.10.1-0.20230213013136-b33259f037ca
 ## explicit; go 1.19
 open-cluster-management.io/api/addon/v1alpha1
 open-cluster-management.io/api/client/addon/clientset/versioned

diff --git a/vendor/open-cluster-management.io/api/addon/v1alpha1/types_managedclusteraddon.go b/vendor/open-cluster-management.io/api/addon/v1alpha1/types_managedclusteraddon.go
diff --git a/...i/cluster/v1beta2/0000_00_clusters.open-cluster-management.io_managedclustersets.crd.yaml b/...i/cluster/v1beta2/0000_00_clusters.open-cluster-management.io_managedclustersets.crd.yaml
diff --git a/...er/v1beta2/0000_01_clusters.open-cluster-management.io_managedclustersetbindings.crd.yaml b/...er/v1beta2/0000_01_clusters.open-cluster-management.io_managedclustersetbindings.crd.yaml
diff --git a/...-management.io/api/work/v1/0000_00_work.open-cluster-management.io_manifestworks.crd.yaml b/...-management.io/api/work/v1/0000_00_work.open-cluster-management.io_manifestworks.crd.yaml
diff --git a/vendor/open-cluster-management.io/api/work/v1/types.go b/vendor/open-cluster-management.io/api/work/v1/types.go
diff --git a/vendor/open-cluster-management.io/api/work/v1/zz_generated.swagger_doc_generated.go b/vendor/open-cluster-management.io/api/work/v1/zz_generated.swagger_doc_generated.go
diff --git a/....io/api/work/v1alpha1/0000_00_work.open-cluster-management.io_placemanifestworks.crd.yaml b/....io/api/work/v1alpha1/0000_00_work.open-cluster-management.io_placemanifestworks.crd.yaml
diff --git a/vendor/open-cluster-management.io/api/work/v1alpha1/types.go b/vendor/open-cluster-management.io/api/work/v1alpha1/types.go