From dd53a23a924b1c18e4cc7164ff5b6e99584d4faa Mon Sep 17 00:00:00 2001 From: Rohit Nayak Date: Fri, 11 Oct 2024 19:42:00 +0200 Subject: [PATCH 1/2] Unfreeze branch release-21.0 This commit was made automatically by the vitess-releaser tool. See https://github.com/vitessio/vitess-releaser Signed-off-by: Rohit Nayak --- .github/workflows/code_freeze.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 5c4f6b98cef3a0e086f4deb01684d369678482f0 Mon Sep 17 00:00:00 2001 From: Rohit Nayak Date: Fri, 11 Oct 2024 19:42:08 +0200 Subject: [PATCH 2/2] Update codebase for the v21.0.0 release This commit was made automatically by the vitess-releaser tool. See https://github.com/vitessio/vitess-releaser Signed-off-by: Rohit Nayak --- 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 | 16 ++++++------ 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 +++++----- examples/operator/401_scheduled_backups.yaml | 14 +++++----- examples/operator/operator.yaml | 2 +- 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 +- 16 files changed, 86 insertions(+), 86 deletions(-) diff --git a/examples/compose/docker-compose.beginners.yml b/examples/compose/docker-compose.beginners.yml index 0546486f3b1..2510e7bca2b 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:v21.0.0-rc2 + image: vitess/lite:v21.0.0 ports: - "15000:$WEB_PORT" - "$GRPC_PORT" @@ -83,7 +83,7 @@ services: condition: service_healthy vtgate: - image: vitess/lite:v21.0.0-rc2 + image: vitess/lite:v21.0.0 ports: - "15099:$WEB_PORT" - "$GRPC_PORT" @@ -113,7 +113,7 @@ services: condition: service_healthy schemaload: - image: vitess/lite:v21.0.0-rc2 + image: vitess/lite:v21.0.0 command: - sh - -c @@ -146,12 +146,12 @@ services: environment: - KEYSPACES=$KEYSPACE - GRPC_PORT=15999 - image: vitess/lite:v21.0.0-rc2 + image: vitess/lite:v21.0.0 volumes: - .:/script vttablet100: - image: vitess/lite:v21.0.0-rc2 + image: vitess/lite:v21.0.0 ports: - "15100:$WEB_PORT" - "$GRPC_PORT" @@ -183,7 +183,7 @@ services: retries: 15 vttablet101: - image: vitess/lite:v21.0.0-rc2 + image: vitess/lite:v21.0.0 ports: - "15101:$WEB_PORT" - "$GRPC_PORT" @@ -215,7 +215,7 @@ services: retries: 15 vttablet102: - image: vitess/lite:v21.0.0-rc2 + image: vitess/lite:v21.0.0 ports: - "15102:$WEB_PORT" - "$GRPC_PORT" @@ -247,7 +247,7 @@ services: retries: 15 vttablet103: - image: vitess/lite:v21.0.0-rc2 + image: vitess/lite:v21.0.0 ports: - "15103:$WEB_PORT" - "$GRPC_PORT" @@ -279,7 +279,7 @@ services: retries: 15 vtorc: - image: vitess/lite:v21.0.0-rc2 + image: vitess/lite:v21.0.0 command: ["sh", "-c", "/script/vtorc-up.sh"] depends_on: - vtctld @@ -309,7 +309,7 @@ services: retries: 15 vreplication: - image: vitess/lite:v21.0.0-rc2 + image: vitess/lite:v21.0.0 volumes: - ".:/script" environment: diff --git a/examples/compose/docker-compose.yml b/examples/compose/docker-compose.yml index f1ff61168bd..fc7e736a199 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:v21.0.0-rc2 + image: vitess/lite:v21.0.0 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:v21.0.0-rc2 + image: vitess/lite:v21.0.0 volumes: - .:/script set_keyspace_durability_policy: @@ -115,7 +115,7 @@ services: environment: - KEYSPACES=test_keyspace lookup_keyspace - GRPC_PORT=15999 - image: vitess/lite:v21.0.0-rc2 + image: vitess/lite:v21.0.0 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:v21.0.0-rc2 + image: vitess/lite:v21.0.0 volumes: - .:/script vtctld: @@ -143,7 +143,7 @@ services: depends_on: external_db_host: condition: service_healthy - image: vitess/lite:v21.0.0-rc2 + image: vitess/lite:v21.0.0 ports: - 15000:8080 - "15999" @@ -160,7 +160,7 @@ services: --normalize_queries=true ' depends_on: - vtctld - image: vitess/lite:v21.0.0-rc2 + image: vitess/lite:v21.0.0 ports: - 15099:8080 - "15999" @@ -182,7 +182,7 @@ services: - EXTERNAL_DB=0 - DB_USER= - DB_PASS= - image: vitess/lite:v21.0.0-rc2 + image: vitess/lite:v21.0.0 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:v21.0.0-rc2 + image: vitess/lite:v21.0.0 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:v21.0.0-rc2 + image: vitess/lite:v21.0.0 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:v21.0.0-rc2 + image: vitess/lite:v21.0.0 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:v21.0.0-rc2 + image: vitess/lite:v21.0.0 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:v21.0.0-rc2 + image: vitess/lite:v21.0.0 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:v21.0.0-rc2 + image: vitess/lite:v21.0.0 ports: - 15302:8080 - "15999" diff --git a/examples/compose/vtcompose/docker-compose.test.yml b/examples/compose/vtcompose/docker-compose.test.yml index 9d085e17852..95f29c04ca4 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:v21.0.0-rc2 + image: vitess/lite:v21.0.0 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:v21.0.0-rc2 + image: vitess/lite:v21.0.0 volumes: - .:/script set_keyspace_durability_policy_test_keyspace: @@ -117,7 +117,7 @@ services: environment: - GRPC_PORT=15999 - KEYSPACES=test_keyspace - image: vitess/lite:v21.0.0-rc2 + image: vitess/lite:v21.0.0 volumes: - .:/script set_keyspace_durability_policy_unsharded_keyspace: @@ -130,7 +130,7 @@ services: environment: - GRPC_PORT=15999 - KEYSPACES=unsharded_keyspace - image: vitess/lite:v21.0.0-rc2 + image: vitess/lite:v21.0.0 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:v21.0.0-rc2 + image: vitess/lite:v21.0.0 volumes: - .:/script vtctld: @@ -159,7 +159,7 @@ services: depends_on: external_db_host: condition: service_healthy - image: vitess/lite:v21.0.0-rc2 + image: vitess/lite:v21.0.0 ports: - 15000:8080 - "15999" @@ -176,7 +176,7 @@ services: ''grpc-vtgateservice'' --normalize_queries=true ' depends_on: - vtctld - image: vitess/lite:v21.0.0-rc2 + image: vitess/lite:v21.0.0 ports: - 15099:8080 - "15999" @@ -199,7 +199,7 @@ services: - EXTERNAL_DB=0 - DB_USER= - DB_PASS= - image: vitess/lite:v21.0.0-rc2 + image: vitess/lite:v21.0.0 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:v21.0.0-rc2 + image: vitess/lite:v21.0.0 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:v21.0.0-rc2 + image: vitess/lite:v21.0.0 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:v21.0.0-rc2 + image: vitess/lite:v21.0.0 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:v21.0.0-rc2 + image: vitess/lite:v21.0.0 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:v21.0.0-rc2 + image: vitess/lite:v21.0.0 ports: - 15301:8080 - "15999" diff --git a/examples/compose/vtcompose/vtcompose.go b/examples/compose/vtcompose/vtcompose.go index 54192e530bb..bd9ae74864d 100644 --- a/examples/compose/vtcompose/vtcompose.go +++ b/examples/compose/vtcompose/vtcompose.go @@ -525,7 +525,7 @@ func generateExternalPrimary( - op: add path: /services/vttablet%[1]d value: - image: vitess/lite:v21.0.0-rc2 + image: vitess/lite:v21.0.0 ports: - "15%[1]d:%[3]d" - "%[4]d" @@ -587,7 +587,7 @@ func generateDefaultTablet(tabAlias int, shard, role, keyspace string, dbInfo ex - op: add path: /services/vttablet%[1]d value: - image: vitess/lite:v21.0.0-rc2 + image: vitess/lite:v21.0.0 ports: - "15%[1]d:%[4]d" - "%[5]d" @@ -625,7 +625,7 @@ func generateVtctld(opts vtOptions) string { - op: add path: /services/vtctld value: - image: vitess/lite:v21.0.0-rc2 + image: vitess/lite:v21.0.0 ports: - "15000:%[1]d" - "%[2]d" @@ -656,7 +656,7 @@ func generateVtgate(opts vtOptions) string { - op: add path: /services/vtgate value: - image: vitess/lite:v21.0.0-rc2 + image: vitess/lite:v21.0.0 ports: - "15099:%[1]d" - "%[2]d" @@ -698,7 +698,7 @@ func generateVTOrc(dbInfo externalDbInfo, keyspaceInfoMap map[string]keyspaceInf - op: add path: /services/vtorc value: - image: vitess/lite:v21.0.0-rc2 + image: vitess/lite:v21.0.0 volumes: - ".:/script" environment: @@ -723,7 +723,7 @@ func generateVreplication(dbInfo externalDbInfo, opts vtOptions) string { - op: add path: /services/vreplication value: - image: vitess/lite:v21.0.0-rc2 + image: vitess/lite:v21.0.0 volumes: - ".:/script" environment: @@ -751,7 +751,7 @@ func generateSetKeyspaceDurabilityPolicy( - op: add path: /services/set_keyspace_durability_policy_%[3]s value: - image: vitess/lite:v21.0.0-rc2 + image: vitess/lite:v21.0.0 volumes: - ".:/script" environment: @@ -788,7 +788,7 @@ func generateSchemaload( - op: add path: /services/schemaload_%[7]s value: - image: vitess/lite:v21.0.0-rc2 + image: vitess/lite:v21.0.0 volumes: - ".:/script" environment: diff --git a/examples/operator/101_initial_cluster.yaml b/examples/operator/101_initial_cluster.yaml index baab3fd83d1..caf1fddbc2f 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:v21.0.0-rc2 - vtadmin: vitess/vtadmin:v21.0.0-rc2 - vtgate: vitess/lite:v21.0.0-rc2 - vttablet: vitess/lite:v21.0.0-rc2 - vtbackup: vitess/lite:v21.0.0-rc2 - vtorc: vitess/lite:v21.0.0-rc2 + vtctld: vitess/lite:v21.0.0 + vtadmin: vitess/vtadmin:v21.0.0 + vtgate: vitess/lite:v21.0.0 + vttablet: vitess/lite:v21.0.0 + vtbackup: vitess/lite:v21.0.0 + vtorc: vitess/lite:v21.0.0 mysqld: - mysql80Compatible: vitess/lite:v21.0.0-rc2 + mysql80Compatible: vitess/lite:v21.0.0 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 bd4d407cb8c..7edcbf6ecb3 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:v21.0.0-rc2 - vtadmin: vitess/vtadmin:v21.0.0-rc2 - vtgate: vitess/lite:v21.0.0-rc2 - vttablet: vitess/lite:v21.0.0-rc2 - vtbackup: vitess/lite:v21.0.0-rc2 - vtorc: vitess/lite:v21.0.0-rc2 + vtctld: vitess/lite:v21.0.0 + vtadmin: vitess/vtadmin:v21.0.0 + vtgate: vitess/lite:v21.0.0 + vttablet: vitess/lite:v21.0.0 + vtbackup: vitess/lite:v21.0.0 + vtorc: vitess/lite:v21.0.0 mysqld: - mysql80Compatible: vitess/lite:v21.0.0-rc2 + mysql80Compatible: vitess/lite:v21.0.0 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 eded6fa5b10..993b5492f5b 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:v21.0.0-rc2 - vtadmin: vitess/vtadmin:v21.0.0-rc2 - vtgate: vitess/lite:v21.0.0-rc2 - vttablet: vitess/lite:v21.0.0-rc2 - vtbackup: vitess/lite:v21.0.0-rc2 - vtorc: vitess/lite:v21.0.0-rc2 + vtctld: vitess/lite:v21.0.0 + vtadmin: vitess/vtadmin:v21.0.0 + vtgate: vitess/lite:v21.0.0 + vttablet: vitess/lite:v21.0.0 + vtbackup: vitess/lite:v21.0.0 + vtorc: vitess/lite:v21.0.0 mysqld: - mysql80Compatible: vitess/lite:v21.0.0-rc2 + mysql80Compatible: vitess/lite:v21.0.0 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 e4627a1173c..910787bcaca 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:v21.0.0-rc2 - vtadmin: vitess/vtadmin:v21.0.0-rc2 - vtgate: vitess/lite:v21.0.0-rc2 - vttablet: vitess/lite:v21.0.0-rc2 - vtbackup: vitess/lite:v21.0.0-rc2 - vtorc: vitess/lite:v21.0.0-rc2 + vtctld: vitess/lite:v21.0.0 + vtadmin: vitess/vtadmin:v21.0.0 + vtgate: vitess/lite:v21.0.0 + vttablet: vitess/lite:v21.0.0 + vtbackup: vitess/lite:v21.0.0 + vtorc: vitess/lite:v21.0.0 mysqld: - mysql80Compatible: vitess/lite:v21.0.0-rc2 + mysql80Compatible: vitess/lite:v21.0.0 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/examples/operator/401_scheduled_backups.yaml b/examples/operator/401_scheduled_backups.yaml index 3affaabc3af..b252b59da63 100644 --- a/examples/operator/401_scheduled_backups.yaml +++ b/examples/operator/401_scheduled_backups.yaml @@ -45,14 +45,14 @@ spec: keyspace: "commerce" shard: "-" images: - vtctld: vitess/lite:v21.0.0-rc2 - vtadmin: vitess/vtadmin:v21.0.0-rc2 - vtgate: vitess/lite:v21.0.0-rc2 - vttablet: vitess/lite:v21.0.0-rc2 - vtbackup: vitess/lite:v21.0.0-rc2 - vtorc: vitess/lite:v21.0.0-rc2 + vtctld: vitess/lite:v21.0.0 + vtadmin: vitess/vtadmin:v21.0.0 + vtgate: vitess/lite:v21.0.0 + vttablet: vitess/lite:v21.0.0 + vtbackup: vitess/lite:v21.0.0 + vtorc: vitess/lite:v21.0.0 mysqld: - mysql80Compatible: vitess/lite:v21.0.0-rc2 + mysql80Compatible: vitess/lite:v21.0.0 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/examples/operator/operator.yaml b/examples/operator/operator.yaml index 9da554311a9..45ef98b7a78 100644 --- a/examples/operator/operator.yaml +++ b/examples/operator/operator.yaml @@ -6886,7 +6886,7 @@ spec: fieldPath: metadata.name - name: OPERATOR_NAME value: vitess-operator - image: planetscale/vitess-operator:v2.14.0-rc2 + image: planetscale/vitess-operator:v2.14.0 name: vitess-operator resources: limits: diff --git a/go/vt/servenv/version.go b/go/vt/servenv/version.go index e02716f3d4a..bd5c5b768d4 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 = "21.0.0-SNAPSHOT" +const versionName = "21.0.0" diff --git a/java/client/pom.xml b/java/client/pom.xml index fc78d17b564..43ef3fcd17d 100644 --- a/java/client/pom.xml +++ b/java/client/pom.xml @@ -5,7 +5,7 @@ io.vitess vitess-parent - 21.0.0-SNAPSHOT + 21.0.0 vitess-client diff --git a/java/example/pom.xml b/java/example/pom.xml index c2b226b6806..c26c682c5c1 100644 --- a/java/example/pom.xml +++ b/java/example/pom.xml @@ -5,7 +5,7 @@ io.vitess vitess-parent - 21.0.0-SNAPSHOT + 21.0.0 vitess-example diff --git a/java/grpc-client/pom.xml b/java/grpc-client/pom.xml index 41bd4de8291..805285249ae 100644 --- a/java/grpc-client/pom.xml +++ b/java/grpc-client/pom.xml @@ -5,7 +5,7 @@ io.vitess vitess-parent - 21.0.0-SNAPSHOT + 21.0.0 vitess-grpc-client diff --git a/java/jdbc/pom.xml b/java/jdbc/pom.xml index 49a5d61779b..84bae8a7e64 100644 --- a/java/jdbc/pom.xml +++ b/java/jdbc/pom.xml @@ -5,7 +5,7 @@ io.vitess vitess-parent - 21.0.0-SNAPSHOT + 21.0.0 vitess-jdbc diff --git a/java/pom.xml b/java/pom.xml index 8d8f6ab9275..7ed3135f631 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -11,7 +11,7 @@ io.vitess vitess-parent - 21.0.0-SNAPSHOT + 21.0.0 pom Vitess Java Client libraries [Parent]