upgrade clusterset to v1beta2 (stolostron#537)

Signed-off-by: ldpliu <[email protected]> Signed-off-by: ldpliu <[email protected]>
zhiweiyin318 · Nov 15, 2022 · 7c55e8f · 7c55e8f
1 parent 6d0c91a
commit 7c55e8f
Show file tree

Hide file tree

Showing 53 changed files with 637 additions and 275 deletions.
diff --git a/cmd/controller/app/server.go b/cmd/controller/app/server.go
@@ -49,6 +49,8 @@ import (
 	clusterv1 "open-cluster-management.io/api/cluster/v1"
 	clusterv1alaph1 "open-cluster-management.io/api/cluster/v1alpha1"
 	clusterv1beta1 "open-cluster-management.io/api/cluster/v1beta1"
+	clusterv1beta2 "open-cluster-management.io/api/cluster/v1beta2"
+
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 )
@@ -66,6 +68,7 @@ func init() {
 	_ = actionv1beta1.AddToScheme(scheme)
 	_ = clusterv1alaph1.Install(scheme)
 	_ = clusterv1beta1.Install(scheme)
+	_ = clusterv1beta2.Install(scheme)
 	_ = v1alpha1.AddToScheme(scheme)
 	_ = routev1.Install(scheme)
 }
@@ -154,13 +157,13 @@ func Run(o *options.ControllerRunOptions, ctx context.Context) error {
 	}
 
 	clusterSetAdminCache := cache.NewClusterSetCache(
-		clusterInformers.Cluster().V1beta1().ManagedClusterSets(),
+		clusterInformers.Cluster().V1beta2().ManagedClusterSets(),
 		kubeInfomers.Rbac().V1().ClusterRoles(),
 		kubeInfomers.Rbac().V1().ClusterRoleBindings(),
 		utils.GetAdminResourceFromClusterRole,
 	)
 	clusterSetViewCache := cache.NewClusterSetCache(
-		clusterInformers.Cluster().V1beta1().ManagedClusterSets(),
+		clusterInformers.Cluster().V1beta2().ManagedClusterSets(),
 		kubeInfomers.Rbac().V1().ClusterRoles(),
 		kubeInfomers.Rbac().V1().ClusterRoleBindings(),
 		utils.GetViewResourceFromClusterRole,

diff --git a/go.mod b/go.mod
@@ -81,7 +81,7 @@ require (
 	k8s.io/kube-aggregator v0.24.1
 	k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1
 	open-cluster-management.io/addon-framework v0.5.0
-	open-cluster-management.io/api v0.9.0
+	open-cluster-management.io/api v0.9.1-0.20221107101616-fde10e6996f6
 	sigs.k8s.io/controller-runtime v0.12.1
 	sigs.k8s.io/yaml v1.3.0
 )

diff --git a/go.sum b/go.sum
@@ -1011,8 +1011,8 @@ k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/l
 k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 open-cluster-management.io/addon-framework v0.5.0 h1:JsjzbS7gRvTbjxJdYGLJzJUO99zLQuOkyXL1fppcd5s=
 open-cluster-management.io/addon-framework v0.5.0/go.mod h1:Fymctw1tnmCTXnmAMgc0zdHetAw6UaiAsj1S6w5VW6s=
-open-cluster-management.io/api v0.9.0 h1:JQidCTMY3RdS0m3UDP24j6ykNpxWJ20LEdNtbxJApxo=
-open-cluster-management.io/api v0.9.0/go.mod h1:+OEARSAl2jIhuLItUcS30UgLA3khmA9ihygLVxzEn+U=
+open-cluster-management.io/api v0.9.1-0.20221107101616-fde10e6996f6 h1:jXx0C2GKScyZSxyyvswxmgspQgx7SnBic80EM57EdOw=
+open-cluster-management.io/api v0.9.1-0.20221107101616-fde10e6996f6/go.mod h1:9KkJPh/zpDevXj2P+zkvSVjC2pq2PQ1JDNLLEes8TEc=
 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/hack/update-apiserver-gen.sh b/hack/update-apiserver-gen.sh
@@ -43,6 +43,6 @@ SC_PKG='github.com/stolostron/multicloud-operators-foundation'
 "${BINDIR}"/openapi-gen "$@" \
 	--v 1 --logtostderr \
 	--go-header-file "${REPO_ROOT}"/hack/custom-boilerplate.go.txt \
-	--input-dirs "${SC_PKG}/pkg/proxyserver/apis/proxy/v1beta1,${SC_PKG}/pkg/proxyserver/apis/clusterview/v1,${SC_PKG}/pkg/proxyserver/apis/clusterview/v1alpha1,open-cluster-management.io/api/cluster/v1,open-cluster-management.io/api/cluster/v1beta1,k8s.io/apimachinery/pkg/api/resource,k8s.io/apimachinery/pkg/runtime,k8s.io/apimachinery/pkg/apis/meta/v1" \
+	--input-dirs "${SC_PKG}/pkg/proxyserver/apis/proxy/v1beta1,${SC_PKG}/pkg/proxyserver/apis/clusterview/v1,${SC_PKG}/pkg/proxyserver/apis/clusterview/v1alpha1,open-cluster-management.io/api/cluster/v1,open-cluster-management.io/api/cluster/v1beta2,k8s.io/apimachinery/pkg/api/resource,k8s.io/apimachinery/pkg/runtime,k8s.io/apimachinery/pkg/apis/meta/v1" \
 	--output-package "${SC_PKG}/pkg/proxyserver/apis/openapi" \
   --report-filename ".api_violation.report"
diff --git a/pkg/cache/managedclusterset.go b/pkg/cache/managedclusterset.go
@@ -3,9 +3,9 @@ package cache
 import (
 	"time"
 
-	clusterinformerv1beta1 "open-cluster-management.io/api/client/cluster/informers/externalversions/cluster/v1beta1"
-	clusterv1beta1lister "open-cluster-management.io/api/client/cluster/listers/cluster/v1beta1"
-	clusterv1beta1 "open-cluster-management.io/api/cluster/v1beta1"
+	clusterinformerv1beta2 "open-cluster-management.io/api/client/cluster/informers/externalversions/cluster/v1beta2"
+	clusterv1beta2lister "open-cluster-management.io/api/client/cluster/listers/cluster/v1beta2"
+	clusterv1beta2 "open-cluster-management.io/api/cluster/v1beta2"
 
 	v1 "k8s.io/api/rbac/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -21,15 +21,15 @@ import (
 // ClusterSetLister enforces ability to enumerate clusterSet based on role
 type ClusterSetLister interface {
 	// List returns the list of ManagedClusterSet items that the user can access
-	List(user user.Info, selector labels.Selector) (*clusterv1beta1.ManagedClusterSetList, error)
+	List(user user.Info, selector labels.Selector) (*clusterv1beta2.ManagedClusterSetList, error)
 }
 
 type ClusterSetCache struct {
 	Cache            *AuthCache
-	clusterSetLister clusterv1beta1lister.ManagedClusterSetLister
+	clusterSetLister clusterv1beta2lister.ManagedClusterSetLister
 }
 
-func NewClusterSetCache(clusterSetInformer clusterinformerv1beta1.ManagedClusterSetInformer,
+func NewClusterSetCache(clusterSetInformer clusterinformerv1beta2.ManagedClusterSetInformer,
 	clusterRoleInformer rbacv1informers.ClusterRoleInformer,
 	clusterRolebindingInformer rbacv1informers.ClusterRoleBindingInformer,
 	getResourceNamesFromClusterRole func(*v1.ClusterRole, string, string) (sets.String, bool),
@@ -64,10 +64,10 @@ func (c *ClusterSetCache) Run(period time.Duration) {
 	go utilwait.Forever(func() { c.Cache.synchronize() }, period)
 }
 
-func (c *ClusterSetCache) List(userInfo user.Info, selector labels.Selector) (*clusterv1beta1.ManagedClusterSetList, error) {
+func (c *ClusterSetCache) List(userInfo user.Info, selector labels.Selector) (*clusterv1beta2.ManagedClusterSetList, error) {
 	names := c.Cache.listNames(userInfo)
 
-	clusterSetList := &clusterv1beta1.ManagedClusterSetList{}
+	clusterSetList := &clusterv1beta2.ManagedClusterSetList{}
 	for key := range names {
 		clusterSet, err := c.clusterSetLister.Get(key)
 		if errors.IsNotFound(err) {
@@ -96,7 +96,7 @@ func (c *ClusterSetCache) Get(name string) (runtime.Object, error) {
 func (c *ClusterSetCache) ConvertResource(name string) runtime.Object {
 	clusterSet, err := c.clusterSetLister.Get(name)
 	if err != nil {
-		clusterSet = &clusterv1beta1.ManagedClusterSet{ObjectMeta: metav1.ObjectMeta{Name: name}}
+		clusterSet = &clusterv1beta2.ManagedClusterSet{ObjectMeta: metav1.ObjectMeta{Name: name}}
 	}
 
 	return clusterSet

diff --git a/pkg/cache/managedclusterset_test.go b/pkg/cache/managedclusterset_test.go
@@ -15,12 +15,12 @@ import (
 	"k8s.io/client-go/kubernetes/fake"
 	clusterfake "open-cluster-management.io/api/client/cluster/clientset/versioned/fake"
 	clusterinformers "open-cluster-management.io/api/client/cluster/informers/externalversions"
-	clusterv1beta1 "open-cluster-management.io/api/cluster/v1beta1"
+	clusterv1beta2 "open-cluster-management.io/api/cluster/v1beta2"
 )
 
 var (
-	managedClusterSetList = clusterv1beta1.ManagedClusterSetList{
-		Items: []clusterv1beta1.ManagedClusterSet{
+	managedClusterSetList = clusterv1beta2.ManagedClusterSetList{
+		Items: []clusterv1beta2.ManagedClusterSet{
 			{
 				ObjectMeta: metav1.ObjectMeta{Name: "clusterset1", ResourceVersion: "1"},
 			},
@@ -138,16 +138,16 @@ var (
 	}
 )
 
-func newManagedClusterSet(names ...string) []*clusterv1beta1.ManagedClusterSet {
-	ret := []*clusterv1beta1.ManagedClusterSet{}
+func newManagedClusterSet(names ...string) []*clusterv1beta2.ManagedClusterSet {
+	ret := []*clusterv1beta2.ManagedClusterSet{}
 	for _, name := range names {
-		ret = append(ret, &clusterv1beta1.ManagedClusterSet{ObjectMeta: metav1.ObjectMeta{Name: name}})
+		ret = append(ret, &clusterv1beta2.ManagedClusterSet{ObjectMeta: metav1.ObjectMeta{Name: name}})
 	}
 
 	return ret
 }
 
-func validateClusterSetCacheListList(clusterSetList *clusterv1beta1.ManagedClusterSetList, expectedSet sets.String) bool {
+func validateClusterSetCacheListList(clusterSetList *clusterv1beta2.ManagedClusterSetList, expectedSet sets.String) bool {
 	clusterSets := sets.String{}
 	for _, clusterSet := range clusterSetList.Items {
 		clusterSets.Insert(clusterSet.Name)
@@ -171,12 +171,12 @@ func fakeNewClusterSetCache(stopCh chan struct{}) *ClusterSetCache {
 	fakeClusterSetClient := clusterfake.NewSimpleClientset(&managedClusterSetList)
 	clusterInformers := clusterinformers.NewSharedInformerFactory(fakeClusterSetClient, 10*time.Minute)
 	for key := range managedClusterSetList.Items {
-		clusterInformers.Cluster().V1beta1().ManagedClusterSets().Informer().GetIndexer().Add(&managedClusterSetList.Items[key])
+		clusterInformers.Cluster().V1beta2().ManagedClusterSets().Informer().GetIndexer().Add(&managedClusterSetList.Items[key])
 	}
 	clusterInformers.Start(stopCh)
 
 	return NewClusterSetCache(
-		clusterInformers.Cluster().V1beta1().ManagedClusterSets(),
+		clusterInformers.Cluster().V1beta2().ManagedClusterSets(),
 		informers.Rbac().V1().ClusterRoles(),
 		informers.Rbac().V1().ClusterRoleBindings(),
 		utils.GetViewResourceFromClusterRole,
@@ -267,7 +267,7 @@ func TestClusterSetCacheListObj(t *testing.T) {
 		t.Run(test.name, func(t *testing.T) {
 			clusterSetList, err := clusterSetCache.ListObjects(test.user)
 			validateError(t, err, test.expectedErr)
-			assert.Equal(t, validateClusterSetCacheListList(clusterSetList.(*clusterv1beta1.ManagedClusterSetList), test.expectedClusterSets), true)
+			assert.Equal(t, validateClusterSetCacheListList(clusterSetList.(*clusterv1beta2.ManagedClusterSetList), test.expectedClusterSets), true)
 		})
 	}
 }
diff --git a/pkg/controllers/clusterset/clusterclaim/clusterclaim_controller.go b/pkg/controllers/clusterset/clusterclaim/clusterclaim_controller.go
@@ -9,7 +9,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/klog"
 
-	clusterv1beta1 "open-cluster-management.io/api/cluster/v1beta1"
+	clusterv1beta2 "open-cluster-management.io/api/cluster/v1beta2"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
@@ -133,7 +133,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 	klog.V(5).Infof("Clusterclaim's clusterdeployment: %+v", clusterDeployment)
 
 	var isModified = false
-	utils.SyncMapField(&isModified, &clusterclaim.Labels, clusterDeployment.Labels, clusterv1beta1.ClusterSetLabel)
+	utils.SyncMapField(&isModified, &clusterclaim.Labels, clusterDeployment.Labels, clusterv1beta2.ClusterSetLabel)
 
 	if isModified {
 		err = r.client.Update(ctx, clusterclaim, &client.UpdateOptions{})

diff --git a/pkg/controllers/clusterset/clusterclaim/clusterclaim_controller_test.go b/pkg/controllers/clusterset/clusterclaim/clusterclaim_controller_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	clusterv1beta1 "open-cluster-management.io/api/cluster/v1beta1"
+	clusterv1beta2 "open-cluster-management.io/api/cluster/v1beta2"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -78,7 +78,7 @@ func TestReconcile(t *testing.T) {
 						Name:      "dep1",
 						Namespace: "dep1",
 						Labels: map[string]string{
-							clusterv1beta1.ClusterSetLabel: "clusterSet1",
+							clusterv1beta2.ClusterSetLabel: "clusterSet1",
 						},
 					},
 					Spec: hivev1.ClusterDeploymentSpec{},
@@ -91,7 +91,7 @@ func TestReconcile(t *testing.T) {
 				},
 			},
 			expectedlabel: map[string]string{
-				clusterv1beta1.ClusterSetLabel: "clusterSet1",
+				clusterv1beta2.ClusterSetLabel: "clusterSet1",
 			},
 		},
 		{
@@ -102,7 +102,7 @@ func TestReconcile(t *testing.T) {
 						Name:      "clusterClaim1",
 						Namespace: "ns1",
 						Labels: map[string]string{
-							clusterv1beta1.ClusterSetLabel: "clusterSet1",
+							clusterv1beta2.ClusterSetLabel: "clusterSet1",
 						},
 					},
 					Spec: hivev1.ClusterClaimSpec{

diff --git a/pkg/controllers/clusterset/clusterdeployment/clusterdeployment_controller.go b/pkg/controllers/clusterset/clusterdeployment/clusterdeployment_controller.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/stolostron/multicloud-operators-foundation/pkg/utils"
-	clusterv1beta1 "open-cluster-management.io/api/cluster/v1beta1"
+	clusterv1beta2 "open-cluster-management.io/api/cluster/v1beta2"
 
 	hivev1 "github.com/openshift/hive/apis/hive/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -191,7 +191,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 	}
 
 	var isModified = false
-	utils.SyncMapField(&isModified, &clusterdeployment.Labels, targetLabels, clusterv1beta1.ClusterSetLabel)
+	utils.SyncMapField(&isModified, &clusterdeployment.Labels, targetLabels, clusterv1beta2.ClusterSetLabel)
 
 	if isModified {
 		err = r.client.Update(ctx, clusterdeployment, &client.UpdateOptions{})

diff --git a/pkg/controllers/clusterset/clusterdeployment/clusterdeployment_controller_test.go b/pkg/controllers/clusterset/clusterdeployment/clusterdeployment_controller_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	clusterv1beta1 "open-cluster-management.io/api/cluster/v1beta1"
+	clusterv1beta2 "open-cluster-management.io/api/cluster/v1beta2"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -92,7 +92,7 @@ func TestReconcile(t *testing.T) {
 						Name:      "pool1",
 						Namespace: "poolNs1",
 						Labels: map[string]string{
-							clusterv1beta1.ClusterSetLabel: "clusterSet1",
+							clusterv1beta2.ClusterSetLabel: "clusterSet1",
 						},
 					},
 					Spec: hivev1.ClusterPoolSpec{},
@@ -105,7 +105,7 @@ func TestReconcile(t *testing.T) {
 				},
 			},
 			expectedlabel: map[string]string{
-				clusterv1beta1.ClusterSetLabel: "clusterSet1",
+				clusterv1beta2.ClusterSetLabel: "clusterSet1",
 			},
 		},
 		{
@@ -116,7 +116,7 @@ func TestReconcile(t *testing.T) {
 						Name:      "clusterdeployment1",
 						Namespace: "ns1",
 						Labels: map[string]string{
-							clusterv1beta1.ClusterSetLabel: "clusterSet1",
+							clusterv1beta2.ClusterSetLabel: "clusterSet1",
 						},
 					},
 					Spec: hivev1.ClusterDeploymentSpec{
@@ -167,7 +167,7 @@ func TestReconcile(t *testing.T) {
 						Name:      "pool1",
 						Namespace: "poolNs1",
 						Labels: map[string]string{
-							clusterv1beta1.ClusterSetLabel: "clusterSet1",
+							clusterv1beta2.ClusterSetLabel: "clusterSet1",
 						},
 					},
 					Spec: hivev1.ClusterPoolSpec{},
@@ -178,7 +178,7 @@ func TestReconcile(t *testing.T) {
 					ObjectMeta: metav1.ObjectMeta{
 						Name: "cd1",
 						Labels: map[string]string{
-							clusterv1beta1.ClusterSetLabel: "clusterSet1",
+							clusterv1beta2.ClusterSetLabel: "clusterSet1",
 						},
 					},
 				},
@@ -190,7 +190,7 @@ func TestReconcile(t *testing.T) {
 				},
 			},
 			expectedlabel: map[string]string{
-				clusterv1beta1.ClusterSetLabel: "clusterSet1",
+				clusterv1beta2.ClusterSetLabel: "clusterSet1",
 			},
 		},
 		{
@@ -210,7 +210,7 @@ func TestReconcile(t *testing.T) {
 					ObjectMeta: metav1.ObjectMeta{
 						Name: "cd1",
 						Labels: map[string]string{
-							clusterv1beta1.ClusterSetLabel: "clusterSet1",
+							clusterv1beta2.ClusterSetLabel: "clusterSet1",
 						},
 					},
 				},
@@ -222,7 +222,7 @@ func TestReconcile(t *testing.T) {
 				},
 			},
 			expectedlabel: map[string]string{
-				clusterv1beta1.ClusterSetLabel: "clusterSet1",
+				clusterv1beta2.ClusterSetLabel: "clusterSet1",
 			},
 		},
 	}