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

fix federatednamespace resource scope

Browse Source 
Signed-off-by: hongming <talonwan@yunify.com>
This commit is contained in:
hongming
2020-07-22 22:36:51 +08:00
parent 3525fc5507
commit c103f47abd
11 changed files with 84 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/models/resources/v1alpha3/federatednamespace/federatednamespaces.go
View File

@@ -33,8 +33,8 @@ func New(informers informers.SharedInformerFactory) v1alpha3.Interface {
return &federatedNamespacesGetter{informers: informers}
}
func (n federatedNamespacesGetter) Get(_, name string) (runtime.Object, error) {
return n.informers.Types().V1beta1().FederatedNamespaces().Lister().Get(name)
func (n federatedNamespacesGetter) Get(namespace, name string) (runtime.Object, error) {
return n.informers.Types().V1beta1().FederatedNamespaces().Lister().FederatedNamespaces(namespace).Get(name)
}
func (n federatedNamespacesGetter) List(_ string, query *query.Query) (*api.ListResult, error) {

6
pkg/models/tenant/tenant.go
View File

@@ -222,8 +222,10 @@ func (t *tenantOperator) ListFederatedNamespaces(user user.Info, workspace strin
for _, roleBinding := range roleBindings {
namespace, err := t.resourceGetter.Get(typesv1beta1.ResourcesPluralFedNamespace, roleBinding.Namespace, roleBinding.Namespace)
if err != nil {
if errors.IsNotFound(err) {
continue
}
klog.Error(err)
return nil, err
}
@@ -239,7 +241,7 @@ func (t *tenantOperator) ListFederatedNamespaces(user user.Info, workspace strin
}
result := resources.DefaultList(namespaces, queryParam, func(left runtime.Object, right runtime.Object, field query.Field) bool {
return resources.DefaultObjectMetaCompare(left.(*corev1.Namespace).ObjectMeta, right.(*corev1.Namespace).ObjectMeta, field)
return resources.DefaultObjectMetaCompare(left.(*typesv1beta1.FederatedNamespace).ObjectMeta, right.(*typesv1beta1.FederatedNamespace).ObjectMeta, field)
}, func(object runtime.Object, filter query.Filter) bool {
namespace := object.(*typesv1beta1.FederatedNamespace).ObjectMeta
if workspace != "" {