fix workspace member count
Signed-off-by: Roland.Ma <rolandma@yunify.com>
This commit is contained in:
@@ -18,10 +18,14 @@ package monitoring
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"time"
|
||||||
|
|
||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
"k8s.io/apimachinery/pkg/labels"
|
"k8s.io/apimachinery/pkg/labels"
|
||||||
|
"k8s.io/apimachinery/pkg/selection"
|
||||||
"k8s.io/client-go/kubernetes"
|
"k8s.io/client-go/kubernetes"
|
||||||
"k8s.io/klog"
|
"k8s.io/klog"
|
||||||
|
"kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2"
|
||||||
ksinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions"
|
ksinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions"
|
||||||
"kubesphere.io/kubesphere/pkg/constants"
|
"kubesphere.io/kubesphere/pkg/constants"
|
||||||
"kubesphere.io/kubesphere/pkg/informers"
|
"kubesphere.io/kubesphere/pkg/informers"
|
||||||
@@ -30,7 +34,6 @@ import (
|
|||||||
"kubesphere.io/kubesphere/pkg/server/params"
|
"kubesphere.io/kubesphere/pkg/server/params"
|
||||||
"kubesphere.io/kubesphere/pkg/simple/client/monitoring"
|
"kubesphere.io/kubesphere/pkg/simple/client/monitoring"
|
||||||
opclient "kubesphere.io/kubesphere/pkg/simple/client/openpitrix"
|
opclient "kubesphere.io/kubesphere/pkg/simple/client/openpitrix"
|
||||||
"time"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type MonitoringOperator interface {
|
type MonitoringOperator interface {
|
||||||
@@ -307,7 +310,9 @@ func (mo monitoringOperator) GetWorkspaceStats(workspace string) Metrics {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
memberList, err := mo.ks.Iam().V1alpha2().WorkspaceRoleBindings().Lister().List(selector)
|
r, _ := labels.NewRequirement(v1alpha2.UserReferenceLabel, selection.Exists, nil)
|
||||||
|
memberSelector := selector.DeepCopySelector().Add(*r)
|
||||||
|
memberList, err := mo.ks.Iam().V1alpha2().WorkspaceRoleBindings().Lister().List(memberSelector)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
res.Results = append(res.Results, monitoring.Metric{
|
res.Results = append(res.Results, monitoring.Metric{
|
||||||
MetricName: WorkspaceMemberCount,
|
MetricName: WorkspaceMemberCount,
|
||||||
|
|||||||
Reference in New Issue
Block a user