slack-19.0: update slackhq/vitess-addons to v0.19.3 (#537)

* `slack-19.0`: update `slackhq/vitess-addons` to `v0.19.3` Signed-off-by: Tim Vaillancourt <[email protected]> * fix typo Signed-off-by: Tim Vaillancourt <[email protected]> * gofmt Signed-off-by: Tim Vaillancourt <[email protected]> --------- Signed-off-by: Tim Vaillancourt <[email protected]>
slackhq · Oct 18, 2024 · 33a4559 · 33a4559
1 parent 3ead23e
commit 33a4559
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/go.mod b/go.mod
@@ -102,7 +102,7 @@ require (
 	github.com/kr/text v0.2.0
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/nsf/jsondiff v0.0.0-20210926074059-1e845ec5d249
-	github.com/slackhq/vitess-addons v0.19.2
+	github.com/slackhq/vitess-addons v0.19.3
 	github.com/slok/noglog v0.2.0
 	github.com/spf13/afero v1.11.0
 	github.com/spf13/jwalterweatherman v1.1.0

diff --git a/go.sum b/go.sum
@@ -450,8 +450,8 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sjmudd/stopwatch v0.1.1 h1:x45OvxFB5OtCkjvYtzRF5fWB857Jzjjk84Oyd5C5ebw=
 github.com/sjmudd/stopwatch v0.1.1/go.mod h1:BLw0oIQJ1YLXBO/q9ufK/SgnKBVIkC2qrm6uy78Zw6U=
-github.com/slackhq/vitess-addons v0.19.2 h1:ZNO7a9yulqU3ZBWYKcvwFbS/CtHpB3ckOIFw1U2Vw3Y=
-github.com/slackhq/vitess-addons v0.19.2/go.mod h1:4/vOK9XgBM0Feij9q48UT7D+n2R4E9HZp0V0aZy7Q5M=
+github.com/slackhq/vitess-addons v0.19.3 h1:/4fBzItHg5mZmab0yG0q/5W9eZG8I5rXddhlwHGZupA=
+github.com/slackhq/vitess-addons v0.19.3/go.mod h1:4/vOK9XgBM0Feij9q48UT7D+n2R4E9HZp0V0aZy7Q5M=
 github.com/slok/noglog v0.2.0 h1:1czu4l2EoJ8L92UwdSXXa1Y+c5TIjFAFm2P+mjej95E=
 github.com/slok/noglog v0.2.0/go.mod h1:TfKxwpEZPT+UA83bQ6RME146k0MM4e8mwHLf6bhcGDI=
 github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=

diff --git a/go/vt/vtorc/logic/topology_recovery.go b/go/vt/vtorc/logic/topology_recovery.go
@@ -84,7 +84,9 @@ var (
 	// recoveriesFailureCounter counts the number of failed recoveries that VTOrc has performed
 	recoveriesFailureCounter = stats.NewCountersWithSingleLabel("FailedRecoveries", "Count of the different failed recoveries performed", "RecoveryType", actionableRecoveriesNames...)
 
-	vtopsExec         = external.NewExecVTOps(os.Getenv("VTOPS_PATH"), os.Getenv("VTOPS_HTTP_PROXY"), "vtorc", os.Getenv("HOSTNAME"))
+	// vtops
+	vtopsService      = fmt.Sprintf("%s-%s-%s", os.Getenv("BEDROCK_CONTAINER_NAME"), os.Getenv("POOL"), os.Getenv("VITESS_ENVIRONMENT"))
+	vtopsExec         = external.NewExecVTOps(os.Getenv("VTOPS_PATH"), os.Getenv("VTOPS_HTTP_PROXY"), vtopsService, os.Getenv("HOSTNAME"))
 	vtopsSlackChannel = os.Getenv("SLACK_CHANNEL")
 )