Merge branch 'new-cluster-tls-api' of https://github.com/weekface/tid…

…b-operator into new-cluster-tls-api
pingcap · Mar 6, 2020 · e3bd76f · e3bd76f
2 parents 6ebeab6 + e4597a3
commit e3bd76f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/pkg/controller/tidb_control.go b/pkg/controller/tidb_control.go
@@ -18,16 +18,16 @@ import (
 	"crypto/x509"
 	"encoding/json"
 	"fmt"
+	"github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1"
+	"github.com/pingcap/tidb-operator/pkg/httputil"
 	"github.com/pingcap/tidb-operator/pkg/util"
+	"github.com/pingcap/tidb/config"
 	"io/ioutil"
 	v1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 	"net/http"
 	"time"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1"
-	"github.com/pingcap/tidb-operator/pkg/httputil"
-	"github.com/pingcap/tidb/config"
 )
 
 const (
@@ -54,12 +54,12 @@ type TiDBControlInterface interface {
 // defaultTiDBControl is default implementation of TiDBControlInterface.
 type defaultTiDBControl struct {
 	httpClient *http.Client
-	kubeCli   kubernetes.Interface
+	kubeCli    kubernetes.Interface
 }
 
 // NewDefaultTiDBControl returns a defaultTiDBControl instance
 func NewDefaultTiDBControl(kubeCli kubernetes.Interface) TiDBControlInterface {
-	return &defaultTiDBControl{httpClient: &http.Client{Timeout: timeout}, kubeCli:kubeCli}
+	return &defaultTiDBControl{httpClient: &http.Client{Timeout: timeout}, kubeCli: kubeCli}
 }
 
 func (tdc *defaultTiDBControl) useTLSHTTPClient(tc *v1alpha1.TidbCluster) error {

diff --git a/pkg/monitor/monitor/template.go b/pkg/monitor/monitor/template.go
@@ -15,13 +15,13 @@ package monitor
 
 import (
 	"github.com/pingcap/tidb-operator/pkg/util"
-	"path"
-	"time"
-	corev1 "k8s.io/api/core/v1"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/config"
 	"gopkg.in/yaml.v2"
+	corev1 "k8s.io/api/core/v1"
 	"k8s.io/klog"
+	"path"
+	"time"
 )
 
 const (

diff --git a/pkg/util/crypto/certs.go b/pkg/util/crypto/certs.go
@@ -103,4 +103,3 @@ func ReadCACerts() (*x509.CertPool, error) {
 	}
 	return rootCAs, nil
 }
-