From aa92d9acb8d16d2d241470e9dd83c41c48f6203b Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Fri, 29 Sep 2023 10:17:16 -0600 Subject: [PATCH] remove --vtctld_addr usages as it is deprecated Signed-off-by: Florent Poinsard --- examples/common/scripts/vttablet-up.sh | 1 - examples/compose/vttablet-up.sh | 1 - go/test/endtoend/cluster/vttablet_process.go | 2 -- vitess-mixin/e2e/vttablet-up.sh | 1 - 4 files changed, 5 deletions(-) diff --git a/examples/common/scripts/vttablet-up.sh b/examples/common/scripts/vttablet-up.sh index e1437992e10..951eaeff6dd 100755 --- a/examples/common/scripts/vttablet-up.sh +++ b/examples/common/scripts/vttablet-up.sh @@ -53,7 +53,6 @@ vttablet \ --grpc_port $grpc_port \ --service_map 'grpc-queryservice,grpc-tabletmanager,grpc-updatestream' \ --pid_file $VTDATAROOT/$tablet_dir/vttablet.pid \ - --vtctld_addr http://$hostname:$vtctld_web_port/ \ --heartbeat_enable --heartbeat_interval=250ms --heartbeat_on_demand_duration=5s \ > $VTDATAROOT/$tablet_dir/vttablet.out 2>&1 & diff --git a/examples/compose/vttablet-up.sh b/examples/compose/vttablet-up.sh index a4bf31a5c42..f41b31f025c 100755 --- a/examples/compose/vttablet-up.sh +++ b/examples/compose/vttablet-up.sh @@ -154,7 +154,6 @@ exec $VTROOT/bin/vttablet \ --port $web_port \ --grpc_port $grpc_port \ --service_map 'grpc-queryservice,grpc-tabletmanager,grpc-updatestream' \ - --vtctld_addr "http://vtctld:$WEB_PORT/" \ --init_keyspace $keyspace \ --init_shard $shard \ --backup_storage_implementation file \ diff --git a/go/test/endtoend/cluster/vttablet_process.go b/go/test/endtoend/cluster/vttablet_process.go index 96d6dd04ef0..f9f83f6b295 100644 --- a/go/test/endtoend/cluster/vttablet_process.go +++ b/go/test/endtoend/cluster/vttablet_process.go @@ -108,8 +108,6 @@ func (vttablet *VttabletProcess) Setup() (err error) { "--backup_storage_implementation", vttablet.BackupStorageImplementation, "--file_backup_storage_root", vttablet.FileBackupStorageRoot, "--service_map", vttablet.ServiceMap, - "--vtctld_addr", vttablet.VtctldAddress, - "--vtctld_addr", vttablet.VtctldAddress, "--vreplication_tablet_type", vttablet.VreplicationTabletType, "--db_charset", vttablet.Charset, ) diff --git a/vitess-mixin/e2e/vttablet-up.sh b/vitess-mixin/e2e/vttablet-up.sh index a4bf31a5c42..f41b31f025c 100755 --- a/vitess-mixin/e2e/vttablet-up.sh +++ b/vitess-mixin/e2e/vttablet-up.sh @@ -154,7 +154,6 @@ exec $VTROOT/bin/vttablet \ --port $web_port \ --grpc_port $grpc_port \ --service_map 'grpc-queryservice,grpc-tabletmanager,grpc-updatestream' \ - --vtctld_addr "http://vtctld:$WEB_PORT/" \ --init_keyspace $keyspace \ --init_shard $shard \ --backup_storage_implementation file \