luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

chore(ci): fix compat ent compat tests for sidecars and gateways (#15997)

This commit is contained in:
Dan Stough 2023-01-17 17:16:55 -05:00 committed by GitHub
parent 3fe381b507
commit dbe9d26962
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/integration/consul-container/libs/service/assets/Dockerfile-consul-envoy
View File

@ -1,7 +1,8 @@
# Note this arg has to be before the first FROM
# Note these args have to be before the first FROM
ARG CONSUL_IMAGE
ARG ENVOY_VERSION
FROM consul:local as consul
FROM ${CONSUL_IMAGE} as consul
FROM docker.mirror.hashicorp.services/envoyproxy/envoy:v${ENVOY_VERSION}
COPY --from=consul /bin/consul /bin/consul

2
test/integration/consul-container/libs/service/connect.go
View File

@ -79,8 +79,10 @@ func NewConnectService(ctx context.Context, name string, serviceName string, ser
containerName := utils.RandName(namePrefix)
envoyVersion := getEnvoyVersion()
agentConfig := node.GetConfig()
buildargs := map[string]*string{
"ENVOY_VERSION": utils.StringToPointer(envoyVersion),
"CONSUL_IMAGE": utils.StringToPointer(agentConfig.DockerImage()),
}
dockerfileCtx, err := getDevContainerDockerfile()

2
test/integration/consul-container/libs/service/gateway.go
View File

@ -74,8 +74,10 @@ func NewGatewayService(ctx context.Context, name string, kind string, node libcl
containerName := utils.RandName(namePrefix)
envoyVersion := getEnvoyVersion()
agentConfig := node.GetConfig()
buildargs := map[string]*string{
"ENVOY_VERSION": utils.StringToPointer(envoyVersion),
"CONSUL_IMAGE": utils.StringToPointer(agentConfig.DockerImage()),
}
dockerfileCtx, err := getDevContainerDockerfile()