From 4ee31e3740f9388004d4977e8e1c8e3d6c77842e Mon Sep 17 00:00:00 2001 From: Shiori Date: Thu, 15 Sep 2022 14:19:04 +0800 Subject: [PATCH 1/7] bump golang to 1.16 --- go.mod | 3 +-- go.sum | 4 ---- pkg/apis/go.mod | 2 +- pkg/apis/go.sum | 2 -- pkg/client/go.mod | 2 +- 5 files changed, 3 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 2ddb64dbd9..d76ec6a073 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ module github.com/pingcap/tidb-operator -go 1.13 +go 1.16 require ( cloud.google.com/go/storage v1.0.0 @@ -22,7 +22,6 @@ require ( github.com/dsnet/compress v0.0.1 // indirect github.com/dustin/go-humanize v1.0.0 github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f // indirect; indirectload - github.com/elazarl/goproxy/ext v0.0.0-20190421051319-9d40249d3c2f // indirect github.com/emicklei/go-restful v2.9.5+incompatible github.com/fatih/color v1.7.0 github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 diff --git a/go.sum b/go.sum index 4e14624ac2..09be6744fd 100644 --- a/go.sum +++ b/go.sum @@ -217,8 +217,6 @@ github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25Kn github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f h1:8GDPb0tCY8LQ+OJ3dbHb5sA6YZWXFORQYZx5sdsTlMs= github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= -github.com/elazarl/goproxy/ext v0.0.0-20190421051319-9d40249d3c2f h1:AUj1VoZUfhPhOPHULCQQDnGhRelpFWHMLhQVWDsS0v4= -github.com/elazarl/goproxy/ext v0.0.0-20190421051319-9d40249d3c2f/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk= github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= @@ -808,7 +806,6 @@ github.com/robfig/cron v1.1.0 h1:jk4/Hud3TTdcrJgUOBgsqrZBarcxl6ADIjSC2iniwLY= github.com/robfig/cron v1.1.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= -github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc= github.com/rogpeppe/go-internal v1.0.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.0.1-alpha.3/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= @@ -939,7 +936,6 @@ go.uber.org/atomic v1.5.0 h1:OI5t8sDa1Or+q8AeE+yKeB/SDYioSHAgcVljj9JIETY= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/goleak v1.1.10 h1:z+mqJhf6ss6BSfSM671tgKyZBFPTTJM+HLxnhPC3wu0= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A= diff --git a/pkg/apis/go.mod b/pkg/apis/go.mod index eabcee094d..a1454192da 100644 --- a/pkg/apis/go.mod +++ b/pkg/apis/go.mod @@ -1,6 +1,6 @@ module github.com/pingcap/tidb-operator/pkg/apis -go 1.13 +go 1.16 require ( github.com/BurntSushi/toml v0.3.1 diff --git a/pkg/apis/go.sum b/pkg/apis/go.sum index 41c808b63a..2f5db5600a 100644 --- a/pkg/apis/go.sum +++ b/pkg/apis/go.sum @@ -180,7 +180,6 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -548,7 +547,6 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0 h1:UhZDfRO8JRQru4/+LlLE0BRKGF8L+PICnvYZmx/fEGA= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/pkg/client/go.mod b/pkg/client/go.mod index bd69ae628d..36cfaed4cb 100644 --- a/pkg/client/go.mod +++ b/pkg/client/go.mod @@ -1,6 +1,6 @@ module github.com/pingcap/tidb-operator/pkg/client -go 1.13 +go 1.16 require ( github.com/pingcap/tidb-operator/pkg/apis v1.3.8 From 113637d2842e9739aa23e23fbd6f15cb8c00231c Mon Sep 17 00:00:00 2001 From: Shiori Date: Thu, 15 Sep 2022 14:48:55 +0800 Subject: [PATCH 2/7] bump e2e image to v20210808-1eaeec7-master --- ci/e2e_eks.groovy | 2 +- ci/e2e_gke.groovy | 2 +- ci/e2e_kind.groovy | 2 +- ci/pull_e2e_kind.groovy | 2 +- ci/pull_e2e_release.groovy | 2 +- ci/vm.groovy | 2 +- hack/run-in-container.sh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ci/e2e_eks.groovy b/ci/e2e_eks.groovy index 5557ca5482..56c2ef4752 100644 --- a/ci/e2e_eks.groovy +++ b/ci/e2e_eks.groovy @@ -16,7 +16,7 @@ kind: Pod spec: containers: - name: main - image: gcr.io/k8s-testimages/kubekins-e2e:v20200311-1e25827-master + image: gcr.io/k8s-testimages/kubekins-e2e:v20210808-1eaeec7-master command: - runner.sh - sleep diff --git a/ci/e2e_gke.groovy b/ci/e2e_gke.groovy index 3e4e90780d..3771a82c23 100644 --- a/ci/e2e_gke.groovy +++ b/ci/e2e_gke.groovy @@ -16,7 +16,7 @@ kind: Pod spec: containers: - name: main - image: gcr.io/k8s-testimages/kubekins-e2e:v20200311-1e25827-master + image: gcr.io/k8s-testimages/kubekins-e2e:v20210808-1eaeec7-master command: - runner.sh - sleep diff --git a/ci/e2e_kind.groovy b/ci/e2e_kind.groovy index a97b68903e..20b0c2fcc6 100644 --- a/ci/e2e_kind.groovy +++ b/ci/e2e_kind.groovy @@ -16,7 +16,7 @@ metadata: spec: containers: - name: main - image: gcr.io/k8s-testimages/kubekins-e2e:v20200311-1e25827-master + image: gcr.io/k8s-testimages/kubekins-e2e:v20210808-1eaeec7-master command: - runner.sh # Clean containers on TERM signal in root process to avoid cgroup leaking. diff --git a/ci/pull_e2e_kind.groovy b/ci/pull_e2e_kind.groovy index e33d0345b1..cda1820d49 100644 --- a/ci/pull_e2e_kind.groovy +++ b/ci/pull_e2e_kind.groovy @@ -37,7 +37,7 @@ metadata: spec: containers: - name: main - image: gcr.io/k8s-testimages/kubekins-e2e:v20200311-1e25827-master + image: gcr.io/k8s-testimages/kubekins-e2e:v20210808-1eaeec7-master command: - runner.sh # Clean containers on TERM signal in root process to avoid cgroup leaking. diff --git a/ci/pull_e2e_release.groovy b/ci/pull_e2e_release.groovy index 5e24a55ce9..b8f82e4fa2 100644 --- a/ci/pull_e2e_release.groovy +++ b/ci/pull_e2e_release.groovy @@ -37,7 +37,7 @@ metadata: spec: containers: - name: main - image: gcr.io/k8s-testimages/kubekins-e2e:v20200311-1e25827-master + image: gcr.io/k8s-testimages/kubekins-e2e:v20210808-1eaeec7-master command: - runner.sh # Clean containers on TERM signal in root process to avoid cgroup leaking. diff --git a/ci/vm.groovy b/ci/vm.groovy index 0ce5a6fe4d..408642b26c 100644 --- a/ci/vm.groovy +++ b/ci/vm.groovy @@ -16,7 +16,7 @@ kind: Pod spec: containers: - name: main - image: gcr.io/k8s-testimages/kubekins-e2e:v20200311-1e25827-master + image: gcr.io/k8s-testimages/kubekins-e2e:v20210808-1eaeec7-master command: - runner.sh - sleep diff --git a/hack/run-in-container.sh b/hack/run-in-container.sh index 317751f8e3..87329fd6c0 100755 --- a/hack/run-in-container.sh +++ b/hack/run-in-container.sh @@ -144,5 +144,5 @@ docker run ${docker_args[@]} \ -v $ROOT:/go/src/github.com/pingcap/tidb-operator \ -w /go/src/github.com/pingcap/tidb-operator \ --entrypoint /usr/local/bin/runner.sh \ - gcr.io/k8s-testimages/kubekins-e2e:v20200311-1e25827-master \ + gcr.io/k8s-testimages/kubekins-e2e:v20210808-1eaeec7-master \ "${args[@]}" From f864e6652b203ec16c3914e20721b08e6038a1d8 Mon Sep 17 00:00:00 2001 From: Shiori Date: Thu, 15 Sep 2022 15:18:27 +0800 Subject: [PATCH 3/7] fix lint --- hack/tools/go.mod | 2 +- hack/update-api-references.sh | 13 ++++++++----- tools/tools.go | 1 + 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/hack/tools/go.mod b/hack/tools/go.mod index 35f968b82a..0c3ac97ca5 100644 --- a/hack/tools/go.mod +++ b/hack/tools/go.mod @@ -1,6 +1,6 @@ module k8s.io/kubernetes/hack/tools -go 1.14 +go 1.16 require ( github.com/client9/misspell v0.3.4 diff --git a/hack/update-api-references.sh b/hack/update-api-references.sh index a4dd71f901..fb9d0fdc62 100755 --- a/hack/update-api-references.sh +++ b/hack/update-api-references.sh @@ -25,9 +25,12 @@ source hack/lib.sh hack::ensure_gen_crd_api_references_docs DOCS_PATH="$ROOT/docs/api-references" +API_DIR="${ROOT}/pkg/apis/pingcap/v1alpha1" -GOROOT=$(go env GOROOT) ${DOCS_BIN} \ - -config "$DOCS_PATH/config.json" \ - -template-dir "$DOCS_PATH/template" \ - -api-dir "github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1" \ - -out-file "$DOCS_PATH/docs.md" +pushd ${API_DIR} >/dev/null + GOROOT=$(go env GOROOT) ${DOCS_BIN} \ + -config "$DOCS_PATH/config.json" \ + -template-dir "$DOCS_PATH/template" \ + -api-dir "github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1" \ + -out-file "$DOCS_PATH/docs.md" +popd >/dev/null diff --git a/tools/tools.go b/tools/tools.go index 1295a2f8f2..f38b386386 100644 --- a/tools/tools.go +++ b/tools/tools.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build tools // +build tools // Tool dependencies are tracked here to make go module happy From fa4bf3a3bc667ea847acd10cd223b75cc26a9ae7 Mon Sep 17 00:00:00 2001 From: Shiori Date: Thu, 15 Sep 2022 15:37:24 +0800 Subject: [PATCH 4/7] update build pod label for jenkins --- ci/pull_e2e_kind.groovy | 2 +- ci/pull_e2e_release.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/pull_e2e_kind.groovy b/ci/pull_e2e_kind.groovy index cda1820d49..74bd39fa84 100644 --- a/ci/pull_e2e_kind.groovy +++ b/ci/pull_e2e_kind.groovy @@ -277,7 +277,7 @@ try { timeout (time: 2, unit: 'HOURS') { // use fixed label, so we can reuse previous workers // increase version in pod label when we update pod template - def buildPodLabel = "tidb-operator-build-v1-pingcap-docker-mirror" + def buildPodLabel = "tidb-operator-build-v2-pingcap-docker-mirror" def resources = [ requests: [ cpu: "4", diff --git a/ci/pull_e2e_release.groovy b/ci/pull_e2e_release.groovy index b8f82e4fa2..7d83e4bb2a 100644 --- a/ci/pull_e2e_release.groovy +++ b/ci/pull_e2e_release.groovy @@ -240,7 +240,7 @@ try { timeout (time: 2, unit: 'HOURS') { // use fixed label, so we can reuse previous workers // increase version in pod label when we update pod template - def buildPodLabel = "tidb-operator-build-v1-pingcap-docker-mirror" + def buildPodLabel = "tidb-operator-build-v2-pingcap-docker-mirror" def resources = [ requests: [ cpu: "6", From 2e21e26bf086df9d31ce8e642cad8e837d64e7f2 Mon Sep 17 00:00:00 2001 From: Shiori Date: Thu, 15 Sep 2022 16:37:38 +0800 Subject: [PATCH 5/7] add gocovmerge --- go.mod | 1 + go.sum | 2 ++ tools/tools.go | 3 +++ 3 files changed, 6 insertions(+) diff --git a/go.mod b/go.mod index d76ec6a073..287a004e13 100644 --- a/go.mod +++ b/go.mod @@ -67,6 +67,7 @@ require ( github.com/uber/jaeger-lib v2.2.0+incompatible // indirect github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect github.com/yisaer/crd-validation v0.0.3 + github.com/zhouqiang-cl/gocovmerge v0.0.0-20190125174600-5256314471af go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5 gocloud.dev v0.18.0 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c diff --git a/go.sum b/go.sum index 09be6744fd..a4aaa906b9 100644 --- a/go.sum +++ b/go.sum @@ -916,6 +916,8 @@ github.com/yisaer/crd-validation v0.0.3 h1:PmhrjDQbdkZOYz/1iVnK1UlY8q8Uw7hn1rlGm github.com/yisaer/crd-validation v0.0.3/go.mod h1:aWBclg0rUEvCnOnRZGDF6oC9Ljni2s17G/YVdYuTTww= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/zhouqiang-cl/gocovmerge v0.0.0-20190125174600-5256314471af h1:TscntfU6Necy6hfH+hcow8QSg8DJq47Fe/rqpZZS9U4= +github.com/zhouqiang-cl/gocovmerge v0.0.0-20190125174600-5256314471af/go.mod h1:Zot6ZD+7MXm1DzYOkmHNMcq72CRIdbh1qSsEbaxhHgY= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0= diff --git a/tools/tools.go b/tools/tools.go index f38b386386..fee3c4ae87 100644 --- a/tools/tools.go +++ b/tools/tools.go @@ -26,4 +26,7 @@ import ( // TODO remove this if we 1) avoid the issue in a better way or 2) go both // in local development and ci have the bug fixed _ "github.com/fatih/color" + + // in order to import the pkg in vendor + _ "github.com/zhouqiang-cl/gocovmerge" ) From 17181a43d43d1a5353b28b18437cd09a5e2b3bcb Mon Sep 17 00:00:00 2001 From: Shiori Date: Thu, 15 Sep 2022 18:06:00 +0800 Subject: [PATCH 6/7] fix docker regisrty --- ci/pull_e2e_kind.groovy | 10 ++-------- ci/pull_e2e_release.groovy | 8 +------- hack/e2e.sh | 41 -------------------------------------- 3 files changed, 3 insertions(+), 56 deletions(-) diff --git a/ci/pull_e2e_kind.groovy b/ci/pull_e2e_kind.groovy index 74bd39fa84..04cc57453e 100644 --- a/ci/pull_e2e_kind.groovy +++ b/ci/pull_e2e_kind.groovy @@ -52,13 +52,7 @@ spec: docker system prune -af || true } function setup_docker_mirror() { - cat > /etc/docker/daemon.json < /etc/docker/daemon.json < /dev/null 2>&1 && break - if [[ ${WAIT_N} -lt ${MAX_WAIT} ]]; then - WAIT_N=$((WAIT_N+1)) - echo "info; Waiting for docker to be ready, sleeping for ${WAIT_N} seconds." - sleep ${WAIT_N} - else - echo "info: Reached maximum attempts, not waiting any longer..." - break - fi - done - echo "info: done restarting docker" -} - -function e2e::__configure_docker_mirror_for_dind() { - echo "info: configure docker.io mirror '$DOCKER_IO_MIRROR' for DinD" -cat < /etc/docker/daemon.json.tmp -{ - "registry-mirrors": ["$DOCKER_IO_MIRROR"] -} -EOF - if diff /etc/docker/daemon.json.tmp /etc/docker/daemon.json 1>/dev/null 2>&1; then - echo "info: already configured" - rm /etc/docker/daemon.json.tmp - else - mv /etc/docker/daemon.json.tmp /etc/docker/daemon.json - e2e::__restart_docker - fi -} - # TODO: review this function e2e::create_kindconfig() { local tmpfile=${1} @@ -430,10 +393,6 @@ hack::ensure_kind hack::ensure_kubectl hack::ensure_helm -if [ -n "$DOCKER_IO_MIRROR" -a -n "${DOCKER_IN_DOCKER_ENABLED:-}" ]; then - e2e::__configure_docker_mirror_for_dind -fi - e2e::image_build kubetest2_args=( From 5f5769ad582365be3916214e761d6a714cdce867 Mon Sep 17 00:00:00 2001 From: Shiori Date: Thu, 15 Sep 2022 18:38:48 +0800 Subject: [PATCH 7/7] pull ci image from harbor --- ci/e2e_eks.groovy | 2 +- ci/e2e_gke.groovy | 2 +- ci/e2e_kind.groovy | 2 +- ci/pull_e2e_kind.groovy | 2 +- ci/pull_e2e_release.groovy | 2 +- ci/vm.groovy | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/e2e_eks.groovy b/ci/e2e_eks.groovy index 56c2ef4752..2ff10413d3 100644 --- a/ci/e2e_eks.groovy +++ b/ci/e2e_eks.groovy @@ -16,7 +16,7 @@ kind: Pod spec: containers: - name: main - image: gcr.io/k8s-testimages/kubekins-e2e:v20210808-1eaeec7-master + image: hub-new.pingcap.net/tidb-operator/kubekins-e2e:v20210808-1eaeec7-master command: - runner.sh - sleep diff --git a/ci/e2e_gke.groovy b/ci/e2e_gke.groovy index 3771a82c23..b83874d1f7 100644 --- a/ci/e2e_gke.groovy +++ b/ci/e2e_gke.groovy @@ -16,7 +16,7 @@ kind: Pod spec: containers: - name: main - image: gcr.io/k8s-testimages/kubekins-e2e:v20210808-1eaeec7-master + image: hub-new.pingcap.net/tidb-operator/kubekins-e2e:v20210808-1eaeec7-master command: - runner.sh - sleep diff --git a/ci/e2e_kind.groovy b/ci/e2e_kind.groovy index 20b0c2fcc6..ba34af14fc 100644 --- a/ci/e2e_kind.groovy +++ b/ci/e2e_kind.groovy @@ -16,7 +16,7 @@ metadata: spec: containers: - name: main - image: gcr.io/k8s-testimages/kubekins-e2e:v20210808-1eaeec7-master + image: hub-new.pingcap.net/tidb-operator/kubekins-e2e:v20210808-1eaeec7-master command: - runner.sh # Clean containers on TERM signal in root process to avoid cgroup leaking. diff --git a/ci/pull_e2e_kind.groovy b/ci/pull_e2e_kind.groovy index 04cc57453e..409050349a 100644 --- a/ci/pull_e2e_kind.groovy +++ b/ci/pull_e2e_kind.groovy @@ -37,7 +37,7 @@ metadata: spec: containers: - name: main - image: gcr.io/k8s-testimages/kubekins-e2e:v20210808-1eaeec7-master + image: hub-new.pingcap.net/tidb-operator/kubekins-e2e:v20210808-1eaeec7-master command: - runner.sh # Clean containers on TERM signal in root process to avoid cgroup leaking. diff --git a/ci/pull_e2e_release.groovy b/ci/pull_e2e_release.groovy index 7b6a6fe6bd..e590e2676d 100644 --- a/ci/pull_e2e_release.groovy +++ b/ci/pull_e2e_release.groovy @@ -37,7 +37,7 @@ metadata: spec: containers: - name: main - image: gcr.io/k8s-testimages/kubekins-e2e:v20210808-1eaeec7-master + image: hub-new.pingcap.net/tidb-operator/kubekins-e2e:v20210808-1eaeec7-master command: - runner.sh # Clean containers on TERM signal in root process to avoid cgroup leaking. diff --git a/ci/vm.groovy b/ci/vm.groovy index 408642b26c..5b5ca52124 100644 --- a/ci/vm.groovy +++ b/ci/vm.groovy @@ -16,7 +16,7 @@ kind: Pod spec: containers: - name: main - image: gcr.io/k8s-testimages/kubekins-e2e:v20210808-1eaeec7-master + image: hub-new.pingcap.net/tidb-operator/kubekins-e2e:v20210808-1eaeec7-master command: - runner.sh - sleep