From 3a3087b9720044a4df2d1ce87871f4e84231a8c7 Mon Sep 17 00:00:00 2001 From: Andres Taylor Date: Thu, 14 Mar 2024 13:42:26 +0100 Subject: [PATCH] Update codebase for the v18.0.3 release Signed-off-by: Andres Taylor --- 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 | 6 ++--- 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 +- 14 files changed, 81 insertions(+), 81 deletions(-) diff --git a/examples/compose/docker-compose.beginners.yml b/examples/compose/docker-compose.beginners.yml index c293f7fa965..508dc672b44 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.2 + image: vitess/lite:v18.0.3 ports: - "15000:$WEB_PORT" - "$GRPC_PORT" @@ -81,7 +81,7 @@ services: condition: service_healthy vtgate: - image: vitess/lite:v18.0.2 + image: vitess/lite:v18.0.3 ports: - "15099:$WEB_PORT" - "$GRPC_PORT" @@ -111,7 +111,7 @@ services: condition: service_healthy schemaload: - image: vitess/lite:v18.0.2 + image: vitess/lite:v18.0.3 command: - sh - -c @@ -144,12 +144,12 @@ services: environment: - KEYSPACES=$KEYSPACE - GRPC_PORT=15999 - image: vitess/lite:v18.0.2 + image: vitess/lite:v18.0.3 volumes: - .:/script vttablet100: - image: vitess/lite:v18.0.2 + image: vitess/lite:v18.0.3 ports: - "15100:$WEB_PORT" - "$GRPC_PORT" @@ -181,7 +181,7 @@ services: retries: 15 vttablet101: - image: vitess/lite:v18.0.2 + image: vitess/lite:v18.0.3 ports: - "15101:$WEB_PORT" - "$GRPC_PORT" @@ -213,7 +213,7 @@ services: retries: 15 vttablet102: - image: vitess/lite:v18.0.2 + image: vitess/lite:v18.0.3 ports: - "15102:$WEB_PORT" - "$GRPC_PORT" @@ -245,7 +245,7 @@ services: retries: 15 vttablet103: - image: vitess/lite:v18.0.2 + image: vitess/lite:v18.0.3 ports: - "15103:$WEB_PORT" - "$GRPC_PORT" @@ -277,7 +277,7 @@ services: retries: 15 vtorc: - image: vitess/lite:v18.0.2 + image: vitess/lite:v18.0.3 command: ["sh", "-c", "/script/vtorc-up.sh"] depends_on: - vtctld @@ -307,7 +307,7 @@ services: retries: 15 vreplication: - image: vitess/lite:v18.0.2 + image: vitess/lite:v18.0.3 volumes: - ".:/script" environment: diff --git a/examples/compose/docker-compose.yml b/examples/compose/docker-compose.yml index 7e6d76978d5..02960b484b6 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.2 + image: vitess/lite:v18.0.3 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.2 + image: vitess/lite:v18.0.3 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.2 + image: vitess/lite:v18.0.3 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.2 + image: vitess/lite:v18.0.3 volumes: - .:/script vtctld: @@ -143,7 +143,7 @@ services: depends_on: external_db_host: condition: service_healthy - image: vitess/lite:v18.0.2 + image: vitess/lite:v18.0.3 ports: - 15000:8080 - "15999" @@ -160,7 +160,7 @@ services: --normalize_queries=true ' depends_on: - vtctld - image: vitess/lite:v18.0.2 + image: vitess/lite:v18.0.3 ports: - 15099:8080 - "15999" @@ -182,7 +182,7 @@ services: - EXTERNAL_DB=0 - DB_USER= - DB_PASS= - image: vitess/lite:v18.0.2 + image: vitess/lite:v18.0.3 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.2 + image: vitess/lite:v18.0.3 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.2 + image: vitess/lite:v18.0.3 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.2 + image: vitess/lite:v18.0.3 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.2 + image: vitess/lite:v18.0.3 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.2 + image: vitess/lite:v18.0.3 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.2 + image: vitess/lite:v18.0.3 ports: - 15302:8080 - "15999" diff --git a/examples/compose/vtcompose/docker-compose.test.yml b/examples/compose/vtcompose/docker-compose.test.yml index 071c1aade84..892c564a109 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.2 + image: vitess/lite:v18.0.3 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.2 + image: vitess/lite:v18.0.3 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.2 + image: vitess/lite:v18.0.3 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.2 + image: vitess/lite:v18.0.3 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.2 + image: vitess/lite:v18.0.3 volumes: - .:/script vtctld: @@ -159,7 +159,7 @@ services: depends_on: external_db_host: condition: service_healthy - image: vitess/lite:v18.0.2 + image: vitess/lite:v18.0.3 ports: - 15000:8080 - "15999" @@ -176,7 +176,7 @@ services: ''grpc-vtgateservice'' --normalize_queries=true ' depends_on: - vtctld - image: vitess/lite:v18.0.2 + image: vitess/lite:v18.0.3 ports: - 15099:8080 - "15999" @@ -199,7 +199,7 @@ services: - EXTERNAL_DB=0 - DB_USER= - DB_PASS= - image: vitess/lite:v18.0.2 + image: vitess/lite:v18.0.3 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.2 + image: vitess/lite:v18.0.3 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.2 + image: vitess/lite:v18.0.3 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.2 + image: vitess/lite:v18.0.3 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.2 + image: vitess/lite:v18.0.3 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.2 + image: vitess/lite:v18.0.3 ports: - 15301:8080 - "15999" diff --git a/examples/compose/vtcompose/vtcompose.go b/examples/compose/vtcompose/vtcompose.go index 1f1c87c8c0b..2d62c449f2b 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.2 + image: vitess/lite:v18.0.3 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.2 + image: vitess/lite:v18.0.3 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.2 + image: vitess/lite:v18.0.3 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.2 + image: vitess/lite:v18.0.3 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.2 + image: vitess/lite:v18.0.3 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.2 + image: vitess/lite:v18.0.3 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.2 + image: vitess/lite:v18.0.3 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.2 + image: vitess/lite:v18.0.3 volumes: - ".:/script" environment: @@ -828,7 +828,7 @@ func generateSchemaload( - op: add path: /services/schemaload_%[7]s value: - image: vitess/lite:v18.0.2 + image: vitess/lite:v18.0.3 volumes: - ".:/script" environment: diff --git a/examples/operator/101_initial_cluster.yaml b/examples/operator/101_initial_cluster.yaml index 41bd55856b3..2abe4665491 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.2 - vtadmin: vitess/vtadmin:v18.0.2 - vtgate: vitess/lite:v18.0.2 - vttablet: vitess/lite:v18.0.2 - vtbackup: vitess/lite:v18.0.2 - vtorc: vitess/lite:v18.0.2 + vtctld: vitess/lite:v18.0.3 + vtadmin: vitess/vtadmin:v18.0.3 + vtgate: vitess/lite:v18.0.3 + vttablet: vitess/lite:v18.0.3 + vtbackup: vitess/lite:v18.0.3 + vtorc: vitess/lite:v18.0.3 mysqld: - mysql80Compatible: vitess/lite:v18.0.2 + mysql80Compatible: vitess/lite:v18.0.3 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 0f7d56e3f70..bbce5cbcd41 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.2 - vtadmin: vitess/vtadmin:v18.0.2 - vtgate: vitess/lite:v18.0.2 - vttablet: vitess/lite:v18.0.2 - vtbackup: vitess/lite:v18.0.2 - vtorc: vitess/lite:v18.0.2 + vtctld: vitess/lite:v18.0.3 + vtadmin: vitess/vtadmin:v18.0.3 + vtgate: vitess/lite:v18.0.3 + vttablet: vitess/lite:v18.0.3 + vtbackup: vitess/lite:v18.0.3 + vtorc: vitess/lite:v18.0.3 mysqld: - mysql80Compatible: vitess/lite:v18.0.2 + mysql80Compatible: vitess/lite:v18.0.3 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 60e68646628..66154bc1990 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.2 - vtadmin: vitess/vtadmin:v18.0.2 - vtgate: vitess/lite:v18.0.2 - vttablet: vitess/lite:v18.0.2 - vtbackup: vitess/lite:v18.0.2 - vtorc: vitess/lite:v18.0.2 + vtctld: vitess/lite:v18.0.3 + vtadmin: vitess/vtadmin:v18.0.3 + vtgate: vitess/lite:v18.0.3 + vttablet: vitess/lite:v18.0.3 + vtbackup: vitess/lite:v18.0.3 + vtorc: vitess/lite:v18.0.3 mysqld: - mysql80Compatible: vitess/lite:v18.0.2 + mysql80Compatible: vitess/lite:v18.0.3 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 85b4203e108..8bbb527cd10 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.2 - vtadmin: vitess/vtadmin:v18.0.2 - vtgate: vitess/lite:v18.0.2 - vttablet: vitess/lite:v18.0.2 - vtbackup: vitess/lite:v18.0.2 - vtorc: vitess/lite:v18.0.2 + vtctld: vitess/lite:v18.0.3 + vtadmin: vitess/vtadmin:v18.0.3 + vtgate: vitess/lite:v18.0.3 + vttablet: vitess/lite:v18.0.3 + vtbackup: vitess/lite:v18.0.3 + vtorc: vitess/lite:v18.0.3 mysqld: - mysql80Compatible: vitess/lite:v18.0.2 + mysql80Compatible: vitess/lite:v18.0.3 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 af994cffb43..fe5b1abe246 100644 --- a/go/vt/servenv/version.go +++ b/go/vt/servenv/version.go @@ -1,5 +1,5 @@ /* -Copyright 2023 The Vitess Authors. +Copyright 2024 The Vitess Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ limitations under the License. package servenv -// THIS FILE IS AUTO-GENERATED DURING NEW RELEASES BY ./tools/do_releases.sh // DO NOT EDIT +// THIS FILE IS AUTO-GENERATED DURING NEW RELEASES BY THE VITESS-RELEASER -const versionName = "18.0.3-SNAPSHOT" +const versionName = "18.0.3" diff --git a/java/client/pom.xml b/java/client/pom.xml index 86ea96a7345..6829833c9ac 100644 --- a/java/client/pom.xml +++ b/java/client/pom.xml @@ -5,7 +5,7 @@ io.vitess vitess-parent - 18.0.3-SNAPSHOT + 18.0.3 vitess-client diff --git a/java/example/pom.xml b/java/example/pom.xml index a5501502688..23be07b2e74 100644 --- a/java/example/pom.xml +++ b/java/example/pom.xml @@ -5,7 +5,7 @@ io.vitess vitess-parent - 18.0.3-SNAPSHOT + 18.0.3 vitess-example diff --git a/java/grpc-client/pom.xml b/java/grpc-client/pom.xml index 780bb4c3b73..ff1881a3d4f 100644 --- a/java/grpc-client/pom.xml +++ b/java/grpc-client/pom.xml @@ -5,7 +5,7 @@ io.vitess vitess-parent - 18.0.3-SNAPSHOT + 18.0.3 vitess-grpc-client diff --git a/java/jdbc/pom.xml b/java/jdbc/pom.xml index c57d1a7798b..ead8bd51d77 100644 --- a/java/jdbc/pom.xml +++ b/java/jdbc/pom.xml @@ -5,7 +5,7 @@ io.vitess vitess-parent - 18.0.3-SNAPSHOT + 18.0.3 vitess-jdbc diff --git a/java/pom.xml b/java/pom.xml index d44830ae5a3..1039fa61341 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -11,7 +11,7 @@ io.vitess vitess-parent - 18.0.3-SNAPSHOT + 18.0.3 pom Vitess Java Client libraries [Parent]