From 5a668772d3c06a90d2c447cb50db3e50d4dc5cce Mon Sep 17 00:00:00 2001 From: Brendan Dougherty Date: Thu, 29 Aug 2024 18:07:54 -0400 Subject: [PATCH] Release commit for 18.0.5-shopify-4 Signed-off-by: Brendan Dougherty --- 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 +- 14 files changed, 79 insertions(+), 79 deletions(-) diff --git a/examples/compose/docker-compose.beginners.yml b/examples/compose/docker-compose.beginners.yml index 0bc54f0e0cb..9cacd4c95fc 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.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 ports: - "15000:$WEB_PORT" - "$GRPC_PORT" @@ -81,7 +81,7 @@ services: condition: service_healthy vtgate: - image: vitess/lite:v18.0.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 ports: - "15099:$WEB_PORT" - "$GRPC_PORT" @@ -111,7 +111,7 @@ services: condition: service_healthy schemaload: - image: vitess/lite:v18.0.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 command: - sh - -c @@ -144,12 +144,12 @@ services: environment: - KEYSPACES=$KEYSPACE - GRPC_PORT=15999 - image: vitess/lite:v18.0.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 volumes: - .:/script vttablet100: - image: vitess/lite:v18.0.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 ports: - "15100:$WEB_PORT" - "$GRPC_PORT" @@ -181,7 +181,7 @@ services: retries: 15 vttablet101: - image: vitess/lite:v18.0.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 ports: - "15101:$WEB_PORT" - "$GRPC_PORT" @@ -213,7 +213,7 @@ services: retries: 15 vttablet102: - image: vitess/lite:v18.0.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 ports: - "15102:$WEB_PORT" - "$GRPC_PORT" @@ -245,7 +245,7 @@ services: retries: 15 vttablet103: - image: vitess/lite:v18.0.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 ports: - "15103:$WEB_PORT" - "$GRPC_PORT" @@ -277,7 +277,7 @@ services: retries: 15 vtorc: - image: vitess/lite:v18.0.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 command: ["sh", "-c", "/script/vtorc-up.sh"] depends_on: - vtctld @@ -307,7 +307,7 @@ services: retries: 15 vreplication: - image: vitess/lite:v18.0.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 volumes: - ".:/script" environment: diff --git a/examples/compose/docker-compose.yml b/examples/compose/docker-compose.yml index ce86d1d614a..1e7914424f1 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.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 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.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 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.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 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.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 volumes: - .:/script vtctld: @@ -143,7 +143,7 @@ services: depends_on: external_db_host: condition: service_healthy - image: vitess/lite:v18.0.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 ports: - 15000:8080 - "15999" @@ -160,7 +160,7 @@ services: --normalize_queries=true ' depends_on: - vtctld - image: vitess/lite:v18.0.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 ports: - 15099:8080 - "15999" @@ -182,7 +182,7 @@ services: - EXTERNAL_DB=0 - DB_USER= - DB_PASS= - image: vitess/lite:v18.0.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 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.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 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.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 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.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 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.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 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.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 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.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 ports: - 15302:8080 - "15999" diff --git a/examples/compose/vtcompose/docker-compose.test.yml b/examples/compose/vtcompose/docker-compose.test.yml index 3162fa96cd3..11300c59975 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.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 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.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 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.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 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.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 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.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 volumes: - .:/script vtctld: @@ -159,7 +159,7 @@ services: depends_on: external_db_host: condition: service_healthy - image: vitess/lite:v18.0.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 ports: - 15000:8080 - "15999" @@ -176,7 +176,7 @@ services: ''grpc-vtgateservice'' --normalize_queries=true ' depends_on: - vtctld - image: vitess/lite:v18.0.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 ports: - 15099:8080 - "15999" @@ -199,7 +199,7 @@ services: - EXTERNAL_DB=0 - DB_USER= - DB_PASS= - image: vitess/lite:v18.0.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 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.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 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.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 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.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 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.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 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.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 ports: - 15301:8080 - "15999" diff --git a/examples/compose/vtcompose/vtcompose.go b/examples/compose/vtcompose/vtcompose.go index e0fde0fad28..62d8116b256 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.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 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.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 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.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 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.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 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.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 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.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 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.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 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.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 volumes: - ".:/script" environment: @@ -828,7 +828,7 @@ func generateSchemaload( - op: add path: /services/schemaload_%[7]s value: - image: vitess/lite:v18.0.5-shopify-3 + image: vitess/lite:v18.0.5-shopify-4 volumes: - ".:/script" environment: diff --git a/examples/operator/101_initial_cluster.yaml b/examples/operator/101_initial_cluster.yaml index 337819498ea..8ba575d9f2f 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.5-shopify-3 - vtadmin: vitess/vtadmin:v18.0.5-shopify-3 - vtgate: vitess/lite:v18.0.5-shopify-3 - vttablet: vitess/lite:v18.0.5-shopify-3 - vtbackup: vitess/lite:v18.0.5-shopify-3 - vtorc: vitess/lite:v18.0.5-shopify-3 + vtctld: vitess/lite:v18.0.5-shopify-4 + vtadmin: vitess/vtadmin:v18.0.5-shopify-4 + vtgate: vitess/lite:v18.0.5-shopify-4 + vttablet: vitess/lite:v18.0.5-shopify-4 + vtbackup: vitess/lite:v18.0.5-shopify-4 + vtorc: vitess/lite:v18.0.5-shopify-4 mysqld: - mysql80Compatible: vitess/lite:v18.0.5-shopify-3 + mysql80Compatible: vitess/lite:v18.0.5-shopify-4 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 d38a0896f9d..593c59bc86f 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.5-shopify-3 - vtadmin: vitess/vtadmin:v18.0.5-shopify-3 - vtgate: vitess/lite:v18.0.5-shopify-3 - vttablet: vitess/lite:v18.0.5-shopify-3 - vtbackup: vitess/lite:v18.0.5-shopify-3 - vtorc: vitess/lite:v18.0.5-shopify-3 + vtctld: vitess/lite:v18.0.5-shopify-4 + vtadmin: vitess/vtadmin:v18.0.5-shopify-4 + vtgate: vitess/lite:v18.0.5-shopify-4 + vttablet: vitess/lite:v18.0.5-shopify-4 + vtbackup: vitess/lite:v18.0.5-shopify-4 + vtorc: vitess/lite:v18.0.5-shopify-4 mysqld: - mysql80Compatible: vitess/lite:v18.0.5-shopify-3 + mysql80Compatible: vitess/lite:v18.0.5-shopify-4 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 6807438e4c5..da58129bd48 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.5-shopify-3 - vtadmin: vitess/vtadmin:v18.0.5-shopify-3 - vtgate: vitess/lite:v18.0.5-shopify-3 - vttablet: vitess/lite:v18.0.5-shopify-3 - vtbackup: vitess/lite:v18.0.5-shopify-3 - vtorc: vitess/lite:v18.0.5-shopify-3 + vtctld: vitess/lite:v18.0.5-shopify-4 + vtadmin: vitess/vtadmin:v18.0.5-shopify-4 + vtgate: vitess/lite:v18.0.5-shopify-4 + vttablet: vitess/lite:v18.0.5-shopify-4 + vtbackup: vitess/lite:v18.0.5-shopify-4 + vtorc: vitess/lite:v18.0.5-shopify-4 mysqld: - mysql80Compatible: vitess/lite:v18.0.5-shopify-3 + mysql80Compatible: vitess/lite:v18.0.5-shopify-4 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 a79aa40de34..7e4fb04b025 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.5-shopify-3 - vtadmin: vitess/vtadmin:v18.0.5-shopify-3 - vtgate: vitess/lite:v18.0.5-shopify-3 - vttablet: vitess/lite:v18.0.5-shopify-3 - vtbackup: vitess/lite:v18.0.5-shopify-3 - vtorc: vitess/lite:v18.0.5-shopify-3 + vtctld: vitess/lite:v18.0.5-shopify-4 + vtadmin: vitess/vtadmin:v18.0.5-shopify-4 + vtgate: vitess/lite:v18.0.5-shopify-4 + vttablet: vitess/lite:v18.0.5-shopify-4 + vtbackup: vitess/lite:v18.0.5-shopify-4 + vtorc: vitess/lite:v18.0.5-shopify-4 mysqld: - mysql80Compatible: vitess/lite:v18.0.5-shopify-3 + mysql80Compatible: vitess/lite:v18.0.5-shopify-4 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 33158481618..9bb61e03525 100644 --- a/go/vt/servenv/version.go +++ b/go/vt/servenv/version.go @@ -19,4 +19,4 @@ package servenv // THIS FILE IS AUTO-GENERATED DURING NEW RELEASES BY ./tools/do_releases.sh // DO NOT EDIT -const versionName = "18.0.5-shopify-3" +const versionName = "18.0.5-shopify-4" diff --git a/java/client/pom.xml b/java/client/pom.xml index 8cf632389ba..516382f93dc 100644 --- a/java/client/pom.xml +++ b/java/client/pom.xml @@ -5,7 +5,7 @@ io.vitess vitess-parent - 18.0.5-shopify-3 + 18.0.5-shopify-4 vitess-client diff --git a/java/example/pom.xml b/java/example/pom.xml index 5d264be537e..affb61263e9 100644 --- a/java/example/pom.xml +++ b/java/example/pom.xml @@ -5,7 +5,7 @@ io.vitess vitess-parent - 18.0.5-shopify-3 + 18.0.5-shopify-4 vitess-example diff --git a/java/grpc-client/pom.xml b/java/grpc-client/pom.xml index 52228ce030c..e67e34e730a 100644 --- a/java/grpc-client/pom.xml +++ b/java/grpc-client/pom.xml @@ -5,7 +5,7 @@ io.vitess vitess-parent - 18.0.5-shopify-3 + 18.0.5-shopify-4 vitess-grpc-client diff --git a/java/jdbc/pom.xml b/java/jdbc/pom.xml index d28d413338c..77428b8169f 100644 --- a/java/jdbc/pom.xml +++ b/java/jdbc/pom.xml @@ -5,7 +5,7 @@ io.vitess vitess-parent - 18.0.5-shopify-3 + 18.0.5-shopify-4 vitess-jdbc diff --git a/java/pom.xml b/java/pom.xml index ce476669244..8c352753ec0 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -11,7 +11,7 @@ io.vitess vitess-parent - 18.0.5-shopify-3 + 18.0.5-shopify-4 pom Vitess Java Client libraries [Parent]