Remove mysql parameters from VTOrc setup (#16996)

Signed-off-by: Manan Gupta <[email protected]>
vitessio · Oct 22, 2024 · e598a87 · e598a87
1 parent ba129c7
commit e598a87
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 24 deletions.
diff --git a/config/vtorc/default.json b/config/vtorc/default.json
@@ -1,8 +1,4 @@
 {
   "Debug": true,
-  "MySQLTopologyUser": "orc_client_user",
-  "MySQLTopologyPassword": "orc_client_user_password",
-  "MySQLReplicaUser": "vt_repl",
-  "MySQLReplicaPassword": "",
   "RecoveryPeriodBlockSeconds": 5
 }
diff --git a/examples/common/vtorc/config.json b/examples/common/vtorc/config.json
@@ -1,8 +1,4 @@
 {
-  "MySQLTopologyUser": "orc_client_user",
-  "MySQLTopologyPassword": "orc_client_user_password",
-  "MySQLReplicaUser": "vt_repl",
-  "MySQLReplicaPassword": "",
   "RecoveryPeriodBlockSeconds": 1,
   "InstancePollSeconds": 1
 }
diff --git a/examples/compose/vtorc-up.sh b/examples/compose/vtorc-up.sh
@@ -27,10 +27,6 @@ if [ $external = 1 ] ; then
     # This can be overridden by passing VTORC_CONFIG env variable
     echo "Updating $config..."
     cp /vt/vtorc/default.json /vt/vtorc/tmp.json
-    sed  -i '/MySQLTopologyUser/c\  \"MySQLTopologyUser\" : \"'"$DB_USER"'\",' /vt/vtorc/tmp.json
-    sed  -i '/MySQLTopologyPassword/c\  \"MySQLTopologyPassword\" : \"'"$DB_PASS"'\",' /vt/vtorc/tmp.json
-    sed  -i '/MySQLReplicaUser/c\  \"MySQLReplicaUser\" : \"'"$DB_USER"'\",' /vt/vtorc/tmp.json
-    sed  -i '/MySQLReplicaPassword/c\  \"MySQLReplicaPassword\" : \"'"$DB_PASS"'\",' /vt/vtorc/tmp.json
     cat /vt/vtorc/tmp.json
     cp /vt/vtorc/tmp.json /vt/vtorc/config.json
 else

diff --git a/examples/compose/vtorc/default.json b/examples/compose/vtorc/default.json
@@ -1,10 +1,6 @@
 {
   "Debug": true,
   "EnableSyslog": false,
-  "MySQLTopologyUser": "orc_client_user",
-  "MySQLTopologyPassword": "orc_client_user_password",
-  "MySQLReplicaUser": "vt_repl",
-  "MySQLReplicaPassword": "",
   "BackendDB": "sqlite",
   "SQLite3DataFile": "/tmp/vtorc.sqlite3",
   "RecoverMasterClusterFilters": ["*"],

diff --git a/go/test/endtoend/cluster/vtorc_process.go b/go/test/endtoend/cluster/vtorc_process.go
@@ -51,10 +51,6 @@ type VTOrcProcess struct {
 type VTOrcConfiguration struct {
 	Debug                                 bool
 	ListenAddress                         string
-	MySQLTopologyUser                     string
-	MySQLTopologyPassword                 string
-	MySQLReplicaUser                      string
-	MySQLReplicaPassword                  string
 	RecoveryPeriodBlockSeconds            int
 	TopologyRefreshSeconds                int    `json:",omitempty"`
 	PreventCrossDataCenterPrimaryFailover bool   `json:",omitempty"`
@@ -71,10 +67,6 @@ func (config *VTOrcConfiguration) ToJSONString() string {
 
 func (config *VTOrcConfiguration) AddDefaults(webPort int) {
 	config.Debug = true
-	config.MySQLTopologyUser = "orc_client_user"
-	config.MySQLTopologyPassword = "orc_client_user_password"
-	config.MySQLReplicaUser = "vt_repl"
-	config.MySQLReplicaPassword = ""
 	if config.RecoveryPeriodBlockSeconds == 0 {
 		config.RecoveryPeriodBlockSeconds = 1
 	}