From 92fe3011a8ec7970774fee9f14fac3f1c5b6e462 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Thu, 30 Jan 2025 08:36:08 +0000 Subject: [PATCH] Upgrade default etcd version to 3.5.17 (#17653) Signed-off-by: Graham Campbell --- .github/workflows/codecov.yml | 4 ++-- .github/workflows/unit_race.yml | 4 ++-- .github/workflows/unit_race_evalengine.yml | 4 ++-- .github/workflows/unit_test_evalengine_mysql57.yml | 4 ++-- .github/workflows/unit_test_evalengine_mysql80.yml | 4 ++-- .github/workflows/unit_test_evalengine_mysql84.yml | 4 ++-- .github/workflows/unit_test_mysql57.yml | 4 ++-- .github/workflows/unit_test_mysql80.yml | 4 ++-- .github/workflows/unit_test_mysql84.yml | 4 ++-- build.env | 2 +- docker/mini/install_mini_dependencies.sh | 2 +- test/templates/unit_test.tpl | 4 ++-- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 35517c4f6c5..c8d4d5704e1 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -80,8 +80,8 @@ jobs: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld || echo "could not remove mysqld profile" mkdir -p dist bin - curl -L https://github.com/coreos/etcd/releases/download/v3.3.10/etcd-v3.3.10-linux-amd64.tar.gz | tar -zxC dist - mv dist/etcd-v3.3.10-linux-amd64/{etcd,etcdctl} bin/ + curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist + mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/ go mod download go install golang.org/x/tools/cmd/goimports@latest diff --git a/.github/workflows/unit_race.yml b/.github/workflows/unit_race.yml index 77f47a6c083..3e89b3739fd 100644 --- a/.github/workflows/unit_race.yml +++ b/.github/workflows/unit_race.yml @@ -99,8 +99,8 @@ jobs: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld || echo "could not remove mysqld profile" mkdir -p dist bin - curl -s -L https://github.com/coreos/etcd/releases/download/v3.3.10/etcd-v3.3.10-linux-amd64.tar.gz | tar -zxC dist - mv dist/etcd-v3.3.10-linux-amd64/{etcd,etcdctl} bin/ + curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist + mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/ go mod download go install golang.org/x/tools/cmd/goimports@latest diff --git a/.github/workflows/unit_race_evalengine.yml b/.github/workflows/unit_race_evalengine.yml index 9654209f2a9..a08c33d5fbe 100644 --- a/.github/workflows/unit_race_evalengine.yml +++ b/.github/workflows/unit_race_evalengine.yml @@ -99,8 +99,8 @@ jobs: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld || echo "could not remove mysqld profile" mkdir -p dist bin - curl -s -L https://github.com/coreos/etcd/releases/download/v3.3.10/etcd-v3.3.10-linux-amd64.tar.gz | tar -zxC dist - mv dist/etcd-v3.3.10-linux-amd64/{etcd,etcdctl} bin/ + curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist + mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/ go mod download go install golang.org/x/tools/cmd/goimports@latest diff --git a/.github/workflows/unit_test_evalengine_mysql57.yml b/.github/workflows/unit_test_evalengine_mysql57.yml index eea3a5aad57..2edcfa58955 100644 --- a/.github/workflows/unit_test_evalengine_mysql57.yml +++ b/.github/workflows/unit_test_evalengine_mysql57.yml @@ -129,8 +129,8 @@ jobs: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld || echo "could not remove mysqld profile" mkdir -p dist bin - curl -s -L https://github.com/coreos/etcd/releases/download/v3.3.10/etcd-v3.3.10-linux-amd64.tar.gz | tar -zxC dist - mv dist/etcd-v3.3.10-linux-amd64/{etcd,etcdctl} bin/ + curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist + mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/ go mod download go install golang.org/x/tools/cmd/goimports@latest diff --git a/.github/workflows/unit_test_evalengine_mysql80.yml b/.github/workflows/unit_test_evalengine_mysql80.yml index f48e224808d..be389de1452 100644 --- a/.github/workflows/unit_test_evalengine_mysql80.yml +++ b/.github/workflows/unit_test_evalengine_mysql80.yml @@ -119,8 +119,8 @@ jobs: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld || echo "could not remove mysqld profile" mkdir -p dist bin - curl -s -L https://github.com/coreos/etcd/releases/download/v3.3.10/etcd-v3.3.10-linux-amd64.tar.gz | tar -zxC dist - mv dist/etcd-v3.3.10-linux-amd64/{etcd,etcdctl} bin/ + curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist + mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/ go mod download go install golang.org/x/tools/cmd/goimports@latest diff --git a/.github/workflows/unit_test_evalengine_mysql84.yml b/.github/workflows/unit_test_evalengine_mysql84.yml index 6b373d96812..d96e68a857d 100644 --- a/.github/workflows/unit_test_evalengine_mysql84.yml +++ b/.github/workflows/unit_test_evalengine_mysql84.yml @@ -119,8 +119,8 @@ jobs: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld || echo "could not remove mysqld profile" mkdir -p dist bin - curl -s -L https://github.com/coreos/etcd/releases/download/v3.3.10/etcd-v3.3.10-linux-amd64.tar.gz | tar -zxC dist - mv dist/etcd-v3.3.10-linux-amd64/{etcd,etcdctl} bin/ + curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist + mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/ go mod download go install golang.org/x/tools/cmd/goimports@latest diff --git a/.github/workflows/unit_test_mysql57.yml b/.github/workflows/unit_test_mysql57.yml index 3644170ebdc..41727bfc53c 100644 --- a/.github/workflows/unit_test_mysql57.yml +++ b/.github/workflows/unit_test_mysql57.yml @@ -129,8 +129,8 @@ jobs: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld || echo "could not remove mysqld profile" mkdir -p dist bin - curl -s -L https://github.com/coreos/etcd/releases/download/v3.3.10/etcd-v3.3.10-linux-amd64.tar.gz | tar -zxC dist - mv dist/etcd-v3.3.10-linux-amd64/{etcd,etcdctl} bin/ + curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist + mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/ go mod download go install golang.org/x/tools/cmd/goimports@latest diff --git a/.github/workflows/unit_test_mysql80.yml b/.github/workflows/unit_test_mysql80.yml index 18bfa546124..0ac43a1da01 100644 --- a/.github/workflows/unit_test_mysql80.yml +++ b/.github/workflows/unit_test_mysql80.yml @@ -119,8 +119,8 @@ jobs: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld || echo "could not remove mysqld profile" mkdir -p dist bin - curl -s -L https://github.com/coreos/etcd/releases/download/v3.3.10/etcd-v3.3.10-linux-amd64.tar.gz | tar -zxC dist - mv dist/etcd-v3.3.10-linux-amd64/{etcd,etcdctl} bin/ + curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist + mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/ go mod download go install golang.org/x/tools/cmd/goimports@latest diff --git a/.github/workflows/unit_test_mysql84.yml b/.github/workflows/unit_test_mysql84.yml index 10b3c2b8a6c..8371bf13826 100644 --- a/.github/workflows/unit_test_mysql84.yml +++ b/.github/workflows/unit_test_mysql84.yml @@ -119,8 +119,8 @@ jobs: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld || echo "could not remove mysqld profile" mkdir -p dist bin - curl -s -L https://github.com/coreos/etcd/releases/download/v3.3.10/etcd-v3.3.10-linux-amd64.tar.gz | tar -zxC dist - mv dist/etcd-v3.3.10-linux-amd64/{etcd,etcdctl} bin/ + curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist + mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/ go mod download go install golang.org/x/tools/cmd/goimports@latest diff --git a/build.env b/build.env index 12431842b6e..6818975103f 100755 --- a/build.env +++ b/build.env @@ -29,7 +29,7 @@ export VTDATAROOT="${VTDATAROOT:-${VTROOT}/vtdataroot}" export PATH="$PWD/bin:$PATH" export PROTOC_VER=21.3 export ZK_VER=${ZK_VERSION:-3.8.0} -export ETCD_VER=v3.5.6 +export ETCD_VER=v3.5.17 export CONSUL_VER=1.11.4 export TOXIPROXY_VER=v2.7.0 diff --git a/docker/mini/install_mini_dependencies.sh b/docker/mini/install_mini_dependencies.sh index 03a97cc0962..754249b7d49 100755 --- a/docker/mini/install_mini_dependencies.sh +++ b/docker/mini/install_mini_dependencies.sh @@ -8,7 +8,7 @@ set -euo pipefail # Install etcd -ETCD_VER=v3.4.9 +ETCD_VER=v3.5.17 DOWNLOAD_URL=https://storage.googleapis.com/etcd curl -k -L ${DOWNLOAD_URL}/${ETCD_VER}/etcd-${ETCD_VER}-linux-amd64.tar.gz -o /tmp/etcd-${ETCD_VER}-linux-amd64.tar.gz diff --git a/test/templates/unit_test.tpl b/test/templates/unit_test.tpl index 10c3b8c0c6a..be71af987ed 100644 --- a/test/templates/unit_test.tpl +++ b/test/templates/unit_test.tpl @@ -143,8 +143,8 @@ jobs: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld || echo "could not remove mysqld profile" mkdir -p dist bin - curl -s -L https://github.com/coreos/etcd/releases/download/v3.3.10/etcd-v3.3.10-linux-amd64.tar.gz | tar -zxC dist - mv dist/etcd-v3.3.10-linux-amd64/{etcd,etcdctl} bin/ + curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist + mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/ go mod download go install golang.org/x/tools/cmd/goimports@latest