zishuo/onepanel
1
0
Fork 0
mirror of https://github.com/onepanelio/onepanel.git synced 2025-10-16 02:31:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

only return onepanel.io/enabled=true namespaces

Browse Source
This commit is contained in:
rushtehrani
2020-02-02 12:52:57 -08:00
parent 66a19f1e1b
commit 02f8d3dc76
10 changed files with 45 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
api/common.pb.go
View File

@@ -1,85 +0,0 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// source: common.proto
package api
import (
fmt "fmt"
proto "github.com/golang/protobuf/proto"
math "math"
)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
var _ = fmt.Errorf
var _ = math.Inf
// This is a compile-time assertion to ensure that this generated file
// is compatible with the proto package it is being compiled against.
// A compilation error at this line likely means your copy of the
// proto package needs to be updated.
const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
type ListOptions struct {
LabelSelector string `protobuf:"bytes,1,opt,name=labelSelector,proto3" json:"labelSelector,omitempty"`
FieldSelector string `protobuf:"bytes,2,opt,name=fieldSelector,proto3" json:"fieldSelector,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *ListOptions) Reset() { *m = ListOptions{} }
func (m *ListOptions) String() string { return proto.CompactTextString(m) }
func (*ListOptions) ProtoMessage() {}
func (*ListOptions) Descriptor() ([]byte, []int) {
return fileDescriptor_555bd8c177793206, []int{0}
}
func (m *ListOptions) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ListOptions.Unmarshal(m, b)
}
func (m *ListOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ListOptions.Marshal(b, m, deterministic)
}
func (m *ListOptions) XXX_Merge(src proto.Message) {
xxx_messageInfo_ListOptions.Merge(m, src)
}
func (m *ListOptions) XXX_Size() int {
return xxx_messageInfo_ListOptions.Size(m)
}
func (m *ListOptions) XXX_DiscardUnknown() {
xxx_messageInfo_ListOptions.DiscardUnknown(m)
}
var xxx_messageInfo_ListOptions proto.InternalMessageInfo
func (m *ListOptions) GetLabelSelector() string {
if m != nil {
return m.LabelSelector
}
return ""
}
func (m *ListOptions) GetFieldSelector() string {
if m != nil {
return m.FieldSelector
}
return ""
}
func init() {
proto.RegisterType((*ListOptions)(nil), "api.ListOptions")
}
func init() { proto.RegisterFile("common.proto", fileDescriptor_555bd8c177793206) }
var fileDescriptor_555bd8c177793206 = []byte{
// 103 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x49, 0xce, 0xcf, 0xcd,
0xcd, 0xcf, 0xd3, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x4e, 0x2c, 0xc8, 0x54, 0x8a, 0xe4,
0xe2, 0xf6, 0xc9, 0x2c, 0x2e, 0xf1, 0x2f, 0x28, 0xc9, 0xcc, 0xcf, 0x2b, 0x16, 0x52, 0xe1, 0xe2,
0xcd, 0x49, 0x4c, 0x4a, 0xcd, 0x09, 0x4e, 0xcd, 0x49, 0x4d, 0x2e, 0xc9, 0x2f, 0x92, 0x60, 0x54,
0x60, 0xd4, 0xe0, 0x0c, 0x42, 0x15, 0x04, 0xa9, 0x4a, 0xcb, 0x4c, 0xcd, 0x49, 0x81, 0xab, 0x62,
0x82, 0xa8, 0x42, 0x11, 0x4c, 0x62, 0x03, 0x5b, 0x63, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xdd,
0xb8, 0x24, 0x01, 0x76, 0x00, 0x00, 0x00,
}

8
api/common.proto
View File

@@ -1,8 +0,0 @@
syntax = "proto3";
package api;
message ListOptions {
string labelSelector = 1;
string fieldSelector = 2;
}

15
api/common.swagger.json
View File

@@ -1,15 +0,0 @@
{
"swagger": "2.0",
"info": {
"title": "common.proto",
"version": "version not set"
},
"consumes": [
"application/json"
],
"produces": [
"application/json"
],
"paths": {},
"definitions": {}
}

98
api/namespace.pb.go
View File

@@ -7,6 +7,7 @@ import (
context "context"
fmt "fmt"
proto "github.com/golang/protobuf/proto"
empty "github.com/golang/protobuf/ptypes/empty"
_ "google.golang.org/genproto/googleapis/api/annotations"
grpc "google.golang.org/grpc"
codes "google.golang.org/grpc/codes"
@@ -25,45 +26,6 @@ var _ = math.Inf
// proto package needs to be updated.
const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
type ListNamespacesRequest struct {
ListOptions *ListOptions `protobuf:"bytes,1,opt,name=listOptions,proto3" json:"listOptions,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *ListNamespacesRequest) Reset() { *m = ListNamespacesRequest{} }
func (m *ListNamespacesRequest) String() string { return proto.CompactTextString(m) }
func (*ListNamespacesRequest) ProtoMessage() {}
func (*ListNamespacesRequest) Descriptor() ([]byte, []int) {
return fileDescriptor_ecb1e126f615f5dd, []int{0}
}
func (m *ListNamespacesRequest) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ListNamespacesRequest.Unmarshal(m, b)
}
func (m *ListNamespacesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ListNamespacesRequest.Marshal(b, m, deterministic)
}
func (m *ListNamespacesRequest) XXX_Merge(src proto.Message) {
xxx_messageInfo_ListNamespacesRequest.Merge(m, src)
}
func (m *ListNamespacesRequest) XXX_Size() int {
return xxx_messageInfo_ListNamespacesRequest.Size(m)
}
func (m *ListNamespacesRequest) XXX_DiscardUnknown() {
xxx_messageInfo_ListNamespacesRequest.DiscardUnknown(m)
}
var xxx_messageInfo_ListNamespacesRequest proto.InternalMessageInfo
func (m *ListNamespacesRequest) GetListOptions() *ListOptions {
if m != nil {
return m.ListOptions
}
return nil
}
type ListNamespacesResponse struct {
Count int32 `protobuf:"varint,1,opt,name=count,proto3" json:"count,omitempty"`
Namespaces []*Namespace `protobuf:"bytes,2,rep,name=namespaces,proto3" json:"namespaces,omitempty"`
@@ -76,7 +38,7 @@ func (m *ListNamespacesResponse) Reset() { *m = ListNamespacesResponse{}
func (m *ListNamespacesResponse) String() string { return proto.CompactTextString(m) }
func (*ListNamespacesResponse) ProtoMessage() {}
func (*ListNamespacesResponse) Descriptor() ([]byte, []int) {
return fileDescriptor_ecb1e126f615f5dd, []int{1}
return fileDescriptor_ecb1e126f615f5dd, []int{0}
}
func (m *ListNamespacesResponse) XXX_Unmarshal(b []byte) error {
@@ -123,7 +85,7 @@ func (m *Namespace) Reset() { *m = Namespace{} }
func (m *Namespace) String() string { return proto.CompactTextString(m) }
func (*Namespace) ProtoMessage() {}
func (*Namespace) Descriptor() ([]byte, []int) {
return fileDescriptor_ecb1e126f615f5dd, []int{2}
return fileDescriptor_ecb1e126f615f5dd, []int{1}
}
func (m *Namespace) XXX_Unmarshal(b []byte) error {
@@ -159,7 +121,6 @@ func (m *Namespace) GetLabels() map[string]string {
}
func init() {
proto.RegisterType((*ListNamespacesRequest)(nil), "api.ListNamespacesRequest")
proto.RegisterType((*ListNamespacesResponse)(nil), "api.ListNamespacesResponse")
proto.RegisterType((*Namespace)(nil), "api.Namespace")
proto.RegisterMapType((map[string]string)(nil), "api.Namespace.LabelsEntry")
@@ -168,27 +129,26 @@ func init() {
func init() { proto.RegisterFile("namespace.proto", fileDescriptor_ecb1e126f615f5dd) }
var fileDescriptor_ecb1e126f615f5dd = []byte{
// 313 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x91, 0xb1, 0x4e, 0xfb, 0x30,
0x10, 0xc6, 0x95, 0xf4, 0xdf, 0x4a, 0xbd, 0xfc, 0x55, 0x2a, 0x0b, 0x50, 0x64, 0x18, 0xaa, 0x4c,
0x9d, 0x12, 0x35, 0x2c, 0xc0, 0xce, 0x44, 0x05, 0x92, 0xd9, 0x91, 0xdc, 0xe8, 0x54, 0x59, 0x4d,
0x6c, 0x13, 0x3b, 0x91, 0x3a, 0x21, 0xf1, 0x00, 0x2c, 0x3c, 0x1a, 0xaf, 0xc0, 0x83, 0xa0, 0x38,
0x6d, 0x9a, 0x02, 0xdb, 0xdd, 0x7d, 0x9f, 0x7f, 0xb6, 0xbf, 0x83, 0x13, 0xc9, 0x0b, 0x34, 0x9a,
0x67, 0x18, 0xeb, 0x52, 0x59, 0x45, 0x06, 0x5c, 0x0b, 0x7a, 0xb9, 0x56, 0x6a, 0x9d, 0x63, 0xc2,
0xb5, 0x48, 0xb8, 0x94, 0xca, 0x72, 0x2b, 0x94, 0x34, 0xad, 0x85, 0xfe, 0xcf, 0x54, 0x51, 0x28,
0xd9, 0x76, 0xd1, 0x3d, 0x9c, 0x2d, 0x85, 0xb1, 0x0f, 0x7b, 0x8e, 0x61, 0xf8, 0x52, 0xa1, 0xb1,
0x24, 0x85, 0x20, 0x17, 0xc6, 0x3e, 0x6a, 0x77, 0x36, 0xf4, 0x66, 0xde, 0x3c, 0x48, 0xa7, 0x31,
0xd7, 0x22, 0x5e, 0x1e, 0xe6, 0xac, 0x6f, 0x8a, 0x9e, 0xe1, 0xfc, 0x27, 0xcc, 0x68, 0x25, 0x0d,
0x92, 0x53, 0x18, 0x66, 0xaa, 0x92, 0xd6, 0x71, 0x86, 0xac, 0x6d, 0x48, 0x0c, 0xd0, 0x7d, 0xc0,
0x84, 0xfe, 0x6c, 0x30, 0x0f, 0xd2, 0x89, 0xbb, 0xa2, 0x43, 0xb0, 0x9e, 0x23, 0x7a, 0xf7, 0x60,
0xdc, 0x29, 0x84, 0xc0, 0xbf, 0x46, 0x73, 0xc8, 0x31, 0x73, 0x35, 0x49, 0x61, 0x94, 0xf3, 0x15,
0xe6, 0x7b, 0x1a, 0x3d, 0xa6, 0xc5, 0x4b, 0x27, 0xde, 0x49, 0x5b, 0x6e, 0xd9, 0xce, 0x49, 0x6f,
0x20, 0xe8, 0x8d, 0xc9, 0x14, 0x06, 0x1b, 0xdc, 0xee, 0xa8, 0x4d, 0xd9, 0x3c, 0xbe, 0xe6, 0x79,
0x85, 0xa1, 0xef, 0x66, 0x6d, 0x73, 0xeb, 0x5f, 0x7b, 0xe9, 0x2b, 0x4c, 0x3b, 0xf6, 0x13, 0x96,
0xb5, 0xc8, 0x90, 0x6c, 0x60, 0x72, 0x1c, 0x02, 0xa1, 0x5d, 0x6a, 0xbf, 0x62, 0xa6, 0x17, 0x7f,
0x6a, 0x6d, 0x6a, 0xd1, 0xec, 0xed, 0xf3, 0xeb, 0xc3, 0xa7, 0x24, 0x6c, 0x56, 0x69, 0x92, 0x7a,
0xb1, 0x42, 0xcb, 0x17, 0xc9, 0x21, 0x91, 0xd5, 0xc8, 0x6d, 0xf1, 0xea, 0x3b, 0x00, 0x00, 0xff,
0xff, 0xce, 0x0e, 0xd9, 0x0d, 0x09, 0x02, 0x00, 0x00,
// 291 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x91, 0xbf, 0x6a, 0xc3, 0x30,
0x10, 0xc6, 0xb1, 0xd3, 0x04, 0x72, 0x81, 0x34, 0x88, 0x12, 0x8c, 0xd2, 0x21, 0x78, 0xca, 0x24,
0x13, 0x77, 0x69, 0xbb, 0x67, 0x0b, 0x1d, 0xdc, 0xbd, 0x20, 0x9b, 0xab, 0x11, 0x75, 0x24, 0x61,
0xc9, 0x06, 0xd3, 0xad, 0x0f, 0xd0, 0xa5, 0x8f, 0xd6, 0x57, 0xe8, 0x83, 0x14, 0xcb, 0x7f, 0x9a,
0x40, 0x37, 0xdd, 0x7d, 0xc7, 0x8f, 0x8f, 0x9f, 0xe0, 0x5a, 0xf2, 0x13, 0x1a, 0xcd, 0x33, 0x64,
0xba, 0x54, 0x56, 0x91, 0x09, 0xd7, 0x82, 0xde, 0xe6, 0x4a, 0xe5, 0x05, 0x46, 0x5c, 0x8b, 0x88,
0x4b, 0xa9, 0x2c, 0xb7, 0x42, 0x49, 0xd3, 0x9d, 0xd0, 0x4d, 0x9f, 0xba, 0x29, 0xad, 0x5e, 0x23,
0x3c, 0x69, 0xdb, 0x74, 0x61, 0xf8, 0x02, 0xeb, 0xa3, 0x30, 0xf6, 0x69, 0xc0, 0x9a, 0x04, 0x8d,
0x56, 0xd2, 0x20, 0xb9, 0x81, 0x69, 0xa6, 0x2a, 0x69, 0x03, 0x6f, 0xeb, 0xed, 0xa6, 0x49, 0x37,
0x10, 0x06, 0x30, 0x56, 0x30, 0x81, 0xbf, 0x9d, 0xec, 0x16, 0xf1, 0x92, 0x71, 0x2d, 0xd8, 0x88,
0x48, 0xce, 0x2e, 0xc2, 0x4f, 0x0f, 0xe6, 0x63, 0x42, 0x08, 0x5c, 0xb5, 0x99, 0x43, 0xce, 0x13,
0xf7, 0x26, 0x31, 0xcc, 0x0a, 0x9e, 0x62, 0x31, 0xd0, 0xe8, 0x25, 0x8d, 0x1d, 0x5d, 0x78, 0x90,
0xb6, 0x6c, 0x92, 0xfe, 0x92, 0x3e, 0xc0, 0xe2, 0x6c, 0x4d, 0x56, 0x30, 0x79, 0xc3, 0xa6, 0xa7,
0xb6, 0xcf, 0xb6, 0x7c, 0xcd, 0x8b, 0x0a, 0x03, 0xdf, 0xed, 0xba, 0xe1, 0xd1, 0xbf, 0xf7, 0xe2,
0x77, 0x58, 0x8d, 0xec, 0x67, 0x2c, 0x6b, 0x91, 0x21, 0xc9, 0x61, 0x79, 0x29, 0x81, 0xac, 0x59,
0x27, 0x8d, 0x0d, 0xd2, 0xd8, 0xa1, 0x95, 0x46, 0x37, 0xae, 0xdc, 0xff, 0xc6, 0xc2, 0xed, 0xc7,
0xf7, 0xcf, 0x97, 0x4f, 0x49, 0xd0, 0x7e, 0x84, 0x89, 0xea, 0x7d, 0x8a, 0x96, 0xef, 0xa3, 0x3f,
0x1b, 0xe9, 0xcc, 0xe1, 0xee, 0x7e, 0x03, 0x00, 0x00, 0xff, 0xff, 0x0f, 0x13, 0xb9, 0xd3, 0xc7,
0x01, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
@@ -203,7 +163,7 @@ const _ = grpc.SupportPackageIsVersion4
//
// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
type NamespaceServiceClient interface {
ListNamespaces(ctx context.Context, in *ListNamespacesRequest, opts ...grpc.CallOption) (*ListNamespacesResponse, error)
ListNamespaces(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*ListNamespacesResponse, error)
}
type namespaceServiceClient struct {
@@ -214,7 +174,7 @@ func NewNamespaceServiceClient(cc *grpc.ClientConn) NamespaceServiceClient {
return &namespaceServiceClient{cc}
}
func (c *namespaceServiceClient) ListNamespaces(ctx context.Context, in *ListNamespacesRequest, opts ...grpc.CallOption) (*ListNamespacesResponse, error) {
func (c *namespaceServiceClient) ListNamespaces(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*ListNamespacesResponse, error) {
out := new(ListNamespacesResponse)
err := c.cc.Invoke(ctx, "/api.NamespaceService/ListNamespaces", in, out, opts...)
if err != nil {
@@ -225,14 +185,14 @@ func (c *namespaceServiceClient) ListNamespaces(ctx context.Context, in *ListNam
// NamespaceServiceServer is the server API for NamespaceService service.
type NamespaceServiceServer interface {
ListNamespaces(context.Context, *ListNamespacesRequest) (*ListNamespacesResponse, error)
ListNamespaces(context.Context, *empty.Empty) (*ListNamespacesResponse, error)
}
// UnimplementedNamespaceServiceServer can be embedded to have forward compatible implementations.
type UnimplementedNamespaceServiceServer struct {
}
func (*UnimplementedNamespaceServiceServer) ListNamespaces(ctx context.Context, req *ListNamespacesRequest) (*ListNamespacesResponse, error) {
func (*UnimplementedNamespaceServiceServer) ListNamespaces(ctx context.Context, req *empty.Empty) (*ListNamespacesResponse, error) {
return nil, status.Errorf(codes.Unimplemented, "method ListNamespaces not implemented")
}
@@ -241,7 +201,7 @@ func RegisterNamespaceServiceServer(s *grpc.Server, srv NamespaceServiceServer)
}
func _NamespaceService_ListNamespaces_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(ListNamespacesRequest)
in := new(empty.Empty)
if err := dec(in); err != nil {
return nil, err
}
@@ -253,7 +213,7 @@ func _NamespaceService_ListNamespaces_Handler(srv interface{}, ctx context.Conte
FullMethod: "/api.NamespaceService/ListNamespaces",
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(NamespaceServiceServer).ListNamespaces(ctx, req.(*ListNamespacesRequest))
return srv.(NamespaceServiceServer).ListNamespaces(ctx, req.(*empty.Empty))
}
return interceptor(ctx, in, info, handler)
}

20
api/namespace.pb.gw.go
View File

@@ -15,6 +15,7 @@ import (
"github.com/golang/protobuf/descriptor"
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes/empty"
"github.com/grpc-ecosystem/grpc-gateway/runtime"
"github.com/grpc-ecosystem/grpc-gateway/utilities"
"google.golang.org/grpc"
@@ -31,34 +32,19 @@ var _ = runtime.String
var _ = utilities.NewDoubleArray
var _ = descriptor.ForMessage
var (
filter_NamespaceService_ListNamespaces_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
)
func request_NamespaceService_ListNamespaces_0(ctx context.Context, marshaler runtime.Marshaler, client NamespaceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
var protoReq ListNamespacesRequest
var protoReq empty.Empty
var metadata runtime.ServerMetadata
if err := req.ParseForm(); err != nil {
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
}
if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_NamespaceService_ListNamespaces_0); err != nil {
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
}
msg, err := client.ListNamespaces(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
return msg, metadata, err
}
func local_request_NamespaceService_ListNamespaces_0(ctx context.Context, marshaler runtime.Marshaler, server NamespaceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
var protoReq ListNamespacesRequest
var protoReq empty.Empty
var metadata runtime.ServerMetadata
if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_NamespaceService_ListNamespaces_0); err != nil {
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
}
msg, err := server.ListNamespaces(ctx, &protoReq)
return msg, metadata, err

8
api/namespace.proto
View File

@@ -3,20 +3,16 @@ syntax = "proto3";
package api;
import "google/api/annotations.proto";
import "common.proto";
import "google/protobuf/empty.proto";
service NamespaceService {
rpc ListNamespaces (ListNamespacesRequest) returns (ListNamespacesResponse) {
rpc ListNamespaces(google.protobuf.Empty) returns (ListNamespacesResponse) {
option (google.api.http) = {
get: "/apis/v1beta1/namespaces"
};
}
}
message ListNamespacesRequest {
ListOptions listOptions = 1;
}
message ListNamespacesResponse {
int32 count = 1;
repeated Namespace namespaces = 2;

25
api/namespace.swagger.json
View File

@@ -22,20 +22,6 @@
}
}
},
"parameters": [
{
"name": "listOptions.labelSelector",
"in": "query",
"required": false,
"type": "string"
},
{
"name": "listOptions.fieldSelector",
"in": "query",
"required": false,
"type": "string"
}
],
"tags": [
"NamespaceService"
]
@@ -58,17 +44,6 @@
}
}
},
"apiListOptions": {
"type": "object",
"properties": {
"labelSelector": {
"type": "string"
},
"fieldSelector": {
"type": "string"
}
}
},
"apiNamespace": {
"type": "object",
"properties": {

10
manager/namespace_manager.go
View File

@@ -1,9 +1,15 @@
package manager
import (
"fmt"
"github.com/onepanelio/core/model"
)
func (r *ResourceManager) ListNamespaces(opts model.ListOptions) (namespaces []*model.Namespace, err error) {
return r.kubeClient.ListNamespaces(opts)
var onepanelEnabledLabelKey = labelKeyPrefix + "enabled"
func (r *ResourceManager) ListNamespaces() (namespaces []*model.Namespace, err error) {
return r.kubeClient.ListNamespaces(model.ListOptions{
LabelSelector: fmt.Sprintf("%s=%s", onepanelEnabledLabelKey, "true"),
})
}

5
server/namespace_server.go
View File

@@ -3,6 +3,7 @@ package server
import (
"context"
"github.com/golang/protobuf/ptypes/empty"
"github.com/onepanelio/core/api"
"github.com/onepanelio/core/manager"
"github.com/onepanelio/core/model"
@@ -27,8 +28,8 @@ func apiNamespace(ns *model.Namespace) (namespace *api.Namespace) {
return
}
func (s *NamespaceServer) ListNamespaces(ctx context.Context, req *api.ListNamespacesRequest) (*api.ListNamespacesResponse, error) {
namespaces, err := s.resourceManager.ListNamespaces(modelListOptions(req.ListOptions))
func (s *NamespaceServer) ListNamespaces(ctx context.Context, empty *empty.Empty) (*api.ListNamespacesResponse, error) {
namespaces, err := s.resourceManager.ListNamespaces()
if err != nil {
return nil, util.NewUserError(codes.Unknown, "Unknown error.")
}

15
server/server.go
View File

@@ -1,22 +1,7 @@
package server
import (
"github.com/onepanelio/core/api"
"github.com/onepanelio/core/model"
"github.com/onepanelio/core/util"
)
var userError *util.UserError
func modelListOptions(lo *api.ListOptions) (listOptions model.ListOptions) {
if lo == nil {
listOptions = model.ListOptions{}
return
}
listOptions = model.ListOptions{
LabelSelector: lo.LabelSelector,
FieldSelector: lo.FieldSelector,
}
return
}