1. change glog to klog

2. move types to api package to avoid cyclic import
2019-09-16 12:46:53 +08:00
parent 79735c4543
commit 97c9a1786a
109 changed files with 1076 additions and 552 deletions
--- a/pkg/models/resources/clusterroles.go
+++ b/pkg/models/resources/clusterroles.go
@@ -20,7 +20,7 @@ package resources
 import (
 	"kubesphere.io/kubesphere/pkg/constants"
 	"kubesphere.io/kubesphere/pkg/informers"
-	"kubesphere.io/kubesphere/pkg/params"
+	"kubesphere.io/kubesphere/pkg/server/params"
 	"kubesphere.io/kubesphere/pkg/utils/k8sutil"
 	"kubesphere.io/kubesphere/pkg/utils/sliceutil"
 	"sort"
--- a/pkg/models/resources/configmaps.go
+++ b/pkg/models/resources/configmaps.go
@@ -20,7 +20,7 @@ package resources
 import (
 	"kubesphere.io/kubesphere/pkg/constants"
 	"kubesphere.io/kubesphere/pkg/informers"
-	"kubesphere.io/kubesphere/pkg/params"
+	"kubesphere.io/kubesphere/pkg/server/params"
 	"kubesphere.io/kubesphere/pkg/utils/sliceutil"
 	"sort"
 	"strings"
--- a/pkg/models/resources/cronjobs.go
+++ b/pkg/models/resources/cronjobs.go
@@ -20,7 +20,7 @@ package resources
 import (
 	"kubesphere.io/kubesphere/pkg/constants"
 	"kubesphere.io/kubesphere/pkg/informers"
-	"kubesphere.io/kubesphere/pkg/params"
+	"kubesphere.io/kubesphere/pkg/server/params"
 	"kubesphere.io/kubesphere/pkg/utils/sliceutil"
 	"sort"
 	"strings"
--- a/pkg/models/resources/daemonsets.go
+++ b/pkg/models/resources/daemonsets.go
@@ -20,7 +20,7 @@ package resources
 import (
 	"kubesphere.io/kubesphere/pkg/constants"
 	"kubesphere.io/kubesphere/pkg/informers"
-	"kubesphere.io/kubesphere/pkg/params"
+	"kubesphere.io/kubesphere/pkg/server/params"
 	"kubesphere.io/kubesphere/pkg/utils/sliceutil"
 	"sort"
 	"strings"
--- a/pkg/models/resources/deployments.go
+++ b/pkg/models/resources/deployments.go
@@ -20,7 +20,7 @@ package resources
 import (
 	"kubesphere.io/kubesphere/pkg/constants"
 	"kubesphere.io/kubesphere/pkg/informers"
-	"kubesphere.io/kubesphere/pkg/params"
+	"kubesphere.io/kubesphere/pkg/server/params"
 	"kubesphere.io/kubesphere/pkg/utils/sliceutil"
 	"sort"
 	"strings"
--- a/pkg/models/resources/extraannotations.go
+++ b/pkg/models/resources/extraannotations.go
@@ -18,10 +18,10 @@
 package resources

 import (
-	"github.com/golang/glog"
 	corev1 "k8s.io/api/core/v1"
 	storagev1 "k8s.io/api/storage/v1"
 	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/klog"
 	"kubesphere.io/kubesphere/pkg/informers"
 	"strconv"
 )
@@ -46,7 +46,7 @@ func (i extraAnnotationInjector) injectStorageClass(item *storagev1.StorageClass
 	count, err := countPvcByStorageClass(item.Name)

 	if err != nil {
-		glog.Errorf("inject annotation failed %+v", err)
+		klog.Errorf("inject annotation failed %+v", err)
 		return item
 	}

@@ -65,7 +65,7 @@ func (i extraAnnotationInjector) injectPersistentVolumeClaim(item *corev1.Persis
 	podLister := informers.SharedInformerFactory().Core().V1().Pods().Lister()
 	pods, err := podLister.Pods(item.Namespace).List(labels.Everything())
 	if err != nil {
-		glog.Errorf("inject annotation failed %+v", err)
+		klog.Errorf("inject annotation failed %+v", err)
 		return item
 	}

--- a/pkg/models/resources/horizontalpodautoscalers.go
+++ b/pkg/models/resources/horizontalpodautoscalers.go
@@ -21,7 +21,7 @@ import (
 	autoscalingv2beta2 "k8s.io/api/autoscaling/v2beta2"
 	"kubesphere.io/kubesphere/pkg/constants"
 	"kubesphere.io/kubesphere/pkg/informers"
-	"kubesphere.io/kubesphere/pkg/params"
+	"kubesphere.io/kubesphere/pkg/server/params"
 	"kubesphere.io/kubesphere/pkg/utils/sliceutil"
 	"sort"
 	"strings"
--- a/pkg/models/resources/ingresses.go
+++ b/pkg/models/resources/ingresses.go
@@ -20,7 +20,7 @@ package resources
 import (
 	"kubesphere.io/kubesphere/pkg/constants"
 	"kubesphere.io/kubesphere/pkg/informers"
-	"kubesphere.io/kubesphere/pkg/params"
+	"kubesphere.io/kubesphere/pkg/server/params"
 	"kubesphere.io/kubesphere/pkg/utils/sliceutil"
 	"sort"
 	"strings"
--- a/pkg/models/resources/jobs.go
+++ b/pkg/models/resources/jobs.go
@@ -20,7 +20,7 @@ package resources
 import (
 	"kubesphere.io/kubesphere/pkg/constants"
 	"kubesphere.io/kubesphere/pkg/informers"
-	"kubesphere.io/kubesphere/pkg/params"
+	"kubesphere.io/kubesphere/pkg/server/params"
 	"kubesphere.io/kubesphere/pkg/utils/k8sutil"
 	"kubesphere.io/kubesphere/pkg/utils/sliceutil"
 	"sort"
--- a/pkg/models/resources/namespaces.go
+++ b/pkg/models/resources/namespaces.go
@@ -20,7 +20,7 @@ package resources
 import (
 	"kubesphere.io/kubesphere/pkg/constants"
 	"kubesphere.io/kubesphere/pkg/informers"
-	"kubesphere.io/kubesphere/pkg/params"
+	"kubesphere.io/kubesphere/pkg/server/params"
 	"kubesphere.io/kubesphere/pkg/utils/sliceutil"
 	"sort"
 	"strings"
--- a/pkg/models/resources/nodes.go
+++ b/pkg/models/resources/nodes.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"kubesphere.io/kubesphere/pkg/constants"
 	"kubesphere.io/kubesphere/pkg/informers"
-	"kubesphere.io/kubesphere/pkg/params"
+	"kubesphere.io/kubesphere/pkg/server/params"
 	"kubesphere.io/kubesphere/pkg/utils/sliceutil"
 	"sort"
 	"strings"
--- a/pkg/models/resources/persistentvolumeclaims.go
+++ b/pkg/models/resources/persistentvolumeclaims.go
@@ -20,7 +20,7 @@ package resources
 import (
 	"kubesphere.io/kubesphere/pkg/constants"
 	"kubesphere.io/kubesphere/pkg/informers"
-	"kubesphere.io/kubesphere/pkg/params"
+	"kubesphere.io/kubesphere/pkg/server/params"
 	"kubesphere.io/kubesphere/pkg/utils/sliceutil"
 	"sort"
 	"strings"
--- a/pkg/models/resources/pods.go
+++ b/pkg/models/resources/pods.go
@@ -21,7 +21,7 @@ import (
 	appsv1 "k8s.io/api/apps/v1"
 	"kubesphere.io/kubesphere/pkg/constants"
 	"kubesphere.io/kubesphere/pkg/informers"
-	"kubesphere.io/kubesphere/pkg/params"
+	"kubesphere.io/kubesphere/pkg/server/params"
 	"kubesphere.io/kubesphere/pkg/utils/sliceutil"
 	"sort"
 	"strings"
--- a/pkg/models/resources/resources.go
+++ b/pkg/models/resources/resources.go
@@ -19,9 +19,9 @@ package resources

 import (
 	"fmt"
-	"github.com/golang/glog"
+	"k8s.io/klog"
 	"kubesphere.io/kubesphere/pkg/models"
-	"kubesphere.io/kubesphere/pkg/params"
+	"kubesphere.io/kubesphere/pkg/server/params"
 	"kubesphere.io/kubesphere/pkg/utils/sliceutil"
 	"strings"
 )
@@ -121,7 +121,7 @@ func GetResource(namespace, resource, name string) (interface{}, error) {
 	if searcher, ok := resources[resource]; ok {
 		resource, err := searcher.get(namespace, name)
 		if err != nil {
-			glog.Errorln("get resource", namespace, resource, name, err)
+			klog.Errorln("get resource", namespace, resource, name, err)
 			return nil, err
 		}
 		return resource, nil
@@ -136,19 +136,19 @@ func ListResources(namespace, resource string, conditions *params.Conditions, or

 	// none namespace resource
 	if namespace != "" && sliceutil.HasString(clusterResources, resource) {
-		glog.Errorln("resources not found", resource)
+		klog.Errorln("resources not found", resource)
 		return nil, fmt.Errorf("not found")
 	}

 	if searcher, ok := resources[resource]; ok {
 		result, err = searcher.search(namespace, conditions, orderBy, reverse)
 	} else {
-		glog.Errorln("resources not found", resource)
+		klog.Errorln("resources not found", resource)
 		return nil, fmt.Errorf("not found")
 	}

 	if err != nil {
-		glog.Errorln("resources search", err)
+		klog.Errorln("resources search", err)
 		return nil, err
 	}

--- a/pkg/models/resources/roles.go
+++ b/pkg/models/resources/roles.go
@@ -20,7 +20,7 @@ package resources
 import (
 	"kubesphere.io/kubesphere/pkg/constants"
 	"kubesphere.io/kubesphere/pkg/informers"
-	"kubesphere.io/kubesphere/pkg/params"
+	"kubesphere.io/kubesphere/pkg/server/params"
 	"kubesphere.io/kubesphere/pkg/utils/sliceutil"
 	"sort"
 	"strings"
--- a/pkg/models/resources/s2ibuilder.go
+++ b/pkg/models/resources/s2ibuilder.go
@@ -23,7 +23,7 @@ import (
 	"k8s.io/apimachinery/pkg/labels"
 	"kubesphere.io/kubesphere/pkg/constants"
 	"kubesphere.io/kubesphere/pkg/informers"
-	"kubesphere.io/kubesphere/pkg/params"
+	"kubesphere.io/kubesphere/pkg/server/params"
 	"kubesphere.io/kubesphere/pkg/utils/sliceutil"
 	"sort"
 	"strings"
--- a/pkg/models/resources/s2ibuildertemplate.go
+++ b/pkg/models/resources/s2ibuildertemplate.go
@@ -21,7 +21,7 @@ import (
 	"github.com/kubesphere/s2ioperator/pkg/apis/devops/v1alpha1"
 	"kubesphere.io/kubesphere/pkg/constants"
 	"kubesphere.io/kubesphere/pkg/informers"
-	"kubesphere.io/kubesphere/pkg/params"
+	"kubesphere.io/kubesphere/pkg/server/params"
 	"kubesphere.io/kubesphere/pkg/utils/sliceutil"
 	"sort"
 	"strings"
--- a/pkg/models/resources/s2irun.go
+++ b/pkg/models/resources/s2irun.go
@@ -25,7 +25,7 @@ import (
 	"strings"

 	"kubesphere.io/kubesphere/pkg/informers"
-	"kubesphere.io/kubesphere/pkg/params"
+	"kubesphere.io/kubesphere/pkg/server/params"

 	"k8s.io/apimachinery/pkg/labels"

--- a/pkg/models/resources/secrets.go
+++ b/pkg/models/resources/secrets.go
@@ -20,7 +20,7 @@ package resources
 import (
 	"kubesphere.io/kubesphere/pkg/constants"
 	"kubesphere.io/kubesphere/pkg/informers"
-	"kubesphere.io/kubesphere/pkg/params"
+	"kubesphere.io/kubesphere/pkg/server/params"
 	"kubesphere.io/kubesphere/pkg/utils/sliceutil"
 	"sort"
 	"strings"
--- a/pkg/models/resources/services.go
+++ b/pkg/models/resources/services.go
@@ -20,7 +20,7 @@ package resources
 import (
 	"kubesphere.io/kubesphere/pkg/constants"
 	"kubesphere.io/kubesphere/pkg/informers"
-	"kubesphere.io/kubesphere/pkg/params"
+	"kubesphere.io/kubesphere/pkg/server/params"
 	"kubesphere.io/kubesphere/pkg/utils/sliceutil"
 	"sort"
 	"strings"
--- a/pkg/models/resources/statefulsets.go
+++ b/pkg/models/resources/statefulsets.go
@@ -20,7 +20,7 @@ package resources
 import (
 	"kubesphere.io/kubesphere/pkg/constants"
 	"kubesphere.io/kubesphere/pkg/informers"
-	"kubesphere.io/kubesphere/pkg/params"
+	"kubesphere.io/kubesphere/pkg/server/params"
 	"kubesphere.io/kubesphere/pkg/utils/sliceutil"
 	"sort"
 	"strings"
--- a/pkg/models/resources/storageclasses.go
+++ b/pkg/models/resources/storageclasses.go
@@ -20,7 +20,7 @@ package resources
 import (
 	"kubesphere.io/kubesphere/pkg/constants"
 	"kubesphere.io/kubesphere/pkg/informers"
-	"kubesphere.io/kubesphere/pkg/params"
+	"kubesphere.io/kubesphere/pkg/server/params"
 	"kubesphere.io/kubesphere/pkg/utils/sliceutil"
 	"sort"
 	"strings"
--- a/pkg/models/resources/workspaces.go
+++ b/pkg/models/resources/workspaces.go
@@ -21,7 +21,7 @@ import (
 	tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1"
 	"kubesphere.io/kubesphere/pkg/constants"
 	"kubesphere.io/kubesphere/pkg/informers"
-	"kubesphere.io/kubesphere/pkg/params"
+	"kubesphere.io/kubesphere/pkg/server/params"
 	"kubesphere.io/kubesphere/pkg/utils/sliceutil"
 	"sort"
 	"strings"