Merge branch 'master' into feat/fed-backup-controller

Makefile

@@ -9,7 +9,7 @@ GOVER_MAJOR := $(shell go version | sed -E -e "s/.*go([0-9]+)[.]([0-9]+).*/\1/")
 GOVER_MINOR := $(shell go version | sed -E -e "s/.*go([0-9]+)[.]([0-9]+).*/\2/")
 GO113 := $(shell [ $(GOVER_MAJOR) -gt 1 ] || [ $(GOVER_MAJOR) -eq 1 ] && [ $(GOVER_MINOR) -ge 13 ]; echo $$?)
 ifeq ($(GO113), 1)
-$(error Please upgrade your Go compiler to 1.13 or higher version)
+$(error Please upgrade your Go compiler to 1.13 or  higher version)
 endif
 
 # Enable GO111MODULE=on explicitly, disable it with GO111MODULE=off when necessary.

tests/drainer.go

@@ -19,9 +19,11 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os/exec"
+	"strconv"
 	"strings"
 	"text/template"
 
+	"github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1"
 	"github.com/pingcap/tidb-operator/tests/slack"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
@@ -100,7 +102,10 @@ func (oa *OperatorActions) DeployDrainer(info *DrainerConfig, source *DrainerSou
 		return err
 	}
 
-	override := map[string]string{}
+	override := map[string]string{
+		"port":         strconv.FormatInt(int64(v1alpha1.DefaultDrainerPort), 10),
+		"pdClientPort": strconv.FormatInt(int64(v1alpha1.DefaultPDClientPort), 10),
+	}
 	if len(oa.cfg.AdditionalDrainerVersion) > 0 {
 		override["clusterVersion"] = oa.cfg.AdditionalDrainerVersion
 	}