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

6
pkg/client/informers/externalversions/generic.go
View File

@@ -30,12 +30,8 @@ import (
v1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3"
v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2"
networkv1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1"
<<<<<<< HEAD
v2 "kubesphere.io/kubesphere/pkg/apis/notification/v2"
quotav1alpha2 "kubesphere.io/kubesphere/pkg/apis/quota/v1alpha2"
=======
v2alpha1 "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"