From cedddae62b1677243497ade807d6522172a10d47 Mon Sep 17 00:00:00 2001 From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> Date: Tue, 23 Jul 2024 10:57:40 +0300 Subject: [PATCH 1/6] Set vitess golang dependencies to 20.0.1 This commit was made automatically by the vitess-releaser tool. See https://github.com/vitessio/vitess-releaser Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> Signed-off-by: Florent Poinsard --- go.mod | 4 ++-- go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 2231128f..9504fae1 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module planetscale.dev/vitess-operator -go 1.22.4 +go 1.22.5 require ( github.com/ahmetb/gen-crd-api-reference-docs v0.1.5-0.20190629210212-52e137b8d003 @@ -22,7 +22,7 @@ require ( sigs.k8s.io/controller-runtime v0.16.3 sigs.k8s.io/controller-tools v0.11.3 sigs.k8s.io/kustomize v2.0.3+incompatible - vitess.io/vitess v0.20.0 + vitess.io/vitess v0.20.1 ) require ( diff --git a/go.sum b/go.sum index 4c4f6899..51a2612b 100644 --- a/go.sum +++ b/go.sum @@ -784,5 +784,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77Vzej sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= -vitess.io/vitess v0.20.0 h1:EIEq9r0SJCgsFl1NXRAoFIrY0GxwvzaVDy1G25pdMwo= -vitess.io/vitess v0.20.0/go.mod h1:vbcOzYn1ffhHaeIJk9tef4sm7VknJczPSY9pT2vV4Xs= +vitess.io/vitess v0.20.1 h1:ZakYoAsRPQwK1TSTT5pw4DRaY4+OJtx9yb/OD5qSifQ= +vitess.io/vitess v0.20.1/go.mod h1:Mnatr1WQwXSWa7tWZrc8XVHMCckUZ4z/yZSl3rwlYk8= From 3980e78d48136cc6660374d268ea354a120a807c Mon Sep 17 00:00:00 2001 From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> Date: Tue, 23 Jul 2024 10:57:45 +0300 Subject: [PATCH 2/6] Update test code to use proper image This commit was made automatically by the vitess-releaser tool. See https://github.com/vitessio/vitess-releaser Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> Signed-off-by: Florent Poinsard --- pkg/apis/planetscale/v2/defaults.go | 2 +- .../operator/101_initial_cluster_backup.yaml | 10 +++++----- .../101_initial_cluster_backup_schedule.yaml | 10 +++++----- .../101_initial_cluster_unmanaged_tablet.yaml | 12 ++++++------ .../operator/101_initial_cluster_vtorc_vtadmin.yaml | 12 ++++++------ test/endtoend/operator/102_keyspace_teardown.yaml | 10 +++++----- test/endtoend/operator/201_customer_tablets.yaml | 10 +++++----- test/endtoend/operator/302_new_shards.yaml | 10 +++++----- test/endtoend/operator/306_down_shard_0.yaml | 10 +++++----- test/endtoend/operator/cluster_upgrade.yaml | 10 +++++----- 10 files changed, 48 insertions(+), 48 deletions(-) diff --git a/pkg/apis/planetscale/v2/defaults.go b/pkg/apis/planetscale/v2/defaults.go index e5067b0f..39f04d6a 100644 --- a/pkg/apis/planetscale/v2/defaults.go +++ b/pkg/apis/planetscale/v2/defaults.go @@ -102,7 +102,7 @@ const ( // DefaultMysqlPortName is the name for the MySQL port. DefaultMysqlPortName = "mysql" - defaultVitessLiteImage = "vitess/lite:v20.0.0" + defaultVitessLiteImage = "vitess/lite:v20.0.1" defaultMySQLImage = "mysql:8.0.30" DefaultInitCPURequestMillis = 100 diff --git a/test/endtoend/operator/101_initial_cluster_backup.yaml b/test/endtoend/operator/101_initial_cluster_backup.yaml index 56d885b3..3ec24e16 100644 --- a/test/endtoend/operator/101_initial_cluster_backup.yaml +++ b/test/endtoend/operator/101_initial_cluster_backup.yaml @@ -15,11 +15,11 @@ spec: path: /backup type: Directory images: - vtctld: vitess/lite:v20.0.0 - vtgate: vitess/lite:v20.0.0 - vttablet: vitess/lite:v20.0.0 - vtorc: vitess/lite:v20.0.0 - vtbackup: vitess/lite:v20.0.0 + vtctld: vitess/lite:v20.0.1 + vtgate: vitess/lite:v20.0.1 + vttablet: vitess/lite:v20.0.1 + vtorc: vitess/lite:v20.0.1 + vtbackup: vitess/lite:v20.0.1 mysqld: mysql80Compatible: mysql:8.0.30 mysqldExporter: prom/mysqld-exporter:v0.11.0 diff --git a/test/endtoend/operator/101_initial_cluster_backup_schedule.yaml b/test/endtoend/operator/101_initial_cluster_backup_schedule.yaml index 94898da7..27f4d0b0 100644 --- a/test/endtoend/operator/101_initial_cluster_backup_schedule.yaml +++ b/test/endtoend/operator/101_initial_cluster_backup_schedule.yaml @@ -46,11 +46,11 @@ spec: keyspace: "commerce" shard: "-" images: - vtctld: vitess/lite:v20.0.0 - vtgate: vitess/lite:v20.0.0 - vttablet: vitess/lite:v20.0.0 - vtorc: vitess/lite:v20.0.0 - vtbackup: vitess/lite:v20.0.0 + vtctld: vitess/lite:v20.0.1 + vtgate: vitess/lite:v20.0.1 + vttablet: vitess/lite:v20.0.1 + vtorc: vitess/lite:v20.0.1 + vtbackup: vitess/lite:v20.0.1 mysqld: mysql80Compatible: mysql:8.0.30 mysqldExporter: prom/mysqld-exporter:v0.11.0 diff --git a/test/endtoend/operator/101_initial_cluster_unmanaged_tablet.yaml b/test/endtoend/operator/101_initial_cluster_unmanaged_tablet.yaml index 57f1f699..9d7752a5 100644 --- a/test/endtoend/operator/101_initial_cluster_unmanaged_tablet.yaml +++ b/test/endtoend/operator/101_initial_cluster_unmanaged_tablet.yaml @@ -8,12 +8,12 @@ metadata: name: example spec: images: - vtctld: vitess/lite:latest - vtadmin: vitess/vtadmin:latest - vtgate: vitess/lite:latest - vttablet: vitess/lite:latest - vtbackup: vitess/lite:latest - vtorc: vitess/lite:latest + vtctld: vitess/lite:v20.0.1 + vtadmin: vitess/vtadmin:v20.0.1 + vtgate: vitess/lite:v20.0.1 + vttablet: vitess/lite:v20.0.1 + vtbackup: vitess/lite:v20.0.1 + vtorc: vitess/lite:v20.0.1 mysqld: mysql80Compatible: mysql:8.0.30 mysqldExporter: prom/mysqld-exporter:v0.11.0 diff --git a/test/endtoend/operator/101_initial_cluster_vtorc_vtadmin.yaml b/test/endtoend/operator/101_initial_cluster_vtorc_vtadmin.yaml index aa613cbe..afe0fbc1 100644 --- a/test/endtoend/operator/101_initial_cluster_vtorc_vtadmin.yaml +++ b/test/endtoend/operator/101_initial_cluster_vtorc_vtadmin.yaml @@ -8,12 +8,12 @@ metadata: name: example spec: images: - vtctld: vitess/lite:v20.0.0 - vtadmin: vitess/vtadmin:v20.0.0 - vtgate: vitess/lite:v20.0.0 - vttablet: vitess/lite:v20.0.0 - vtbackup: vitess/lite:v20.0.0 - vtorc: vitess/lite:v20.0.0 + vtctld: vitess/lite:v20.0.1 + vtadmin: vitess/vtadmin:v20.0.1 + vtgate: vitess/lite:v20.0.1 + vttablet: vitess/lite:v20.0.1 + vtbackup: vitess/lite:v20.0.1 + vtorc: vitess/lite:v20.0.1 mysqld: mysql80Compatible: mysql:8.0.30 mysqldExporter: prom/mysqld-exporter:v0.11.0 diff --git a/test/endtoend/operator/102_keyspace_teardown.yaml b/test/endtoend/operator/102_keyspace_teardown.yaml index ff8ebde6..eb0c3265 100644 --- a/test/endtoend/operator/102_keyspace_teardown.yaml +++ b/test/endtoend/operator/102_keyspace_teardown.yaml @@ -15,11 +15,11 @@ spec: path: /backup type: Directory images: - vtctld: vitess/lite:v20.0.0 - vtgate: vitess/lite:v20.0.0 - vttablet: vitess/lite:v20.0.0 - vtorc: vitess/lite:v20.0.0 - vtbackup: vitess/lite:v20.0.0 + vtctld: vitess/lite:v20.0.1 + vtgate: vitess/lite:v20.0.1 + vttablet: vitess/lite:v20.0.1 + vtorc: vitess/lite:v20.0.1 + vtbackup: vitess/lite:v20.0.1 mysqld: mysql80Compatible: mysql:8.0.30 mysqldExporter: prom/mysqld-exporter:v0.11.0 diff --git a/test/endtoend/operator/201_customer_tablets.yaml b/test/endtoend/operator/201_customer_tablets.yaml index 186d7441..957dcdef 100644 --- a/test/endtoend/operator/201_customer_tablets.yaml +++ b/test/endtoend/operator/201_customer_tablets.yaml @@ -4,11 +4,11 @@ metadata: name: example spec: images: - vtctld: vitess/lite:v20.0.0 - vtgate: vitess/lite:v20.0.0 - vttablet: vitess/lite:v20.0.0 - vtorc: vitess/lite:v20.0.0 - vtbackup: vitess/lite:v20.0.0 + vtctld: vitess/lite:v20.0.1 + vtgate: vitess/lite:v20.0.1 + vttablet: vitess/lite:v20.0.1 + vtorc: vitess/lite:v20.0.1 + vtbackup: vitess/lite:v20.0.1 mysqld: mysql80Compatible: mysql:8.0.30 mysqldExporter: prom/mysqld-exporter:v0.11.0 diff --git a/test/endtoend/operator/302_new_shards.yaml b/test/endtoend/operator/302_new_shards.yaml index 81ce5b2f..f0e25e5e 100644 --- a/test/endtoend/operator/302_new_shards.yaml +++ b/test/endtoend/operator/302_new_shards.yaml @@ -4,11 +4,11 @@ metadata: name: example spec: images: - vtctld: vitess/lite:v20.0.0 - vtgate: vitess/lite:v20.0.0 - vttablet: vitess/lite:v20.0.0 - vtorc: vitess/lite:v20.0.0 - vtbackup: vitess/lite:v20.0.0 + vtctld: vitess/lite:v20.0.1 + vtgate: vitess/lite:v20.0.1 + vttablet: vitess/lite:v20.0.1 + vtorc: vitess/lite:v20.0.1 + vtbackup: vitess/lite:v20.0.1 mysqld: mysql80Compatible: mysql:8.0.30 mysqldExporter: prom/mysqld-exporter:v0.11.0 diff --git a/test/endtoend/operator/306_down_shard_0.yaml b/test/endtoend/operator/306_down_shard_0.yaml index c842d550..0e6c170b 100644 --- a/test/endtoend/operator/306_down_shard_0.yaml +++ b/test/endtoend/operator/306_down_shard_0.yaml @@ -4,11 +4,11 @@ metadata: name: example spec: images: - vtctld: vitess/lite:v20.0.0 - vtgate: vitess/lite:v20.0.0 - vttablet: vitess/lite:v20.0.0 - vtorc: vitess/lite:v20.0.0 - vtbackup: vitess/lite:v20.0.0 + vtctld: vitess/lite:v20.0.1 + vtgate: vitess/lite:v20.0.1 + vttablet: vitess/lite:v20.0.1 + vtorc: vitess/lite:v20.0.1 + vtbackup: vitess/lite:v20.0.1 mysqld: mysql80Compatible: mysql:8.0.30 mysqldExporter: prom/mysqld-exporter:v0.11.0 diff --git a/test/endtoend/operator/cluster_upgrade.yaml b/test/endtoend/operator/cluster_upgrade.yaml index aceb1f4f..4498cee2 100644 --- a/test/endtoend/operator/cluster_upgrade.yaml +++ b/test/endtoend/operator/cluster_upgrade.yaml @@ -8,11 +8,11 @@ metadata: name: example spec: images: - vtctld: vitess/lite:v20.0.0 - vtgate: vitess/lite:v20.0.0 - vttablet: vitess/lite:v20.0.0 - vtorc: vitess/lite:v20.0.0 - vtbackup: vitess/lite:v20.0.0 + vtctld: vitess/lite:v20.0.1 + vtgate: vitess/lite:v20.0.1 + vttablet: vitess/lite:v20.0.1 + vtorc: vitess/lite:v20.0.1 + vtbackup: vitess/lite:v20.0.1 mysqld: mysql80Compatible: mysql:8.0.30 mysqldExporter: prom/mysqld-exporter:v0.11.0 From cfef8c1402cb2354a08e971346490e0bfe2a84ee Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Tue, 23 Jul 2024 10:22:56 -0600 Subject: [PATCH 3/6] Upgrade everything to go1.22.5 Signed-off-by: Florent Poinsard --- .buildkite/pipeline.yml | 2 +- .github/workflows/integration-test.yaml | 2 +- .github/workflows/make-generate-and-diff.yaml | 2 +- .github/workflows/unit-test.yaml | 2 +- .github/workflows/upgrade-vitess-dependency.yaml | 2 +- build/Dockerfile.release | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 4edb019f..6c28fd82 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -2,7 +2,7 @@ agents: queue: "public" env: - GO_VERSION_FILE: "go1.22.4.linux-amd64.tar.gz" + GO_VERSION_FILE: "go1.22.5.linux-amd64.tar.gz" # Mount the docker.sock as to the docker container, so that we are able to # run docker build command and kind is spawned as a sibling container. diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml index 199a490b..4b085212 100644 --- a/.github/workflows/integration-test.yaml +++ b/.github/workflows/integration-test.yaml @@ -17,7 +17,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.22.4 + go-version: 1.22.5 id: go - name: Check out code into the Go module directory diff --git a/.github/workflows/make-generate-and-diff.yaml b/.github/workflows/make-generate-and-diff.yaml index 1e83d5e0..fda09291 100644 --- a/.github/workflows/make-generate-and-diff.yaml +++ b/.github/workflows/make-generate-and-diff.yaml @@ -17,7 +17,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.22.4 + go-version: 1.22.5 id: go - name: Check out code into the Go module directory diff --git a/.github/workflows/unit-test.yaml b/.github/workflows/unit-test.yaml index 50cc173c..6dae74ab 100644 --- a/.github/workflows/unit-test.yaml +++ b/.github/workflows/unit-test.yaml @@ -17,7 +17,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.22.4 + go-version: 1.22.5 id: go - name: Check out code into the Go module directory diff --git a/.github/workflows/upgrade-vitess-dependency.yaml b/.github/workflows/upgrade-vitess-dependency.yaml index 1784890e..548e938b 100644 --- a/.github/workflows/upgrade-vitess-dependency.yaml +++ b/.github/workflows/upgrade-vitess-dependency.yaml @@ -20,7 +20,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.22.4 + go-version: 1.22.5 - name: Check out code into the Go module directory uses: actions/checkout@v2 diff --git a/build/Dockerfile.release b/build/Dockerfile.release index ee863b6d..3b5b5cd0 100755 --- a/build/Dockerfile.release +++ b/build/Dockerfile.release @@ -11,7 +11,7 @@ # without messing up file permissions, since the Docker container doesn't run as # your actual user. -FROM golang:1.22.4 AS build +FROM golang:1.22.5 AS build ENV GO111MODULE=on WORKDIR /go/src/planetscale.dev/vitess-operator From ea43be77d3b5475bed79edc83e6a502a3a1043b2 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Tue, 23 Jul 2024 10:24:58 -0600 Subject: [PATCH 4/6] Use proper version increment in the tests Signed-off-by: Florent Poinsard --- test/endtoend/backup_restore_test.sh | 2 +- test/endtoend/backup_schedule_test.sh | 2 +- test/endtoend/upgrade_test.sh | 2 +- test/endtoend/vtorc_vtadmin_test.sh | 2 +- tools/get-e2e-test-deps.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/endtoend/backup_restore_test.sh b/test/endtoend/backup_restore_test.sh index e0f3bcad..3bcd5b1f 100755 --- a/test/endtoend/backup_restore_test.sh +++ b/test/endtoend/backup_restore_test.sh @@ -108,7 +108,7 @@ killall kubectl setupKubectlAccessForCI get_started "operator-latest.yaml" "101_initial_cluster_backup.yaml" -verifyVtGateVersion "20.0.0" +verifyVtGateVersion "20.0.1" checkSemiSyncSetup takeBackup "commerce/-" verifyListBackupsOutput diff --git a/test/endtoend/backup_schedule_test.sh b/test/endtoend/backup_schedule_test.sh index 2a65dc7c..4c01e6f2 100755 --- a/test/endtoend/backup_schedule_test.sh +++ b/test/endtoend/backup_schedule_test.sh @@ -79,7 +79,7 @@ killall kubectl setupKubectlAccessForCI get_started "operator-latest.yaml" "101_initial_cluster_backup_schedule.yaml" -verifyVtGateVersion "20.0.0" +verifyVtGateVersion "20.0.1" checkSemiSyncSetup verifyListBackupsOutputWithSchedule diff --git a/test/endtoend/upgrade_test.sh b/test/endtoend/upgrade_test.sh index b1126d54..dfb2a504 100755 --- a/test/endtoend/upgrade_test.sh +++ b/test/endtoend/upgrade_test.sh @@ -250,7 +250,7 @@ checkSemiSyncSetup # Initially too durability policy should be specified verifyDurabilityPolicy "commerce" "semi_sync" upgradeToLatest -verifyVtGateVersion "20.0.0" +verifyVtGateVersion "20.0.1" checkSemiSyncSetup # After upgrading, we verify that the durability policy is still semi_sync verifyDurabilityPolicy "commerce" "semi_sync" diff --git a/test/endtoend/vtorc_vtadmin_test.sh b/test/endtoend/vtorc_vtadmin_test.sh index 91767fb5..45dfe726 100755 --- a/test/endtoend/vtorc_vtadmin_test.sh +++ b/test/endtoend/vtorc_vtadmin_test.sh @@ -242,7 +242,7 @@ killall kubectl setupKubectlAccessForCI get_started_vtorc_vtadmin -verifyVtGateVersion "20.0.0" +verifyVtGateVersion "20.0.1" checkSemiSyncSetup # Check Vtadmin is setup diff --git a/tools/get-e2e-test-deps.sh b/tools/get-e2e-test-deps.sh index 0d034f9f..0f8df5df 100755 --- a/tools/get-e2e-test-deps.sh +++ b/tools/get-e2e-test-deps.sh @@ -40,7 +40,7 @@ fi if ! command -v vtctldclient &> /dev/null then echo "Downloading vtctldclient..." - version=20.0.0-rc1 + version=20.0.1 file=vitess-${version}-7e8c974.tar.gz wget https://github.com/vitessio/vitess/releases/download/v${version}/${file} tar -xzf ${file} From f40db0726a297bd5807ba05cb1fb122d72b0fda4 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Tue, 23 Jul 2024 10:35:56 -0600 Subject: [PATCH 5/6] Fix vitess sha Signed-off-by: Florent Poinsard --- tools/get-e2e-test-deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/get-e2e-test-deps.sh b/tools/get-e2e-test-deps.sh index 0f8df5df..4becea46 100755 --- a/tools/get-e2e-test-deps.sh +++ b/tools/get-e2e-test-deps.sh @@ -41,7 +41,7 @@ if ! command -v vtctldclient &> /dev/null then echo "Downloading vtctldclient..." version=20.0.1 - file=vitess-${version}-7e8c974.tar.gz + file=vitess-${version}-003c441.tar.gz wget https://github.com/vitessio/vitess/releases/download/v${version}/${file} tar -xzf ${file} cd ${file/.tar.gz/} From 0ad04073df5df9167dc01b20181701b42ede4a8b Mon Sep 17 00:00:00 2001 From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> Date: Tue, 23 Jul 2024 10:57:50 +0300 Subject: [PATCH 6/6] Go back to dev mode This commit was made automatically by the vitess-releaser tool. See https://github.com/vitessio/vitess-releaser Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> Signed-off-by: Florent Poinsard --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index dd1f5457..16eba389 100644 --- a/version/version.go +++ b/version/version.go @@ -20,5 +20,5 @@ package version // THIS FILE IS AUTO-GENERATED DURING NEW RELEASES BY THE VITESS-RELEASER var ( - Version = "2.13.1" + Version = "2.13.2" )