Skip to content

Commit 8ea4d7c

Browse files
committed
Revert killgrave
1 parent 289e09e commit 8ea4d7c

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

k8s-test-runner/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ require (
5959
github.com/modern-go/reflect2 v1.0.2 // indirect
6060
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6161
github.com/spf13/pflag v1.0.5 // indirect
62-
golang.org/x/crypto v0.32.0 // indirect
6362
github.com/x448/float16 v0.8.4 // indirect
63+
golang.org/x/crypto v0.32.0 // indirect
6464
golang.org/x/oauth2 v0.21.0 // indirect
6565
golang.org/x/sys v0.29.0 // indirect
6666
golang.org/x/term v0.28.0 // indirect

lib/docker/test_env/killgrave.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
tc "github.com/testcontainers/testcontainers-go"
2020
"github.com/testcontainers/testcontainers-go/wait"
2121

22+
"github.com/smartcontractkit/chainlink-testing-framework/lib/k8s/config"
2223
"github.com/smartcontractkit/chainlink-testing-framework/lib/logging"
2324
"github.com/smartcontractkit/chainlink-testing-framework/lib/utils/testcontext"
2425
)
@@ -153,8 +154,14 @@ func (k *Killgrave) StartContainer() error {
153154
}
154155

155156
func (k *Killgrave) getContainerRequest() (tc.ContainerRequest, error) {
156-
// TT-1290 Temporary work around using fork of killgrave, uncomment line below when fork is merged
157+
// killgraveImage := mirror.AddMirrorToImageIfSet(defaultKillgraveImage)
158+
// TT-1290 Temporary code to set image to the fork or the ecr mirror depending on the config
157159
killgraveImage := "tateexon/killgrave:v0.5.1-request-dump"
160+
ecr := os.Getenv(config.EnvVarInternalDockerRepo)
161+
if ecr != "" {
162+
killgraveImage = fmt.Sprintf("%s/%s", ecr, defaultKillgraveImage)
163+
}
164+
// end temporary code
158165

159166
return tc.ContainerRequest{
160167
Name: k.ContainerName,

0 commit comments

Comments
 (0)