change notification crd version to v2alpha1

Signed-off-by: wanjunlei <wanjunlei@yunify.com>
2021-02-25 14:57:17 +08:00
parent d79104b8a2
commit f4f5f8283e
99 changed files with 1031 additions and 1006 deletions
--- a/pkg/models/resources/v1alpha3/notification/notification.go
+++ b/pkg/models/resources/v1alpha3/notification/notification.go
@@ -34,11 +34,11 @@ func NewDingTalkConfigGetter(informer ksinformers.SharedInformerFactory) v1alpha
 }

 func (g *dingtalkConfigGetter) Get(_, name string) (runtime.Object, error) {
-	return g.ksInformer.Notification().V2().DingTalkConfigs().Lister().Get(name)
+	return g.ksInformer.Notification().V2alpha1().DingTalkConfigs().Lister().Get(name)
 }

 func (g *dingtalkConfigGetter) List(_ string, query *query.Query) (*api.ListResult, error) {
-	objs, err := g.ksInformer.Notification().V2().DingTalkConfigs().Lister().List(query.Selector())
+	objs, err := g.ksInformer.Notification().V2alpha1().DingTalkConfigs().Lister().List(query.Selector())
 	if err != nil {
 		return nil, err
 	}
@@ -59,11 +59,11 @@ func NewDingTalkReceiverGetter(informer ksinformers.SharedInformerFactory) v1alp
 }

 func (g *dingtalkReceiverGetter) Get(_, name string) (runtime.Object, error) {
-	return g.ksInformer.Notification().V2().DingTalkReceivers().Lister().Get(name)
+	return g.ksInformer.Notification().V2alpha1().DingTalkReceivers().Lister().Get(name)
 }

 func (g *dingtalkReceiverGetter) List(_ string, query *query.Query) (*api.ListResult, error) {
-	objs, err := g.ksInformer.Notification().V2().DingTalkReceivers().Lister().List(query.Selector())
+	objs, err := g.ksInformer.Notification().V2alpha1().DingTalkReceivers().Lister().List(query.Selector())
 	if err != nil {
 		return nil, err
 	}
@@ -84,11 +84,11 @@ func NewEmailConfigGetter(informer ksinformers.SharedInformerFactory) v1alpha3.I
 }

 func (g *emailConfigGetter) Get(_, name string) (runtime.Object, error) {
-	return g.ksInformer.Notification().V2().EmailConfigs().Lister().Get(name)
+	return g.ksInformer.Notification().V2alpha1().EmailConfigs().Lister().Get(name)
 }

 func (g *emailConfigGetter) List(_ string, query *query.Query) (*api.ListResult, error) {
-	objs, err := g.ksInformer.Notification().V2().EmailConfigs().Lister().List(query.Selector())
+	objs, err := g.ksInformer.Notification().V2alpha1().EmailConfigs().Lister().List(query.Selector())
 	if err != nil {
 		return nil, err
 	}
@@ -109,11 +109,11 @@ func NewEmailReceiverGetter(informer ksinformers.SharedInformerFactory) v1alpha3
 }

 func (g *emailReceiverGetter) Get(_, name string) (runtime.Object, error) {
-	return g.ksInformer.Notification().V2().EmailReceivers().Lister().Get(name)
+	return g.ksInformer.Notification().V2alpha1().EmailReceivers().Lister().Get(name)
 }

 func (g *emailReceiverGetter) List(_ string, query *query.Query) (*api.ListResult, error) {
-	objs, err := g.ksInformer.Notification().V2().EmailReceivers().Lister().List(query.Selector())
+	objs, err := g.ksInformer.Notification().V2alpha1().EmailReceivers().Lister().List(query.Selector())
 	if err != nil {
 		return nil, err
 	}
@@ -134,11 +134,11 @@ func NewSlackConfigGetter(informer ksinformers.SharedInformerFactory) v1alpha3.I
 }

 func (g *slackConfigGetter) Get(_, name string) (runtime.Object, error) {
-	return g.ksInformer.Notification().V2().SlackConfigs().Lister().Get(name)
+	return g.ksInformer.Notification().V2alpha1().SlackConfigs().Lister().Get(name)
 }

 func (g *slackConfigGetter) List(_ string, query *query.Query) (*api.ListResult, error) {
-	objs, err := g.ksInformer.Notification().V2().SlackConfigs().Lister().List(query.Selector())
+	objs, err := g.ksInformer.Notification().V2alpha1().SlackConfigs().Lister().List(query.Selector())
 	if err != nil {
 		return nil, err
 	}
@@ -159,11 +159,11 @@ func NewSlackReceiverGetter(informer ksinformers.SharedInformerFactory) v1alpha3
 }

 func (g *slackReceiverGetter) Get(_, name string) (runtime.Object, error) {
-	return g.ksInformer.Notification().V2().SlackReceivers().Lister().Get(name)
+	return g.ksInformer.Notification().V2alpha1().SlackReceivers().Lister().Get(name)
 }

 func (g *slackReceiverGetter) List(_ string, query *query.Query) (*api.ListResult, error) {
-	objs, err := g.ksInformer.Notification().V2().SlackReceivers().Lister().List(query.Selector())
+	objs, err := g.ksInformer.Notification().V2alpha1().SlackReceivers().Lister().List(query.Selector())
 	if err != nil {
 		return nil, err
 	}
@@ -184,11 +184,11 @@ func NewWebhookConfigGetter(informer ksinformers.SharedInformerFactory) v1alpha3
 }

 func (g *webhookConfigGetter) Get(_, name string) (runtime.Object, error) {
-	return g.ksInformer.Notification().V2().WebhookConfigs().Lister().Get(name)
+	return g.ksInformer.Notification().V2alpha1().WebhookConfigs().Lister().Get(name)
 }

 func (g *webhookConfigGetter) List(_ string, query *query.Query) (*api.ListResult, error) {
-	objs, err := g.ksInformer.Notification().V2().WebhookConfigs().Lister().List(query.Selector())
+	objs, err := g.ksInformer.Notification().V2alpha1().WebhookConfigs().Lister().List(query.Selector())
 	if err != nil {
 		return nil, err
 	}
@@ -209,11 +209,11 @@ func NewWebhookReceiverGetter(informer ksinformers.SharedInformerFactory) v1alph
 }

 func (g *webhookReceiverGetter) Get(_, name string) (runtime.Object, error) {
-	return g.ksInformer.Notification().V2().WebhookReceivers().Lister().Get(name)
+	return g.ksInformer.Notification().V2alpha1().WebhookReceivers().Lister().Get(name)
 }

 func (g *webhookReceiverGetter) List(_ string, query *query.Query) (*api.ListResult, error) {
-	objs, err := g.ksInformer.Notification().V2().WebhookReceivers().Lister().List(query.Selector())
+	objs, err := g.ksInformer.Notification().V2alpha1().WebhookReceivers().Lister().List(query.Selector())
 	if err != nil {
 		return nil, err
 	}
@@ -234,11 +234,11 @@ func NewWechatConfigGetter(informer ksinformers.SharedInformerFactory) v1alpha3.
 }

 func (g *wechatConfigGetter) Get(_, name string) (runtime.Object, error) {
-	return g.ksInformer.Notification().V2().WechatConfigs().Lister().Get(name)
+	return g.ksInformer.Notification().V2alpha1().WechatConfigs().Lister().Get(name)
 }

 func (g *wechatConfigGetter) List(_ string, query *query.Query) (*api.ListResult, error) {
-	objs, err := g.ksInformer.Notification().V2().WechatConfigs().Lister().List(query.Selector())
+	objs, err := g.ksInformer.Notification().V2alpha1().WechatConfigs().Lister().List(query.Selector())
 	if err != nil {
 		return nil, err
 	}
@@ -259,11 +259,11 @@ func NewWechatReceiverGetter(informer ksinformers.SharedInformerFactory) v1alpha
 }

 func (g *wechatReceiverGetter) Get(_, name string) (runtime.Object, error) {
-	return g.ksInformer.Notification().V2().WechatReceivers().Lister().Get(name)
+	return g.ksInformer.Notification().V2alpha1().WechatReceivers().Lister().Get(name)
 }

 func (g *wechatReceiverGetter) List(_ string, query *query.Query) (*api.ListResult, error) {
-	objs, err := g.ksInformer.Notification().V2().WechatReceivers().Lister().List(query.Selector())
+	objs, err := g.ksInformer.Notification().V2alpha1().WechatReceivers().Lister().List(query.Selector())
 	if err != nil {
 		return nil, err
 	}
--- a/pkg/models/resources/v1alpha3/notification/notification_test.go
+++ b/pkg/models/resources/v1alpha3/notification/notification_test.go
@@ -23,7 +23,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/tools/cache"
 	"kubesphere.io/kubesphere/pkg/api"
-	v2 "kubesphere.io/kubesphere/pkg/apis/notification/v2"
+	"kubesphere.io/kubesphere/pkg/apis/notification/v2alpha1"
 	"kubesphere.io/kubesphere/pkg/apiserver/query"
 	"kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake"
 	ksinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions"
@@ -47,43 +47,43 @@ func TestListObjects(t *testing.T) {
 	}{
 		{
 			"test name filter",
-			v2.ResourcesPluralDingTalkConfig,
+			v2alpha1.ResourcesPluralDingTalkConfig,
 		},
 		{
 			"test name filter",
-			v2.ResourcesPluralDingTalkReceiver,
+			v2alpha1.ResourcesPluralDingTalkReceiver,
 		},
 		{
 			"test name filter",
-			v2.ResourcesPluralEmailConfig,
+			v2alpha1.ResourcesPluralEmailConfig,
 		},
 		{
 			"test name filter",
-			v2.ResourcesPluralEmailReceiver,
+			v2alpha1.ResourcesPluralEmailReceiver,
 		},
 		{
 			"test name filter",
-			v2.ResourcesPluralSlackConfig,
+			v2alpha1.ResourcesPluralSlackConfig,
 		},
 		{
 			"test name filter",
-			v2.ResourcesPluralSlackReceiver,
+			v2alpha1.ResourcesPluralSlackReceiver,
 		},
 		{
 			"test name filter",
-			v2.ResourcesPluralWebhookConfig,
+			v2alpha1.ResourcesPluralWebhookConfig,
 		},
 		{
 			"test name filter",
-			v2.ResourcesPluralWebhookReceiver,
+			v2alpha1.ResourcesPluralWebhookReceiver,
 		},
 		{
 			"test name filter",
-			v2.ResourcesPluralWechatConfig,
+			v2alpha1.ResourcesPluralWechatConfig,
 		},
 		{
 			"test name filter",
-			v2.ResourcesPluralWechatReceiver,
+			v2alpha1.ResourcesPluralWechatReceiver,
 		},
 	}

@@ -128,48 +128,48 @@ func prepare(key string) (v1alpha3.Interface, []interface{}, error) {
 	var indexer cache.Indexer
 	var getter func(informer ksinformers.SharedInformerFactory) v1alpha3.Interface
 	switch key {
-	case v2.ResourcesPluralDingTalkConfig:
-		indexer = informer.Notification().V2().DingTalkConfigs().Informer().GetIndexer()
+	case v2alpha1.ResourcesPluralDingTalkConfig:
+		indexer = informer.Notification().V2alpha1().DingTalkConfigs().Informer().GetIndexer()
 		getter = NewDingTalkConfigGetter
-		obj = &v2.DingTalkConfig{}
-	case v2.ResourcesPluralDingTalkReceiver:
-		indexer = informer.Notification().V2().DingTalkReceivers().Informer().GetIndexer()
+		obj = &v2alpha1.DingTalkConfig{}
+	case v2alpha1.ResourcesPluralDingTalkReceiver:
+		indexer = informer.Notification().V2alpha1().DingTalkReceivers().Informer().GetIndexer()
 		getter = NewDingTalkReceiverGetter
-		obj = &v2.DingTalkReceiver{}
-	case v2.ResourcesPluralEmailConfig:
-		indexer = informer.Notification().V2().EmailConfigs().Informer().GetIndexer()
+		obj = &v2alpha1.DingTalkReceiver{}
+	case v2alpha1.ResourcesPluralEmailConfig:
+		indexer = informer.Notification().V2alpha1().EmailConfigs().Informer().GetIndexer()
 		getter = NewEmailConfigGetter
-		obj = &v2.EmailConfig{}
-	case v2.ResourcesPluralEmailReceiver:
-		indexer = informer.Notification().V2().EmailReceivers().Informer().GetIndexer()
+		obj = &v2alpha1.EmailConfig{}
+	case v2alpha1.ResourcesPluralEmailReceiver:
+		indexer = informer.Notification().V2alpha1().EmailReceivers().Informer().GetIndexer()
 		getter = NewEmailReceiverGetter
-		obj = &v2.EmailReceiver{}
-	case v2.ResourcesPluralSlackConfig:
-		indexer = informer.Notification().V2().SlackConfigs().Informer().GetIndexer()
+		obj = &v2alpha1.EmailReceiver{}
+	case v2alpha1.ResourcesPluralSlackConfig:
+		indexer = informer.Notification().V2alpha1().SlackConfigs().Informer().GetIndexer()
 		getter = NewSlackConfigGetter
-		obj = &v2.SlackConfig{}
-	case v2.ResourcesPluralSlackReceiver:
-		indexer = informer.Notification().V2().SlackReceivers().Informer().GetIndexer()
+		obj = &v2alpha1.SlackConfig{}
+	case v2alpha1.ResourcesPluralSlackReceiver:
+		indexer = informer.Notification().V2alpha1().SlackReceivers().Informer().GetIndexer()
 		getter = NewSlackReceiverGetter
-		obj = &v2.SlackReceiver{}
-	case v2.ResourcesPluralWebhookConfig:
-		indexer = informer.Notification().V2().WebhookConfigs().Informer().GetIndexer()
+		obj = &v2alpha1.SlackReceiver{}
+	case v2alpha1.ResourcesPluralWebhookConfig:
+		indexer = informer.Notification().V2alpha1().WebhookConfigs().Informer().GetIndexer()
 		getter = NewWebhookConfigGetter
-		obj = &v2.WebhookConfig{}
-	case v2.ResourcesPluralWebhookReceiver:
-		indexer = informer.Notification().V2().WebhookReceivers().Informer().GetIndexer()
+		obj = &v2alpha1.WebhookConfig{}
+	case v2alpha1.ResourcesPluralWebhookReceiver:
+		indexer = informer.Notification().V2alpha1().WebhookReceivers().Informer().GetIndexer()
 		getter = NewWebhookReceiverGetter
-		obj = &v2.WebhookReceiver{}
-	case v2.ResourcesPluralWechatConfig:
-		indexer = informer.Notification().V2().WechatConfigs().Informer().GetIndexer()
+		obj = &v2alpha1.WebhookReceiver{}
+	case v2alpha1.ResourcesPluralWechatConfig:
+		indexer = informer.Notification().V2alpha1().WechatConfigs().Informer().GetIndexer()
 		getter = NewWechatConfigGetter
-		obj = &v2.WechatConfig{}
-	case v2.ResourcesPluralWechatReceiver:
-		indexer = informer.Notification().V2().WechatReceivers().Informer().GetIndexer()
+		obj = &v2alpha1.WechatConfig{}
+	case v2alpha1.ResourcesPluralWechatReceiver:
+		indexer = informer.Notification().V2alpha1().WechatReceivers().Informer().GetIndexer()
 		getter = NewWechatReceiverGetter
-		obj = &v2.WechatReceiver{}
+		obj = &v2alpha1.WechatReceiver{}
 	default:
-		return nil, nil, errors.New("unkonwed type %s", key)
+		return nil, nil, errors.New("unowned type %s", key)
 	}

 	num := rand.Intn(LengthMax)
--- a/pkg/models/resources/v1alpha3/resource/resource.go
+++ b/pkg/models/resources/v1alpha3/resource/resource.go
@@ -26,7 +26,7 @@ import (
 	devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3"
 	iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2"
 	networkv1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1"
-	notificationv2 "kubesphere.io/kubesphere/pkg/apis/notification/v2"
+	notificationv2alpha1 "kubesphere.io/kubesphere/pkg/apis/notification/v2alpha1"
 	tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1"
 	tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2"
 	typesv1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1"
@@ -126,16 +126,16 @@ func NewResourceGetter(factory informers.InformerFactory, cache cache.Cache) *Re
 	getters[schema.GroupVersionResource{Group: "cluster.kubesphere.io", Version: "v1alpha1", Resource: "clusters"}] = cluster.New(factory.KubeSphereSharedInformerFactory())
 	getters[schema.GroupVersionResource{Group: "apiextensions.k8s.io", Version: "v1", Resource: "customresourcedefinitions"}] = customresourcedefinition.New(factory.ApiExtensionSharedInformerFactory())

-	getters[notificationv2.SchemeGroupVersion.WithResource(notificationv2.ResourcesPluralDingTalkConfig)] = notification.NewDingTalkConfigGetter(factory.KubeSphereSharedInformerFactory())
-	getters[notificationv2.SchemeGroupVersion.WithResource(notificationv2.ResourcesPluralDingTalkReceiver)] = notification.NewDingTalkReceiverGetter(factory.KubeSphereSharedInformerFactory())
-	getters[notificationv2.SchemeGroupVersion.WithResource(notificationv2.ResourcesPluralEmailConfig)] = notification.NewEmailConfigGetter(factory.KubeSphereSharedInformerFactory())
-	getters[notificationv2.SchemeGroupVersion.WithResource(notificationv2.ResourcesPluralEmailReceiver)] = notification.NewEmailReceiverGetter(factory.KubeSphereSharedInformerFactory())
-	getters[notificationv2.SchemeGroupVersion.WithResource(notificationv2.ResourcesPluralSlackConfig)] = notification.NewSlackConfigGetter(factory.KubeSphereSharedInformerFactory())
-	getters[notificationv2.SchemeGroupVersion.WithResource(notificationv2.ResourcesPluralSlackReceiver)] = notification.NewSlackReceiverGetter(factory.KubeSphereSharedInformerFactory())
-	getters[notificationv2.SchemeGroupVersion.WithResource(notificationv2.ResourcesPluralWebhookConfig)] = notification.NewWebhookConfigGetter(factory.KubeSphereSharedInformerFactory())
-	getters[notificationv2.SchemeGroupVersion.WithResource(notificationv2.ResourcesPluralWebhookReceiver)] = notification.NewWebhookReceiverGetter(factory.KubeSphereSharedInformerFactory())
-	getters[notificationv2.SchemeGroupVersion.WithResource(notificationv2.ResourcesPluralWechatConfig)] = notification.NewWechatConfigGetter(factory.KubeSphereSharedInformerFactory())
-	getters[notificationv2.SchemeGroupVersion.WithResource(notificationv2.ResourcesPluralWechatReceiver)] = notification.NewWechatReceiverGetter(factory.KubeSphereSharedInformerFactory())
+	getters[notificationv2alpha1.SchemeGroupVersion.WithResource(notificationv2alpha1.ResourcesPluralDingTalkConfig)] = notification.NewDingTalkConfigGetter(factory.KubeSphereSharedInformerFactory())
+	getters[notificationv2alpha1.SchemeGroupVersion.WithResource(notificationv2alpha1.ResourcesPluralDingTalkReceiver)] = notification.NewDingTalkReceiverGetter(factory.KubeSphereSharedInformerFactory())
+	getters[notificationv2alpha1.SchemeGroupVersion.WithResource(notificationv2alpha1.ResourcesPluralEmailConfig)] = notification.NewEmailConfigGetter(factory.KubeSphereSharedInformerFactory())
+	getters[notificationv2alpha1.SchemeGroupVersion.WithResource(notificationv2alpha1.ResourcesPluralEmailReceiver)] = notification.NewEmailReceiverGetter(factory.KubeSphereSharedInformerFactory())
+	getters[notificationv2alpha1.SchemeGroupVersion.WithResource(notificationv2alpha1.ResourcesPluralSlackConfig)] = notification.NewSlackConfigGetter(factory.KubeSphereSharedInformerFactory())
+	getters[notificationv2alpha1.SchemeGroupVersion.WithResource(notificationv2alpha1.ResourcesPluralSlackReceiver)] = notification.NewSlackReceiverGetter(factory.KubeSphereSharedInformerFactory())
+	getters[notificationv2alpha1.SchemeGroupVersion.WithResource(notificationv2alpha1.ResourcesPluralWebhookConfig)] = notification.NewWebhookConfigGetter(factory.KubeSphereSharedInformerFactory())
+	getters[notificationv2alpha1.SchemeGroupVersion.WithResource(notificationv2alpha1.ResourcesPluralWebhookReceiver)] = notification.NewWebhookReceiverGetter(factory.KubeSphereSharedInformerFactory())
+	getters[notificationv2alpha1.SchemeGroupVersion.WithResource(notificationv2alpha1.ResourcesPluralWechatConfig)] = notification.NewWechatConfigGetter(factory.KubeSphereSharedInformerFactory())
+	getters[notificationv2alpha1.SchemeGroupVersion.WithResource(notificationv2alpha1.ResourcesPluralWechatReceiver)] = notification.NewWechatReceiverGetter(factory.KubeSphereSharedInformerFactory())

 	// federated resources
 	getters[typesv1beta1.SchemeGroupVersion.WithResource(typesv1beta1.ResourcePluralFederatedNamespace)] = federatednamespace.New(factory.KubeSphereSharedInformerFactory())