admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve conversation

Browse Source 
Signed-off-by: wanjunlei <wanjunlei@yunify.com>
This commit is contained in:
wanjunlei
2021-03-03 09:48:51 +08:00
parent f4f5f8283e
commit d6d2cf002f
7 changed files with 33 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/client/clientset/versioned/scheme/register.go
View File

@@ -31,12 +31,8 @@ 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"
<<<<<<< HEAD
notificationv2 "kubesphere.io/kubesphere/pkg/apis/notification/v2"
quotav1alpha2 "kubesphere.io/kubesphere/pkg/apis/quota/v1alpha2"
=======
notificationv2alpha1 "kubesphere.io/kubesphere/pkg/apis/notification/v2alpha1"
>>>>>>> change notification crd version to v2alpha1
quotav1alpha2 "kubesphere.io/kubesphere/pkg/apis/quota/v1alpha2"
servicemeshv1alpha2 "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2"
storagev1alpha1 "kubesphere.io/kubesphere/pkg/apis/storage/v1alpha1"
tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1"
@@ -55,12 +51,8 @@ var localSchemeBuilder = runtime.SchemeBuilder{
devopsv1alpha3.AddToScheme,
iamv1alpha2.AddToScheme,
networkv1alpha1.AddToScheme,
<<<<<<< HEAD
notificationv2.AddToScheme,
quotav1alpha2.AddToScheme,
=======
notificationv2alpha1.AddToScheme,
>>>>>>> change notification crd version to v2alpha1
quotav1alpha2.AddToScheme,
servicemeshv1alpha2.AddToScheme,
storagev1alpha1.AddToScheme,
tenantv1alpha1.AddToScheme,