remove useless logs

Gopkg.lock

@@ -568,7 +568,6 @@
     "pkg/kbcontroller",
     "pkg/resource"
   ]
-  revision = "1be8f5eada07fe5b17804e4b91fc2f4c4fc4ecb9"
   source = "https://github.com/kubesphere/application"
 
 [[projects]]

pkg/controller/destinationrule/destinationrule_controller.go

@@ -211,9 +211,9 @@ func (v *DestinationRuleController) syncService(key string) error {
 
 	service, err := v.serviceLister.Services(namespace).Get(name)
 	if err != nil {
-		// Delete the corresponding destinationrule, as the service has been deleted.
+		// Delete the corresponding destinationrule if there is any, as the service has been deleted.
 		err = v.destinationRuleClient.NetworkingV1alpha3().DestinationRules(namespace).Delete(name, nil)
-		if !errors.IsNotFound(err) {
+		if err != nil && !errors.IsNotFound(err) {
 			log.Error(err, "delete destination rule failed", "namespace", namespace, "name", name)
 			return err
 		}

pkg/controller/virtualservice/virtualservice_controller.go

@@ -264,9 +264,7 @@ func (v *VirtualServiceController) syncService(key string) error {
 	subsets := destinationRule.Spec.Subsets
 	if len(subsets) == 0 {
 		// destination rule with no subsets, not possibly
-		err = fmt.Errorf("found destinationrule with no subsets for service %s", name)
+		return nil
-		log.Error(err, "found destinationrule with no subsets", "namespace", namespace, "name", appName)
-		return err
 	}
 
 	// fetch all strategies applied to service

pkg/simple/client/elasticsearch/esclient.go

@@ -566,14 +566,10 @@ func stubResult() *QueryResult {
 func Query(param QueryParameters) *QueryResult {
 	var queryResult *QueryResult
 
-	//queryResult = stubResult()
-	//return queryResult
-
 	client := &http.Client{}
 
 	operation, query, err := createQueryRequest(param)
 	if err != nil {
-		//fmt.Println("Create query error ", err.Error())
 		queryResult = new(QueryResult)
 		queryResult.Status = http.StatusNotFound
 		return queryResult

pkg/simple/client/kubesphere/kubesphereclient.go

@@ -27,7 +27,6 @@ import (
 	"kubesphere.io/kubesphere/pkg/constants"
 	"kubesphere.io/kubesphere/pkg/models"
 	"kubesphere.io/kubesphere/pkg/models/devops"
-	"log"
 	"net/http"
 	"strings"
 	"sync"
@@ -84,20 +83,22 @@ func (c client) CreateGroup(group *models.Group) (*models.Group, error) {
 	req, err := http.NewRequest(http.MethodPost, fmt.Sprintf("%s/kapis/iam.kubesphere.io/v1alpha2/groups", accountAPIServer), bytes.NewReader(data))
 
 	if err != nil {
+		glog.Error(err)
 		return nil, err
 	}
 	req.Header.Add("Content-Type", "application/json")
 
-	log.Println(req.Method, req.URL, string(data))
 	resp, err := c.client.Do(req)
 
 	if err != nil {
+		glog.Error(err)
 		return nil, err
 	}
 	defer resp.Body.Close()
 	data, err = ioutil.ReadAll(resp.Body)
 
 	if err != nil {
+		glog.Error(err)
 		return nil, err
 	}
 
@@ -108,6 +109,7 @@ func (c client) CreateGroup(group *models.Group) (*models.Group, error) {
 	err = json.Unmarshal(data, group)
 
 	if err != nil {
+		glog.Error(err)
 		return nil, err
 	}
 
@@ -118,20 +120,18 @@ func (c client) UpdateGroup(group *models.Group) (*models.Group, error) {
 	data, err := json.Marshal(group)
 
 	if err != nil {
+		glog.Error(err)
 		return nil, err
 	}
 
 	req, err := http.NewRequest(http.MethodPut, fmt.Sprintf("%s/kapis/iam.kubesphere.io/v1alpha2/groups/%s", accountAPIServer, group.Name), bytes.NewReader(data))
 
 	if err != nil {
+		glog.Error(err)
 		return nil, err
 	}
 
 	req.Header.Add("Content-Type", "application/json")
-	if err != nil {
-		return nil, err
-	}
-	log.Println(req.Method, req.URL, string(data))
 	resp, err := c.client.Do(req)
 
 	if err != nil {
@@ -141,6 +141,7 @@ func (c client) UpdateGroup(group *models.Group) (*models.Group, error) {
 	data, err = ioutil.ReadAll(resp.Body)
 
 	if err != nil {
+		glog.Error(err)
 		return nil, err
 	}
 
@@ -151,6 +152,7 @@ func (c client) UpdateGroup(group *models.Group) (*models.Group, error) {
 	err = json.Unmarshal(data, group)
 
 	if err != nil {
+		glog.Error(err)
 		return nil, err
 	}
 
@@ -161,19 +163,21 @@ func (c client) DeleteGroup(name string) error {
 	req, err := http.NewRequest(http.MethodDelete, fmt.Sprintf("%s/kapis/iam.kubesphere.io/v1alpha2/groups/%s", accountAPIServer, name), nil)
 
 	if err != nil {
+		glog.Error(err)
 		return err
 	}
 
-	log.Println(req.Method, req.URL)
 	resp, err := c.client.Do(req)
 
 	if err != nil {
+		glog.Error(err)
 		return err
 	}
 	defer resp.Body.Close()
 	data, err := ioutil.ReadAll(resp.Body)
 
 	if err != nil {
+		glog.Error(err)
 		return err
 	}
 
@@ -188,18 +192,20 @@ func (c client) DescribeGroup(name string) (*models.Group, error) {
 	req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/kapis/iam.kubesphere.io/v1alpha2/groups/%s", accountAPIServer, name), nil)
 
 	if err != nil {
+		glog.Error(err)
 		return nil, err
 	}
-	log.Println(req.Method, req.URL)
 	resp, err := c.client.Do(req)
 
 	if err != nil {
+		glog.Error(err)
 		return nil, err
 	}
 	defer resp.Body.Close()
 	data, err := ioutil.ReadAll(resp.Body)
 
 	if err != nil {
+		glog.Error(err)
 		return nil, err
 	}
 
@@ -211,6 +217,7 @@ func (c client) DescribeGroup(name string) (*models.Group, error) {
 	err = json.Unmarshal(data, &group)
 
 	if err != nil {
+		glog.Error(err)
 		return nil, err
 	}
 
@@ -224,19 +231,17 @@ func (c client) ListUsers() (*models.PageableResponse, error) {
 		return nil, err
 	}
 	req.Header.Add("Authorization", accountAPIServer)
-	if err != nil {
-		return nil, err
-	}
-	log.Println(req.Method, req.URL)
 	resp, err := c.client.Do(req)
 
 	if err != nil {
+		glog.Error(err)
 		return nil, err
 	}
 	defer resp.Body.Close()
 	data, err := ioutil.ReadAll(resp.Body)
 
 	if err != nil {
+		glog.Error(err)
 		return nil, err
 	}
 
@@ -248,6 +253,7 @@ func (c client) ListUsers() (*models.PageableResponse, error) {
 	err = json.Unmarshal(data, &result)
 
 	if err != nil {
+		glog.Error(err)
 		return nil, err
 	}
 

pkg/simple/client/openpitrix/openpitrixclient.go

@@ -22,8 +22,8 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
+	"github.com/golang/glog"
 	"io/ioutil"
-	"log"
 	"net/http"
 	"sync"
 )
@@ -78,27 +78,30 @@ func (c client) CreateRuntime(runtime *RunTime) error {
 
 	data, err := json.Marshal(runtime)
 	if err != nil {
+		glog.Error(err)
 		return err
 	}
 
 	req, err := http.NewRequest(http.MethodPost, fmt.Sprintf("%s/v1/runtimes", openpitrixAPIServer), bytes.NewReader(data))
 
 	if err != nil {
+		glog.Error(err)
 		return err
 	}
 	req.Header.Add("Content-Type", "application/json")
 	req.Header.Add("Authorization", openpitrixProxyToken)
 
-	log.Println(req.Method, req.URL, openpitrixProxyToken, string(data))
 	resp, err := c.client.Do(req)
 
 	if err != nil {
+		glog.Error(err)
 		return err
 	}
 	defer resp.Body.Close()
 	data, err = ioutil.ReadAll(resp.Body)
 
 	if err != nil {
+		glog.Error(err)
 		return err
 	}
 
@@ -114,23 +117,24 @@ func (c client) DeleteRuntime(runtimeId string) error {
 	req, err := http.NewRequest(http.MethodDelete, fmt.Sprintf("%s/v1/runtimes", openpitrixAPIServer), bytes.NewReader(data))
 
 	if err != nil {
+		glog.Error(err)
+
 		return err
 	}
 
 	req.Header.Add("Authorization", openpitrixProxyToken)
-	if err != nil {
+
-		return err
-	}
-	log.Println(req.Method, req.URL)
 	resp, err := c.client.Do(req)
 
 	if err != nil {
+		glog.Error(err)
 		return err
 	}
 	defer resp.Body.Close()
 	data, err = ioutil.ReadAll(resp.Body)
 
 	if err != nil {
+		glog.Error(err)
 		return err
 	}
 

vendor/github.com/kubernetes-sigs/application/pkg/genericreconciler/genericreconciler.go

@@ -71,7 +71,6 @@ func (gr *Reconciler) observe(observables ...resource.Observable) (*resource.Obj
 				types.NamespacedName{Name: name, Namespace: namespace},
 				obs.Obj.(runtime.Object))
 			if err == nil {
-				log.Printf("   >>get: %s", otype+"/"+namespace+"/"+name)
 				resources = append(resources, resource.Object{Obj: obs.Obj})
 			} else {
 				log.Printf("   >>>ERR get: %s", otype+"/"+namespace+"/"+name)
@@ -147,11 +146,9 @@ func (gr *Reconciler) ReconcileCR(namespacedname types.NamespacedName, handle cr
 	err := gr.Get(context.TODO(), namespacedname, rsrc.(runtime.Object))
 	if err == nil {
 		o := rsrc.(metav1.Object)
-		log.Printf("%s Validating spec\n", name)
 		err = rsrc.Validate()
 		status = rsrc.NewStatus()
 		if err == nil {
-			log.Printf("%s Applying defaults\n", name)
 			rsrc.ApplyDefaults()
 			components := rsrc.Components()
 			for _, component := range components {
@@ -230,8 +227,8 @@ func (gr *Reconciler) ObserveAndMutate(crname string, c component.Component, sta
 // FinalizeComponent is a function that finalizes component
 func (gr *Reconciler) FinalizeComponent(crname string, c component.Component, status interface{}, aggregated *resource.ObjectBag) error {
 	cname := crname + "(cmpnt:" + c.Name + ")"
-	log.Printf("%s  { finalizing component\n", cname)
+	log.Printf("%s  finalizing component\n", cname)
-	defer log.Printf("%s  } finalizing component\n", cname)
+	defer log.Printf("%s finalizing component completed", cname)
 
 	expected, observed, err := gr.ObserveAndMutate(crname, c, status, false, aggregated)
 
@@ -249,8 +246,8 @@ func (gr *Reconciler) ReconcileComponent(crname string, c component.Component, s
 	var reconciled *resource.ObjectBag = new(resource.ObjectBag)
 
 	cname := crname + "(cmpnt:" + c.Name + ")"
-	log.Printf("%s  { reconciling component\n", cname)
+	log.Printf("%s  reconciling component\n", cname)
-	defer log.Printf("%s  } reconciling component\n", cname)
+	defer log.Printf("%s  reconciling component completed\n", cname)
 
 	expected, observed, err := gr.ObserveAndMutate(crname, c, status, true, aggregated)
 
@@ -270,17 +267,8 @@ func (gr *Reconciler) ReconcileComponent(crname string, c component.Component, s
 		errs = handleErrorArr("", crname, err, errs)
 	} else {
 		aggregated.Add(expected.Items()...)
-		log.Printf("%s  Expected Resources:\n", cname)
-		for _, e := range expected.Items() {
-			log.Printf("%s   exp: %s/%s/%s\n", cname, e.Obj.GetNamespace(), reflect.TypeOf(e.Obj).String(), e.Obj.GetName())
-		}
-		log.Printf("%s  Observed Resources:\n", cname)
-		for _, e := range observed.Items() {
-			log.Printf("%s   obs: %s/%s/%s\n", cname, e.Obj.GetNamespace(), reflect.TypeOf(e.Obj).String(), e.Obj.GetName())
-		}
-
-		log.Printf("%s  Reconciling Resources:\n", cname)
 	}
+
 	for _, e := range expected.Items() {
 		seen := false
 		eNamespace := e.Obj.GetNamespace()
@@ -298,11 +286,7 @@ func (gr *Reconciler) ReconcileComponent(crname string, c component.Component, s
 			if e.Lifecycle == resource.LifecycleManaged && (specDiffers(e.Obj, o.Obj) && c.Differs(e.Obj, o.Obj) || injectOwnerRefs(e.Obj, c.OwnerRef)) {
 				if err := gr.Update(context.TODO(), e.Obj.(runtime.Object).DeepCopyObject()); err != nil {
 					errs = handleErrorArr("update", eRsrcInfo, err, errs)
-				} else {
-					log.Printf("%s   update: %s\n", cname, eRsrcInfo)
 				}
-			} else {
-				log.Printf("%s   nochange: %s\n", cname, eRsrcInfo)
 			}
 			reconciled.Add(o)
 			seen = true
@@ -315,7 +299,6 @@ func (gr *Reconciler) ReconcileComponent(crname string, c component.Component, s
 				if err := gr.Create(context.TODO(), e.Obj.(runtime.Object)); err != nil {
 					errs = handleErrorArr("Create", cname, err, errs)
 				} else {
-					log.Printf("%s   +create: %s\n", cname, eRsrcInfo)
 					reconciled.Add(e)
 				}
 			} else {
@@ -344,8 +327,6 @@ func (gr *Reconciler) ReconcileComponent(crname string, c component.Component, s
 		if !seen {
 			if err := gr.Delete(context.TODO(), o.Obj.(runtime.Object)); err != nil {
 				errs = handleErrorArr("delete", oRsrcInfo, err, errs)
-			} else {
-				log.Printf("%s   -delete: %s\n", cname, oRsrcInfo)
 			}
 		}
 	}