From 6937274d9aff8779f3af2ec1840b7f0f843d383d Mon Sep 17 00:00:00 2001 From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> Date: Wed, 11 Sep 2024 10:54:24 +0300 Subject: [PATCH 1/2] [release-18.0] Release of `v18.0.7` (#16749) Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> --- .github/workflows/code_freeze.yml | 2 +- changelog/18.0/18.0.7/changelog.md | 1 - changelog/18.0/18.0.7/release_notes.md | 2 +- examples/compose/docker-compose.beginners.yml | 20 +++++++------- examples/compose/docker-compose.yml | 26 +++++++++---------- .../compose/vtcompose/docker-compose.test.yml | 26 +++++++++---------- examples/compose/vtcompose/vtcompose.go | 18 ++++++------- examples/operator/101_initial_cluster.yaml | 14 +++++----- examples/operator/201_customer_tablets.yaml | 14 +++++----- examples/operator/302_new_shards.yaml | 14 +++++----- examples/operator/306_down_shard_0.yaml | 14 +++++----- go/vt/servenv/version.go | 2 +- java/client/pom.xml | 2 +- java/example/pom.xml | 2 +- java/grpc-client/pom.xml | 2 +- java/jdbc/pom.xml | 2 +- java/pom.xml | 2 +- 17 files changed, 81 insertions(+), 82 deletions(-) diff --git a/.github/workflows/code_freeze.yml b/.github/workflows/code_freeze.yml index 8e960fecbaa..92ef037ee6b 100644 --- a/.github/workflows/code_freeze.yml +++ b/.github/workflows/code_freeze.yml @@ -11,4 +11,4 @@ jobs: steps: - name: Fail if Code Freeze is enabled run: | - exit 1 + exit 0 diff --git a/changelog/18.0/18.0.7/changelog.md b/changelog/18.0/18.0.7/changelog.md index f9b6fd53bbc..9631e94af4c 100644 --- a/changelog/18.0/18.0.7/changelog.md +++ b/changelog/18.0/18.0.7/changelog.md @@ -38,7 +38,6 @@ * [release-18.0] bugfix: Allow cross-keyspace joins (#16520) [#16522](https://github.com/vitessio/vitess/pull/16522) ### Release #### General - * [release-18.0] Bump to `v18.0.7-SNAPSHOT` after the `v18.0.6` release [#16454](https://github.com/vitessio/vitess/pull/16454) ### Testing #### Query Serving * [release-18.0] Replace ErrorContains checks with Error checks before running upgrade downgrade [#16701](https://github.com/vitessio/vitess/pull/16701) diff --git a/changelog/18.0/18.0.7/release_notes.md b/changelog/18.0/18.0.7/release_notes.md index 2e48f54ee07..7faeaeeef45 100644 --- a/changelog/18.0/18.0.7/release_notes.md +++ b/changelog/18.0/18.0.7/release_notes.md @@ -1,7 +1,7 @@ # Release of Vitess v18.0.7 The entire changelog for this release can be found [here](https://github.com/vitessio/vitess/blob/main/changelog/18.0/18.0.7/changelog.md). -The release includes 21 merged Pull Requests. +The release includes 23 merged Pull Requests. Thanks to all our contributors: @GuptaManan100, @app/vitess-bot, @frouioui, @shlomi-noach, @vitess-bot diff --git a/examples/compose/docker-compose.beginners.yml b/examples/compose/docker-compose.beginners.yml index 6bbf1bdab51..e1cea2f7165 100644 --- a/examples/compose/docker-compose.beginners.yml +++ b/examples/compose/docker-compose.beginners.yml @@ -58,7 +58,7 @@ services: - "3306" vtctld: - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 ports: - "15000:$WEB_PORT" - "$GRPC_PORT" @@ -81,7 +81,7 @@ services: condition: service_healthy vtgate: - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 ports: - "15099:$WEB_PORT" - "$GRPC_PORT" @@ -111,7 +111,7 @@ services: condition: service_healthy schemaload: - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 command: - sh - -c @@ -144,12 +144,12 @@ services: environment: - KEYSPACES=$KEYSPACE - GRPC_PORT=15999 - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 volumes: - .:/script vttablet100: - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 ports: - "15100:$WEB_PORT" - "$GRPC_PORT" @@ -181,7 +181,7 @@ services: retries: 15 vttablet101: - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 ports: - "15101:$WEB_PORT" - "$GRPC_PORT" @@ -213,7 +213,7 @@ services: retries: 15 vttablet102: - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 ports: - "15102:$WEB_PORT" - "$GRPC_PORT" @@ -245,7 +245,7 @@ services: retries: 15 vttablet103: - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 ports: - "15103:$WEB_PORT" - "$GRPC_PORT" @@ -277,7 +277,7 @@ services: retries: 15 vtorc: - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 command: ["sh", "-c", "/script/vtorc-up.sh"] depends_on: - vtctld @@ -307,7 +307,7 @@ services: retries: 15 vreplication: - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 volumes: - ".:/script" environment: diff --git a/examples/compose/docker-compose.yml b/examples/compose/docker-compose.yml index f09ccf91c05..c60e6441503 100644 --- a/examples/compose/docker-compose.yml +++ b/examples/compose/docker-compose.yml @@ -75,7 +75,7 @@ services: - SCHEMA_FILES=lookup_keyspace_schema_file.sql - POST_LOAD_FILE= - EXTERNAL_DB=0 - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 volumes: - .:/script schemaload_test_keyspace: @@ -101,7 +101,7 @@ services: - SCHEMA_FILES=test_keyspace_schema_file.sql - POST_LOAD_FILE= - EXTERNAL_DB=0 - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 volumes: - .:/script set_keyspace_durability_policy: @@ -115,7 +115,7 @@ services: environment: - KEYSPACES=test_keyspace lookup_keyspace - GRPC_PORT=15999 - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 volumes: - .:/script vreplication: @@ -129,7 +129,7 @@ services: - TOPOLOGY_FLAGS=--topo_implementation consul --topo_global_server_address consul1:8500 --topo_global_root vitess/global - EXTERNAL_DB=0 - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 volumes: - .:/script vtctld: @@ -143,7 +143,7 @@ services: depends_on: external_db_host: condition: service_healthy - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 ports: - 15000:8080 - "15999" @@ -160,7 +160,7 @@ services: --normalize_queries=true ' depends_on: - vtctld - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 ports: - 15099:8080 - "15999" @@ -182,7 +182,7 @@ services: - EXTERNAL_DB=0 - DB_USER= - DB_PASS= - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 ports: - 13000:8080 volumes: @@ -217,7 +217,7 @@ services: - CMD-SHELL - curl -s --fail --show-error localhost:8080/debug/health timeout: 10s - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 ports: - 15101:8080 - "15999" @@ -254,7 +254,7 @@ services: - CMD-SHELL - curl -s --fail --show-error localhost:8080/debug/health timeout: 10s - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 ports: - 15102:8080 - "15999" @@ -291,7 +291,7 @@ services: - CMD-SHELL - curl -s --fail --show-error localhost:8080/debug/health timeout: 10s - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 ports: - 15201:8080 - "15999" @@ -328,7 +328,7 @@ services: - CMD-SHELL - curl -s --fail --show-error localhost:8080/debug/health timeout: 10s - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 ports: - 15202:8080 - "15999" @@ -365,7 +365,7 @@ services: - CMD-SHELL - curl -s --fail --show-error localhost:8080/debug/health timeout: 10s - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 ports: - 15301:8080 - "15999" @@ -402,7 +402,7 @@ services: - CMD-SHELL - curl -s --fail --show-error localhost:8080/debug/health timeout: 10s - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 ports: - 15302:8080 - "15999" diff --git a/examples/compose/vtcompose/docker-compose.test.yml b/examples/compose/vtcompose/docker-compose.test.yml index cccb83d577f..ff7e7aae2ca 100644 --- a/examples/compose/vtcompose/docker-compose.test.yml +++ b/examples/compose/vtcompose/docker-compose.test.yml @@ -79,7 +79,7 @@ services: - SCHEMA_FILES=test_keyspace_schema_file.sql - POST_LOAD_FILE= - EXTERNAL_DB=0 - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 volumes: - .:/script schemaload_unsharded_keyspace: @@ -103,7 +103,7 @@ services: - SCHEMA_FILES=unsharded_keyspace_schema_file.sql - POST_LOAD_FILE= - EXTERNAL_DB=0 - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 volumes: - .:/script set_keyspace_durability_policy_test_keyspace: @@ -117,7 +117,7 @@ services: environment: - GRPC_PORT=15999 - KEYSPACES=test_keyspace - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 volumes: - .:/script set_keyspace_durability_policy_unsharded_keyspace: @@ -130,7 +130,7 @@ services: environment: - GRPC_PORT=15999 - KEYSPACES=unsharded_keyspace - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 volumes: - .:/script vreplication: @@ -144,7 +144,7 @@ services: - TOPOLOGY_FLAGS=--topo_implementation consul --topo_global_server_address consul1:8500 --topo_global_root vitess/global - EXTERNAL_DB=0 - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 volumes: - .:/script vtctld: @@ -159,7 +159,7 @@ services: depends_on: external_db_host: condition: service_healthy - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 ports: - 15000:8080 - "15999" @@ -176,7 +176,7 @@ services: ''grpc-vtgateservice'' --normalize_queries=true ' depends_on: - vtctld - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 ports: - 15099:8080 - "15999" @@ -199,7 +199,7 @@ services: - EXTERNAL_DB=0 - DB_USER= - DB_PASS= - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 ports: - 13000:8080 volumes: @@ -234,7 +234,7 @@ services: - CMD-SHELL - curl -s --fail --show-error localhost:8080/debug/health timeout: 10s - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 ports: - 15101:8080 - "15999" @@ -271,7 +271,7 @@ services: - CMD-SHELL - curl -s --fail --show-error localhost:8080/debug/health timeout: 10s - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 ports: - 15102:8080 - "15999" @@ -308,7 +308,7 @@ services: - CMD-SHELL - curl -s --fail --show-error localhost:8080/debug/health timeout: 10s - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 ports: - 15201:8080 - "15999" @@ -345,7 +345,7 @@ services: - CMD-SHELL - curl -s --fail --show-error localhost:8080/debug/health timeout: 10s - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 ports: - 15202:8080 - "15999" @@ -382,7 +382,7 @@ services: - CMD-SHELL - curl -s --fail --show-error localhost:8080/debug/health timeout: 10s - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 ports: - 15301:8080 - "15999" diff --git a/examples/compose/vtcompose/vtcompose.go b/examples/compose/vtcompose/vtcompose.go index 6dffd06a1cb..ae26504c7de 100644 --- a/examples/compose/vtcompose/vtcompose.go +++ b/examples/compose/vtcompose/vtcompose.go @@ -533,7 +533,7 @@ func generateDefaultShard(tabAlias int, shard string, keyspaceData keyspaceInfo, - op: add path: /services/init_shard_primary%[2]d value: - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 command: ["sh", "-c", "/vt/bin/vtctldclient %[5]s InitShardPrimary --force %[4]s/%[3]s %[6]s-%[2]d "] %[1]s `, dependsOn, aliases[0], shard, keyspaceData.keyspace, opts.topologyFlags, opts.cell) @@ -565,7 +565,7 @@ func generateExternalPrimary( - op: add path: /services/vttablet%[1]d value: - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 ports: - "15%[1]d:%[3]d" - "%[4]d" @@ -627,7 +627,7 @@ func generateDefaultTablet(tabAlias int, shard, role, keyspace string, dbInfo ex - op: add path: /services/vttablet%[1]d value: - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 ports: - "15%[1]d:%[4]d" - "%[5]d" @@ -665,7 +665,7 @@ func generateVtctld(opts vtOptions) string { - op: add path: /services/vtctld value: - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 ports: - "15000:%[1]d" - "%[2]d" @@ -696,7 +696,7 @@ func generateVtgate(opts vtOptions) string { - op: add path: /services/vtgate value: - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 ports: - "15099:%[1]d" - "%[2]d" @@ -738,7 +738,7 @@ func generateVTOrc(dbInfo externalDbInfo, keyspaceInfoMap map[string]keyspaceInf - op: add path: /services/vtorc value: - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 volumes: - ".:/script" environment: @@ -763,7 +763,7 @@ func generateVreplication(dbInfo externalDbInfo, opts vtOptions) string { - op: add path: /services/vreplication value: - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 volumes: - ".:/script" environment: @@ -791,7 +791,7 @@ func generateSetKeyspaceDurabilityPolicy( - op: add path: /services/set_keyspace_durability_policy_%[3]s value: - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 volumes: - ".:/script" environment: @@ -828,7 +828,7 @@ func generateSchemaload( - op: add path: /services/schemaload_%[7]s value: - image: vitess/lite:v18.0.6 + image: vitess/lite:v18.0.7 volumes: - ".:/script" environment: diff --git a/examples/operator/101_initial_cluster.yaml b/examples/operator/101_initial_cluster.yaml index 1fe90136df6..7f7ae3ef3e9 100644 --- a/examples/operator/101_initial_cluster.yaml +++ b/examples/operator/101_initial_cluster.yaml @@ -8,14 +8,14 @@ metadata: name: example spec: images: - vtctld: vitess/lite:v18.0.6 - vtadmin: vitess/vtadmin:v18.0.6 - vtgate: vitess/lite:v18.0.6 - vttablet: vitess/lite:v18.0.6 - vtbackup: vitess/lite:v18.0.6 - vtorc: vitess/lite:v18.0.6 + vtctld: vitess/lite:v18.0.7 + vtadmin: vitess/vtadmin:v18.0.7 + vtgate: vitess/lite:v18.0.7 + vttablet: vitess/lite:v18.0.7 + vtbackup: vitess/lite:v18.0.7 + vtorc: vitess/lite:v18.0.7 mysqld: - mysql80Compatible: vitess/lite:v18.0.6 + mysql80Compatible: vitess/lite:v18.0.7 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/examples/operator/201_customer_tablets.yaml b/examples/operator/201_customer_tablets.yaml index f3f5f98f4be..e050c78a236 100644 --- a/examples/operator/201_customer_tablets.yaml +++ b/examples/operator/201_customer_tablets.yaml @@ -4,14 +4,14 @@ metadata: name: example spec: images: - vtctld: vitess/lite:v18.0.6 - vtadmin: vitess/vtadmin:v18.0.6 - vtgate: vitess/lite:v18.0.6 - vttablet: vitess/lite:v18.0.6 - vtbackup: vitess/lite:v18.0.6 - vtorc: vitess/lite:v18.0.6 + vtctld: vitess/lite:v18.0.7 + vtadmin: vitess/vtadmin:v18.0.7 + vtgate: vitess/lite:v18.0.7 + vttablet: vitess/lite:v18.0.7 + vtbackup: vitess/lite:v18.0.7 + vtorc: vitess/lite:v18.0.7 mysqld: - mysql80Compatible: vitess/lite:v18.0.6 + mysql80Compatible: vitess/lite:v18.0.7 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/examples/operator/302_new_shards.yaml b/examples/operator/302_new_shards.yaml index 22a56f25c2d..a06cb7bcd97 100644 --- a/examples/operator/302_new_shards.yaml +++ b/examples/operator/302_new_shards.yaml @@ -4,14 +4,14 @@ metadata: name: example spec: images: - vtctld: vitess/lite:v18.0.6 - vtadmin: vitess/vtadmin:v18.0.6 - vtgate: vitess/lite:v18.0.6 - vttablet: vitess/lite:v18.0.6 - vtbackup: vitess/lite:v18.0.6 - vtorc: vitess/lite:v18.0.6 + vtctld: vitess/lite:v18.0.7 + vtadmin: vitess/vtadmin:v18.0.7 + vtgate: vitess/lite:v18.0.7 + vttablet: vitess/lite:v18.0.7 + vtbackup: vitess/lite:v18.0.7 + vtorc: vitess/lite:v18.0.7 mysqld: - mysql80Compatible: vitess/lite:v18.0.6 + mysql80Compatible: vitess/lite:v18.0.7 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/examples/operator/306_down_shard_0.yaml b/examples/operator/306_down_shard_0.yaml index bdd81864003..f02dc77f4f0 100644 --- a/examples/operator/306_down_shard_0.yaml +++ b/examples/operator/306_down_shard_0.yaml @@ -4,14 +4,14 @@ metadata: name: example spec: images: - vtctld: vitess/lite:v18.0.6 - vtadmin: vitess/vtadmin:v18.0.6 - vtgate: vitess/lite:v18.0.6 - vttablet: vitess/lite:v18.0.6 - vtbackup: vitess/lite:v18.0.6 - vtorc: vitess/lite:v18.0.6 + vtctld: vitess/lite:v18.0.7 + vtadmin: vitess/vtadmin:v18.0.7 + vtgate: vitess/lite:v18.0.7 + vttablet: vitess/lite:v18.0.7 + vtbackup: vitess/lite:v18.0.7 + vtorc: vitess/lite:v18.0.7 mysqld: - mysql80Compatible: vitess/lite:v18.0.6 + mysql80Compatible: vitess/lite:v18.0.7 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/go/vt/servenv/version.go b/go/vt/servenv/version.go index d702b4ee3a6..6adb52674be 100644 --- a/go/vt/servenv/version.go +++ b/go/vt/servenv/version.go @@ -19,4 +19,4 @@ package servenv // DO NOT EDIT // THIS FILE IS AUTO-GENERATED DURING NEW RELEASES BY THE VITESS-RELEASER -const versionName = "18.0.7-SNAPSHOT" +const versionName = "18.0.7" diff --git a/java/client/pom.xml b/java/client/pom.xml index fc8429f519b..817c66c1e26 100644 --- a/java/client/pom.xml +++ b/java/client/pom.xml @@ -5,7 +5,7 @@ io.vitess vitess-parent - 18.0.7-SNAPSHOT + 18.0.7 vitess-client diff --git a/java/example/pom.xml b/java/example/pom.xml index f54a97b0535..74b6160f87a 100644 --- a/java/example/pom.xml +++ b/java/example/pom.xml @@ -5,7 +5,7 @@ io.vitess vitess-parent - 18.0.7-SNAPSHOT + 18.0.7 vitess-example diff --git a/java/grpc-client/pom.xml b/java/grpc-client/pom.xml index 6ce63e0959f..67064d42b2f 100644 --- a/java/grpc-client/pom.xml +++ b/java/grpc-client/pom.xml @@ -5,7 +5,7 @@ io.vitess vitess-parent - 18.0.7-SNAPSHOT + 18.0.7 vitess-grpc-client diff --git a/java/jdbc/pom.xml b/java/jdbc/pom.xml index 44fb7ca5647..c7477a87fa0 100644 --- a/java/jdbc/pom.xml +++ b/java/jdbc/pom.xml @@ -5,7 +5,7 @@ io.vitess vitess-parent - 18.0.7-SNAPSHOT + 18.0.7 vitess-jdbc diff --git a/java/pom.xml b/java/pom.xml index b928dd39f11..a5471263bce 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -11,7 +11,7 @@ io.vitess vitess-parent - 18.0.7-SNAPSHOT + 18.0.7 pom Vitess Java Client libraries [Parent] From 33f63b0b0997de479806e99a5d1d75e997412dc1 Mon Sep 17 00:00:00 2001 From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> Date: Wed, 11 Sep 2024 11:20:24 +0300 Subject: [PATCH 2/2] Fix release-18.0.7 (#16754) Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>