add k8s networkpolicy resource
Signed-off-by: Duan Jiong <djduanjiong@gmail.com>
This commit is contained in:
@@ -282,6 +282,8 @@ func (s *APIServer) waitForResourceSync(stopCh <-chan struct{}) error {
|
|||||||
{Group: "extensions", Version: "v1beta1", Resource: "ingresses"},
|
{Group: "extensions", Version: "v1beta1", Resource: "ingresses"},
|
||||||
|
|
||||||
{Group: "autoscaling", Version: "v2beta2", Resource: "horizontalpodautoscalers"},
|
{Group: "autoscaling", Version: "v2beta2", Resource: "horizontalpodautoscalers"},
|
||||||
|
|
||||||
|
{Group: "networking.k8s.io", Version: "v1", Resource: "networkpolicies"},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, gvr := range k8sGVRs {
|
for _, gvr := range k8sGVRs {
|
||||||
|
|||||||
@@ -0,0 +1,59 @@
|
|||||||
|
package networkpolicy
|
||||||
|
|
||||||
|
import (
|
||||||
|
v1 "k8s.io/api/networking/v1"
|
||||||
|
"k8s.io/apimachinery/pkg/labels"
|
||||||
|
"k8s.io/apimachinery/pkg/runtime"
|
||||||
|
"k8s.io/client-go/informers"
|
||||||
|
"kubesphere.io/kubesphere/pkg/api"
|
||||||
|
"kubesphere.io/kubesphere/pkg/apiserver/query"
|
||||||
|
"kubesphere.io/kubesphere/pkg/models/resources/v1alpha3"
|
||||||
|
)
|
||||||
|
|
||||||
|
type networkpolicyGetter struct {
|
||||||
|
informers informers.SharedInformerFactory
|
||||||
|
}
|
||||||
|
|
||||||
|
func New(informers informers.SharedInformerFactory) v1alpha3.Interface {
|
||||||
|
return &networkpolicyGetter{informers: informers}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (n networkpolicyGetter) Get(namespace, name string) (runtime.Object, error) {
|
||||||
|
return n.informers.Networking().V1().NetworkPolicies().Lister().NetworkPolicies(namespace).Get(name)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (n networkpolicyGetter) List(namespace string, query *query.Query) (*api.ListResult, error) {
|
||||||
|
nps, err := n.informers.Networking().V1().NetworkPolicies().Lister().NetworkPolicies(namespace).List(labels.Everything())
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var result []runtime.Object
|
||||||
|
for _, item := range nps {
|
||||||
|
result = append(result, item)
|
||||||
|
}
|
||||||
|
|
||||||
|
return v1alpha3.DefaultList(result, query, n.compare, n.filter), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (n networkpolicyGetter) filter(item runtime.Object, filter query.Filter) bool {
|
||||||
|
np, ok := item.(*v1.NetworkPolicy)
|
||||||
|
if !ok {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
return v1alpha3.DefaultObjectMetaFilter(np.ObjectMeta, filter)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (n networkpolicyGetter) compare(left runtime.Object, right runtime.Object, field query.Field) bool {
|
||||||
|
leftNP, ok := left.(*v1.NetworkPolicy)
|
||||||
|
if !ok {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
rightNP, ok := right.(*v1.NetworkPolicy)
|
||||||
|
if !ok {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return v1alpha3.DefaultObjectMetaCompare(leftNP.ObjectMeta, rightNP.ObjectMeta, field)
|
||||||
|
}
|
||||||
@@ -0,0 +1,93 @@
|
|||||||
|
package networkpolicy
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/google/go-cmp/cmp"
|
||||||
|
netv1 "k8s.io/api/networking/v1"
|
||||||
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
|
"k8s.io/client-go/informers"
|
||||||
|
"k8s.io/client-go/kubernetes/fake"
|
||||||
|
"kubesphere.io/kubesphere/pkg/api"
|
||||||
|
"kubesphere.io/kubesphere/pkg/apiserver/query"
|
||||||
|
"kubesphere.io/kubesphere/pkg/models/resources/v1alpha3"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestListNetworkPolicies(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
description string
|
||||||
|
namespace string
|
||||||
|
query *query.Query
|
||||||
|
expected *api.ListResult
|
||||||
|
expectedErr error
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
"test name filter",
|
||||||
|
"default",
|
||||||
|
&query.Query{
|
||||||
|
Pagination: &query.Pagination{
|
||||||
|
Limit: 10,
|
||||||
|
Offset: 0,
|
||||||
|
},
|
||||||
|
SortBy: query.FieldName,
|
||||||
|
Ascending: false,
|
||||||
|
Filters: map[query.Field]query.Value{
|
||||||
|
query.FieldNamespace: query.Value("default"),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
&api.ListResult{
|
||||||
|
Items: []interface{}{foo3, foo2, foo1},
|
||||||
|
TotalItems: len(networkpolicies),
|
||||||
|
},
|
||||||
|
nil,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
getter := prepare()
|
||||||
|
|
||||||
|
for _, test := range tests {
|
||||||
|
got, err := getter.List(test.namespace, test.query)
|
||||||
|
if test.expectedErr != nil && err != test.expectedErr {
|
||||||
|
t.Errorf("expected error, got nothing")
|
||||||
|
} else if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if diff := cmp.Diff(got, test.expected); diff != "" {
|
||||||
|
t.Errorf("%T differ (-got, +want): %s", test.expected, diff)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
foo1 = &netv1.NetworkPolicy{
|
||||||
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
|
Name: "foo1",
|
||||||
|
Namespace: "default",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
foo2 = &netv1.NetworkPolicy{
|
||||||
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
|
Name: "foo2",
|
||||||
|
Namespace: "default",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
foo3 = &netv1.NetworkPolicy{
|
||||||
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
|
Name: "foo3",
|
||||||
|
Namespace: "default",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
networkpolicies = []interface{}{foo1, foo2, foo3}
|
||||||
|
)
|
||||||
|
|
||||||
|
func prepare() v1alpha3.Interface {
|
||||||
|
|
||||||
|
client := fake.NewSimpleClientset()
|
||||||
|
informer := informers.NewSharedInformerFactory(client, 0)
|
||||||
|
|
||||||
|
for _, networkpolicy := range networkpolicies {
|
||||||
|
informer.Networking().V1().NetworkPolicies().Informer().GetIndexer().Add(networkpolicy)
|
||||||
|
}
|
||||||
|
|
||||||
|
return New(informer)
|
||||||
|
}
|
||||||
@@ -35,6 +35,7 @@ import (
|
|||||||
"kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/deployment"
|
"kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/deployment"
|
||||||
"kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/globalrole"
|
"kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/globalrole"
|
||||||
"kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/namespace"
|
"kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/namespace"
|
||||||
|
"kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/networkpolicy"
|
||||||
"kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/pod"
|
"kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/pod"
|
||||||
"kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/role"
|
"kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/role"
|
||||||
"kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/user"
|
"kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/user"
|
||||||
@@ -56,6 +57,7 @@ func NewResourceGetter(factory informers.InformerFactory) *ResourceGetter {
|
|||||||
getters[schema.GroupVersionResource{Group: "", Version: "v1", Resource: "configmaps"}] = configmap.New(factory.KubernetesSharedInformerFactory())
|
getters[schema.GroupVersionResource{Group: "", Version: "v1", Resource: "configmaps"}] = configmap.New(factory.KubernetesSharedInformerFactory())
|
||||||
getters[schema.GroupVersionResource{Group: "", Version: "v1", Resource: "pods"}] = pod.New(factory.KubernetesSharedInformerFactory())
|
getters[schema.GroupVersionResource{Group: "", Version: "v1", Resource: "pods"}] = pod.New(factory.KubernetesSharedInformerFactory())
|
||||||
getters[schema.GroupVersionResource{Group: "app.k8s.io", Version: "v1beta1", Resource: "applications"}] = application.New(factory.ApplicationSharedInformerFactory())
|
getters[schema.GroupVersionResource{Group: "app.k8s.io", Version: "v1beta1", Resource: "applications"}] = application.New(factory.ApplicationSharedInformerFactory())
|
||||||
|
getters[schema.GroupVersionResource{Group: "networking.k8s.io", Version: "v1", Resource: "networkpolicies"}] = networkpolicy.New(factory.KubernetesSharedInformerFactory())
|
||||||
getters[tenantv1alpha1.SchemeGroupVersion.WithResource(tenantv1alpha1.ResourcePluralWorkspace)] = workspace.New(factory.KubeSphereSharedInformerFactory())
|
getters[tenantv1alpha1.SchemeGroupVersion.WithResource(tenantv1alpha1.ResourcePluralWorkspace)] = workspace.New(factory.KubeSphereSharedInformerFactory())
|
||||||
getters[iamv1alpha2.SchemeGroupVersion.WithResource(iamv1alpha2.ResourcesPluralGlobalRole)] = globalrole.New(factory.KubeSphereSharedInformerFactory())
|
getters[iamv1alpha2.SchemeGroupVersion.WithResource(iamv1alpha2.ResourcesPluralGlobalRole)] = globalrole.New(factory.KubeSphereSharedInformerFactory())
|
||||||
getters[iamv1alpha2.SchemeGroupVersion.WithResource(iamv1alpha2.ResourcesPluralWorkspaceRole)] = workspacerole.New(factory.KubeSphereSharedInformerFactory())
|
getters[iamv1alpha2.SchemeGroupVersion.WithResource(iamv1alpha2.ResourcesPluralWorkspaceRole)] = workspacerole.New(factory.KubeSphereSharedInformerFactory())
|
||||||
|
|||||||
Reference in New Issue
Block a user