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

add cluster and crd to resources api group (#2053)

Browse Source
This commit is contained in:
zryfish
2020-05-08 17:30:15 +08:00
committed by GitHub
parent 256b178927
commit 18ab887640
79 changed files with 1755 additions and 10518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/models/resources/v1alpha2/resource/resource_test.go
View File

@@ -217,7 +217,7 @@ func prepare() (informers.InformerFactory, error) {
istioClient := fakeistio.NewSimpleClientset()
appClient := fakeapp.NewSimpleClientset()
snapshotClient := fakesnapshot.NewSimpleClientset()
fakeInformerFactory := informers.NewInformerFactories(k8sClient, ksClient, istioClient, appClient, snapshotClient)
fakeInformerFactory := informers.NewInformerFactories(k8sClient, ksClient, istioClient, appClient, snapshotClient, nil)
k8sInformerFactory := fakeInformerFactory.KubernetesSharedInformerFactory()

61
pkg/models/resources/v1alpha3/cluster/clusters.go Normal file
View File

@@ -0,0 +1,61 @@
package cluster
import (
"k8s.io/apimachinery/pkg/runtime"
"kubesphere.io/kubesphere/pkg/api"
clusterv1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1"
"kubesphere.io/kubesphere/pkg/apiserver/query"
"kubesphere.io/kubesphere/pkg/client/informers/externalversions"
"kubesphere.io/kubesphere/pkg/models/resources/v1alpha3"
)
type clustersGetter struct {
informers externalversions.SharedInformerFactory
}
func New(informers externalversions.SharedInformerFactory) v1alpha3.Interface {
return &clustersGetter{
informers: informers,
}
}
func (c clustersGetter) Get(_, name string) (runtime.Object, error) {
return c.informers.Cluster().V1alpha1().Clusters().Lister().Get(name)
}
func (c clustersGetter) List(_ string, query *query.Query) (*api.ListResult, error) {
clusters, err := c.informers.Cluster().V1alpha1().Clusters().Lister().List(query.Selector())
if err != nil {
return nil, err
}
var result []runtime.Object
for _, deploy := range clusters {
result = append(result, deploy)
}
return v1alpha3.DefaultList(result, query, c.compare, c.filter), nil
}
func (c clustersGetter) compare(left runtime.Object, right runtime.Object, field query.Field) bool {
leftCluster, ok := left.(*clusterv1alpha1.Cluster)
if !ok {
return false
}
rightCluster, ok := right.(*clusterv1alpha1.Cluster)
if !ok {
return false
}
return v1alpha3.DefaultObjectMetaCompare(leftCluster.ObjectMeta, rightCluster.ObjectMeta, field)
}
func (c clustersGetter) filter(object runtime.Object, filter query.Filter) bool {
cluster, ok := object.(*clusterv1alpha1.Cluster)
if !ok {
return false
}
return v1alpha3.DefaultObjectMetaFilter(cluster.ObjectMeta, filter)
}

105
pkg/models/resources/v1alpha3/cluster/clusters_test.go Normal file
View File

@@ -0,0 +1,105 @@
package cluster
import (
"github.com/google/go-cmp/cmp"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"kubesphere.io/kubesphere/pkg/api"
clusterv1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1"
"kubesphere.io/kubesphere/pkg/apiserver/query"
"kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake"
"kubesphere.io/kubesphere/pkg/client/informers/externalversions"
"testing"
)
var clusters = []*clusterv1alpha1.Cluster{
{
ObjectMeta: metav1.ObjectMeta{
Name: "foo",
Labels: map[string]string{
"cluster.kubesphere.io/region": "beijing",
"cluster.kubesphere.io/group": "development",
},
},
},
{
ObjectMeta: metav1.ObjectMeta{
Name: "bar",
Labels: map[string]string{
"cluster.kubesphere.io/region": "beijing",
"cluster.kubesphere.io/group": "production",
},
},
},
{
ObjectMeta: metav1.ObjectMeta{
Name: "whatever",
Labels: map[string]string{
"cluster.kubesphere.io/region": "shanghai",
"cluster.kubesphere.io/group": "testing",
},
},
},
}
func clustersToInterface(clusters ...*clusterv1alpha1.Cluster) []interface{} {
items := make([]interface{}, 0)
for _, cluster := range clusters {
items = append(items, cluster)
}
return items
}
func clustersToRuntimeObject(clusters ...*clusterv1alpha1.Cluster) []runtime.Object {
items := make([]runtime.Object, 0)
for _, cluster := range clusters {
items = append(items, cluster)
}
return items
}
func TestClustersGetter(t *testing.T) {
var testCases = []struct {
description string
query *query.Query
expected *api.ListResult
}{
{
description: "Test normal case",
query: &query.Query{
LabelSelector: "cluster.kubesphere.io/region=beijing",
Ascending: false,
},
expected: &api.ListResult{
TotalItems: 2,
Items: clustersToInterface(clusters[0], clusters[1]),
},
},
}
client := fake.NewSimpleClientset(clustersToRuntimeObject(clusters...)...)
informer := externalversions.NewSharedInformerFactory(client, 0)
for _, cluster := range clusters {
informer.Cluster().V1alpha1().Clusters().Informer().GetIndexer().Add(cluster)
}
for _, testCase := range testCases {
clusterGetter := New(informer)
t.Run(testCase.description, func(t *testing.T) {
result, err := clusterGetter.List("", testCase.query)
if err != nil {
t.Error(err)
}
if diff := cmp.Diff(result, testCase.expected); len(diff) != 0 {
t.Errorf("%T, got+ expected-, %s", testCase.expected, diff)
}
})
}
}

61
pkg/models/resources/v1alpha3/customresourcedefinition/customresourcedefinitions.go Normal file
View File

@@ -0,0 +1,61 @@
package customresourcedefinition
import (
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
apiextensionsinformers "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions"
"k8s.io/apimachinery/pkg/runtime"
"kubesphere.io/kubesphere/pkg/api"
"kubesphere.io/kubesphere/pkg/apiserver/query"
"kubesphere.io/kubesphere/pkg/models/resources/v1alpha3"
)
type crdGetter struct {
informers apiextensionsinformers.SharedInformerFactory
}
func New(informers apiextensionsinformers.SharedInformerFactory) v1alpha3.Interface {
return &crdGetter{
informers: informers,
}
}
func (c crdGetter) Get(_, name string) (runtime.Object, error) {
return c.informers.Apiextensions().V1().CustomResourceDefinitions().Lister().Get(name)
}
func (c crdGetter) List(_ string, query *query.Query) (*api.ListResult, error) {
crds, err := c.informers.Apiextensions().V1().CustomResourceDefinitions().Lister().List(query.Selector())
if err != nil {
return nil, err
}
var result []runtime.Object
for _, deploy := range crds {
result = append(result, deploy)
}
return v1alpha3.DefaultList(result, query, c.compare, c.filter), nil
}
func (c crdGetter) compare(left runtime.Object, right runtime.Object, field query.Field) bool {
leftCRD, ok := left.(*v1.CustomResourceDefinition)
if !ok {
return false
}
rightCRD, ok := right.(*v1.CustomResourceDefinition)
if !ok {
return false
}
return v1alpha3.DefaultObjectMetaCompare(leftCRD.ObjectMeta, rightCRD.ObjectMeta, field)
}
func (c crdGetter) filter(object runtime.Object, filter query.Filter) bool {
crd, ok := object.(*v1.CustomResourceDefinition)
if !ok {
return false
}
return v1alpha3.DefaultObjectMetaFilter(crd.ObjectMeta, filter)
}

97
pkg/models/resources/v1alpha3/customresourcedefinition/customresourcedefinitions_test.go Normal file
View File

@@ -0,0 +1,97 @@
package customresourcedefinition
import (
"github.com/google/go-cmp/cmp"
v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
fakeapiextensions "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake"
apiextensionsinformers "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"kubesphere.io/kubesphere/pkg/api"
"kubesphere.io/kubesphere/pkg/apiserver/query"
"testing"
)
var crds = []*v1.CustomResourceDefinition{
{
ObjectMeta: metav1.ObjectMeta{
Name: "clusters.cluster.kubesphere.io",
Labels: map[string]string{
"controller-tools.k8s.io": "1.0",
},
},
},
{
ObjectMeta: metav1.ObjectMeta{
Name: "workspaces.tenant.kubesphere.io",
Labels: map[string]string{
"controller-tools.k8s.io": "1.0",
},
},
},
}
func crdsToRuntimeObjects(crds ...*v1.CustomResourceDefinition) []runtime.Object {
items := make([]runtime.Object, 0)
for _, crd := range crds {
items = append(items, crd)
}
return items
}
func crdsToInterface(crds ...*v1.CustomResourceDefinition) []interface{} {
items := make([]interface{}, 0)
for _, crd := range crds {
items = append(items, crd)
}
return items
}
func TestCrdGetterList(t *testing.T) {
var testCases = []struct {
description string
query *query.Query
expected *api.ListResult
}{
{
description: "Test normal case",
query: &query.Query{
Filters: map[query.Field]query.Value{
query.FieldName: "clusters.cluster.kubesphere.io",
},
},
expected: &api.ListResult{
TotalItems: 1,
Items: crdsToInterface(crds[0]),
},
},
}
client := fakeapiextensions.NewSimpleClientset(crdsToRuntimeObjects(crds...)...)
informers := apiextensionsinformers.NewSharedInformerFactory(client, 0)
for _, crd := range crds {
informers.Apiextensions().V1().CustomResourceDefinitions().Informer().GetIndexer().Add(crd)
}
for _, testCase := range testCases {
crdGetter := New(informers)
t.Run(testCase.description, func(t *testing.T) {
result, err := crdGetter.List("", testCase.query)
if err != nil {
t.Error(err)
}
if diff := cmp.Diff(result, testCase.expected); len(diff) != 0 {
t.Errorf("%T, got+ expected-, %s", testCase.expected, diff)
}
})
}
}

5
pkg/models/resources/v1alpha3/interface.go
View File

@@ -48,6 +48,11 @@ func DefaultList(objects []runtime.Object, q *query.Query, compareFunc CompareFu
})
total := len(filtered)
if q.Pagination == nil {
q.Pagination = query.NoPagination
}
start, end := q.Pagination.GetValidPagination(total)
return &api.ListResult{

4
pkg/models/resources/v1alpha3/resource/resource.go
View File

@@ -31,8 +31,10 @@ import (
"kubesphere.io/kubesphere/pkg/informers"
"kubesphere.io/kubesphere/pkg/models/resources/v1alpha3"
"kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/application"
"kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/cluster"
"kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/clusterrole"
"kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/configmap"
"kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/customresourcedefinition"
"kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/deployment"
"kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/globalrole"
"kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/namespace"
@@ -67,6 +69,8 @@ func NewResourceGetter(factory informers.InformerFactory) *ResourceGetter {
getters[rbacv1.SchemeGroupVersion.WithResource("roles")] = role.New(factory.KubernetesSharedInformerFactory())
getters[rbacv1.SchemeGroupVersion.WithResource("clusterroles")] = clusterrole.New(factory.KubernetesSharedInformerFactory())
getters[snapshotv1beta1.SchemeGroupVersion.WithResource("volumesnapshots")] = volumesnapshot.New(factory.SnapshotSharedInformerFactory())
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())
return &ResourceGetter{
getters: getters,
}

4
pkg/models/resources/v1alpha3/resource/resource_test.go
View File

@@ -24,6 +24,7 @@ import (
fakeapp "github.com/kubernetes-sigs/application/pkg/client/clientset/versioned/fake"
fakeistio "istio.io/client-go/pkg/clientset/versioned/fake"
corev1 "k8s.io/api/core/v1"
fakeapiextensions "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
fakek8s "k8s.io/client-go/kubernetes/fake"
"kubesphere.io/kubesphere/pkg/api"
@@ -110,7 +111,8 @@ func prepare() *ResourceGetter {
istioClient := fakeistio.NewSimpleClientset()
appClient := fakeapp.NewSimpleClientset()
snapshotClient := fakesnapshot.NewSimpleClientset()
fakeInformerFactory := informers.NewInformerFactories(k8sClient, ksClient, istioClient, appClient, snapshotClient)
apiextensionsClient := fakeapiextensions.NewSimpleClientset()
fakeInformerFactory := informers.NewInformerFactories(k8sClient, ksClient, istioClient, appClient, snapshotClient, apiextensionsClient)
for _, namespace := range namespaces {
fakeInformerFactory.KubernetesSharedInformerFactory().Core().V1().