1. change glog to klog
2. move types to api package to avoid cyclic import
This commit is contained in:
@@ -20,12 +20,12 @@ package components
|
||||
import (
|
||||
"fmt"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/klog"
|
||||
"kubesphere.io/kubesphere/pkg/models"
|
||||
"kubesphere.io/kubesphere/pkg/simple/client"
|
||||
|
||||
"kubesphere.io/kubesphere/pkg/informers"
|
||||
|
||||
"github.com/golang/glog"
|
||||
corev1 "k8s.io/api/core/v1"
|
||||
"k8s.io/apimachinery/pkg/labels"
|
||||
|
||||
@@ -102,7 +102,7 @@ func GetSystemHealthStatus() (*models.HealthStatus, error) {
|
||||
// get kubesphere-system components
|
||||
components, err := GetAllComponentsStatus()
|
||||
if err != nil {
|
||||
glog.Errorln(err)
|
||||
klog.Errorln(err)
|
||||
}
|
||||
|
||||
status.KubeSphereComponents = components
|
||||
@@ -111,7 +111,7 @@ func GetSystemHealthStatus() (*models.HealthStatus, error) {
|
||||
// get node status
|
||||
nodes, err := nodeLister.List(labels.Everything())
|
||||
if err != nil {
|
||||
glog.Errorln(err)
|
||||
klog.Errorln(err)
|
||||
return status, nil
|
||||
}
|
||||
|
||||
@@ -145,7 +145,7 @@ func GetAllComponentsStatus() ([]models.ComponentStatus, error) {
|
||||
services, err := serviceLister.Services(ns).List(labels.Everything())
|
||||
|
||||
if err != nil {
|
||||
glog.Error(err)
|
||||
klog.Error(err)
|
||||
continue
|
||||
}
|
||||
|
||||
@@ -169,7 +169,7 @@ func GetAllComponentsStatus() ([]models.ComponentStatus, error) {
|
||||
pods, err := podLister.Pods(ns).List(labels.SelectorFromValidatedSet(service.Spec.Selector))
|
||||
|
||||
if err != nil {
|
||||
glog.Errorln(err)
|
||||
klog.Errorln(err)
|
||||
continue
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user