github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[CONSUL-399] Update envoy to 1.23.1 (#78)

Browse Source
pull/15235/head
Ezequiel Fernández Ponce 2 years ago committed by Jose Ignacio Lorenzo
parent 0d2b19a8c7
commit 0db9f4564a
6 changed files with 178 additions and 118 deletions
Show Stats Download Patch File Download Diff File

2
build-support-windows/build-consul-dev-image.sh
Unescape View File

@ -4,7 +4,7 @@ cd ../
rm -rf dist
export GOOS=windows GOARCH=amd64
VERSION=1.13.1
VERSION=1.13.2
CONSUL_BUILDDATE=$(date +"%Y-%m-%dT%H:%M:%SZ")
GIT_IMPORT=github.com/hashicorp/consul/version
GOLDFLAGS=" -X $GIT_IMPORT.Version=$VERSION -X $GIT_IMPORT.VersionPrerelease=dev -X $GIT_IMPORT.BuildDate=$CONSUL_BUILDDATE "

4
build-support-windows/build-consul-local-images.sh
Unescape View File

@ -2,12 +2,12 @@
readonly HASHICORP_DOCKER_PROXY="docker.mirror.hashicorp.services"
# Build Consul Version 1.13.1 / 1.12.4 / 1.11.8
# Build Consul Version 1.13.2 / 1.12.4 / 1.11.8
VERSION=${VERSION:-"1.13.2"}
export VERSION
# Build Windows Envoy Version 1.23.1 / 1.21.4 / 1.19.5
ENVOY_VERSION=${ENVOY_VERSION:-"1.21.4"}
ENVOY_VERSION=${ENVOY_VERSION:-"1.23.1"}
export ENVOY_VERSION
echo "Building Images"

216
execute_windows_tests.sh
Unescape View File

@ -1,170 +1,238 @@
#!/usr/bin/env bash
SET=${1:-all}
SET=${1:-unique}
XDS_TARGET=${2:-server}
echo "Started tests from Set $SET"
echo "Started tests from Set $SET and XDS_TARGET $XDS_TARGET"
mkdir test/integration/connect/envoy/results/ -p
if [ $SET == 0 ]
then
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-badauthz" -win=true > test/integration/connect/envoy/results/case-badauthz.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-badauthz" -win=true > test/integration/connect/envoy/results/case-badauthz.log
echo "Completed 33%"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-basic" -win=true > test/integration/connect/envoy/results/case-basic.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-basic" -win=true > test/integration/connect/envoy/results/case-basic.log
echo "Completed 66%"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-centralconf" -win=true > test/integration/connect/envoy/results/case-centralconf.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-centralconf" -win=true > test/integration/connect/envoy/results/case-centralconf.log
echo "Completed 100%"
elif [ $SET == 1 ]
then
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-consul-exec" -win=true > test/integration/connect/envoy/results/case-consul-exec.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-consul-exec" -win=true > test/integration/connect/envoy/results/case-consul-exec.log
echo "Completed 20%"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-expose-checks" -win=true > test/integration/connect/envoy/results/case-expose-checks.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-expose-checks" -win=true > test/integration/connect/envoy/results/case-expose-checks.log
echo "Completed 40%"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-I7-intentions" -win=true > test/integration/connect/envoy/results/case-I7-intentions.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-I7-intentions" -win=true > test/integration/connect/envoy/results/case-I7-intentions.log
echo "Completed 60%"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-prometheus" -win=true > test/integration/connect/envoy/results/case-prometheus.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-prometheus" -win=true > test/integration/connect/envoy/results/case-prometheus.log
echo "Completed 80%"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-upstream-config" -win=true > test/integration/connect/envoy/results/case-upstream-config.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-upstream-config" -win=true > test/integration/connect/envoy/results/case-upstream-config.log
echo "Completed 100%"
elif [ $SET == 2 ]
then
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-zipkin" -win=true > test/integration/connect/envoy/results/case-zipkin.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-zipkin" -win=true > test/integration/connect/envoy/results/case-zipkin.log
echo "Completed 10%"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-defaultsubset" -win=true > test/integration/connect/envoy/results/case-cfg-resolver-defaultsubset.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-defaultsubset" -win=true > test/integration/connect/envoy/results/case-cfg-resolver-defaultsubset.log
echo "Completed 20%"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-features" -win=true > test/integration/connect/envoy/results/case-cfg-resolver-features.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-features" -win=true > test/integration/connect/envoy/results/case-cfg-resolver-features.log
echo "Completed 30%"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-subset-onlypassing" -win=true > test/integration/connect/envoy/results/case-cfg-resolver-subset-onlypassing.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-subset-onlypassing" -win=true > test/integration/connect/envoy/results/case-cfg-resolver-subset-onlypassing.log
echo "Completed 40%"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-subset-redirect" -win=true > test/integration/connect/envoy/results/case-cfg-resolver-subset-redirect.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-subset-redirect" -win=true > test/integration/connect/envoy/results/case-cfg-resolver-subset-redirect.log
echo "Completed 50%"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-svc-failover" -win=true > test/integration/connect/envoy/results/case-cfg-resolver-svc-failover.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-svc-failover" -win=true > test/integration/connect/envoy/results/case-cfg-resolver-svc-failover.log
echo "Completed 60%"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-svc-redirect-http" -win=true > test/integration/connect/envoy/results/case-cfg-resolver-svc-redirect-http.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-svc-redirect-http" -win=true > test/integration/connect/envoy/results/case-cfg-resolver-svc-redirect-http.log
echo "Completed 70%"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-svc-redirect-tcp" -win=true > test/integration/connect/envoy/results/case-cfg-resolver-svc-redirect-tcp.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-svc-redirect-tcp" -win=true > test/integration/connect/envoy/results/case-cfg-resolver-svc-redirect-tcp.log
echo "Completed 80%"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-router-features" -win=true > test/integration/connect/envoy/results/case-cfg-router-features.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-router-features" -win=true > test/integration/connect/envoy/results/case-cfg-router-features.log
echo "Completed 90%"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-splitter-features" -win=true > test/integration/connect/envoy/results/case-cfg-splitter-features.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-splitter-features" -win=true > test/integration/connect/envoy/results/case-cfg-splitter-features.log
echo "Completed 100%"
elif [ $SET == 3 ]
then
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-ingress-gateway-grpc" -win=true > test/integration/connect/envoy/results/case-ingress-gateway-grpc.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-ingress-gateway-grpc" -win=true > test/integration/connect/envoy/results/case-ingress-gateway-grpc.log
echo "Completed 16%"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-ingress-gateway-http" -win=true > test/integration/connect/envoy/results/case-ingress-gateway-http.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-ingress-gateway-http" -win=true > test/integration/connect/envoy/results/case-ingress-gateway-http.log
echo "Completed 32%"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-ingress-gateway-multiple-services" -win=true > test/integration/connect/envoy/results/case-ingress-gateway-multiple-services.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-ingress-gateway-multiple-services" -win=true > test/integration/connect/envoy/results/case-ingress-gateway-multiple-services.log
echo "Completed 48%"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-ingress-gateway-sds" -win=true > test/integration/connect/envoy/results/case-ingress-gateway-sds.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-ingress-gateway-sds" -win=true > test/integration/connect/envoy/results/case-ingress-gateway-sds.log
echo "Completed 66%"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-ingress-gateway-simple" -win=true > test/integration/connect/envoy/results/case-ingress-gateway-simple.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-ingress-gateway-simple" -win=true > test/integration/connect/envoy/results/case-ingress-gateway-simple.log
echo "Completed 83%"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-ingress-gateway-tls" -win=true > test/integration/connect/envoy/results/case-ingress-gateway-tls.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-ingress-gateway-tls" -win=true > test/integration/connect/envoy/results/case-ingress-gateway-tls.log
echo "Completed 100%"
elif [ $SET == 4 ]
then
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-gateway-without-services" -win=true > test/integration/connect/envoy/results/case-gateway-without-services.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-gateway-without-services" -win=true > test/integration/connect/envoy/results/case-gateway-without-services.log
echo "Completed 20%"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-terminating-gateway-hostnames" -win=true > test/integration/connect/envoy/results/case-terminating-gateway-hostnames.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-terminating-gateway-hostnames" -win=true > test/integration/connect/envoy/results/case-terminating-gateway-hostnames.log
echo "Completed 40%"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-terminating-gateway-simple" -win=true > test/integration/connect/envoy/results/case-terminating-gateway-simple.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-terminating-gateway-simple" -win=true > test/integration/connect/envoy/results/case-terminating-gateway-simple.log
echo "Completed 60%"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-terminating-gateway-subsets" -win=true > test/integration/connect/envoy/results/case-terminating-gateway-subsets.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-terminating-gateway-subsets" -win=true > test/integration/connect/envoy/results/case-terminating-gateway-subsets.log
echo "Completed 80%"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-terminating-gateway-without-services" -win=true > test/integration/connect/envoy/results/case-terminating-gateway-without-services.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-terminating-gateway-without-services" -win=true > test/integration/connect/envoy/results/case-terminating-gateway-without-services.log
echo "Completed 100%"
elif [ $SET == 5 ]
then
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-dogstatsd-udp" -win=true > test/integration/connect/envoy/results/case-dogstatsd-udp.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-dogstatsd-udp" -win=true > test/integration/connect/envoy/results/case-dogstatsd-udp.log
echo "Completed 16%"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-grpc" -win=true > test/integration/connect/envoy/results/case-grpc.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-grpc" -win=true > test/integration/connect/envoy/results/case-grpc.log
echo "Completed 32%"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-http" -win=true > test/integration/connect/envoy/results/case-http.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-http$" -win=true > test/integration/connect/envoy/results/case-http.log
echo "Completed 48%"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-http-badauthz" -win=true > test/integration/connect/envoy/results/case-http-badauthz.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-http-badauthz" -win=true > test/integration/connect/envoy/results/case-http-badauthz.log
echo "Completed 66%"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-statsd-udp" -win=true > test/integration/connect/envoy/results/case-statsd-udp.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-statsd-udp" -win=true > test/integration/connect/envoy/results/case-statsd-udp.log
echo "Completed 83%"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-stats-proxy" -win=true > test/integration/connect/envoy/results/case-stats-proxy.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-stats-proxy" -win=true > test/integration/connect/envoy/results/case-stats-proxy.log
echo "Completed 100%"
else
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-badauthz" -win=true > test/integration/connect/envoy/results/case-badauthz.log
elif [ $SET == 6 ]
then
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-cluster-peering-failover" -win=true > test/integration/connect/envoy/results/case-cfg-resolver-cluster-peering-failover.log
echo "Completed 33%"
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-dc-failover-gateways-none" -win=true > test/integration/connect/envoy/results/case-cfg-resolver-dc-failover-gateways-none.log
echo "Completed 66%"
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-dc-failover-gateways-remote" -win=true > test/integration/connect/envoy/results/case-cfg-resolver-dc-failover-gateways-remote.log
echo "Completed 100%"
elif [ $SET == 7 ]
then
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cross-peers" -win=true > test/integration/connect/envoy/results/case-cross-peers.log
echo "Completed 25%"
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cross-peers-http" -win=true > test/integration/connect/envoy/results/case-cross-peers-http.log
echo "Completed 50%"
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cross-peers-http-router" -win=true > test/integration/connect/envoy/results/case-cross-peers-http-router.log
echo "Completed 75%"
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cross-peers-resolver-redirect-tcp" -win=true > test/integration/connect/envoy/results/case-cross-peers-resolver-redirect-tcp.log
echo "Completed 100%"
elif [ $SET == 8 ]
then
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-multidc-rsa-ca" -win=true > test/integration/connect/envoy/results/case-multidc-rsa-ca.log
echo "Completed 50%"
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-wanfed-gw" -win=true > test/integration/connect/envoy/results/case-wanfed-gw.log
echo "Completed 100%"
elif [ $SET == 9 ]
then
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-gateways-local" -win=true > test/integration/connect/envoy/results/case-gateways-local.log
echo "Completed 33%"
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-gateways-remote" -win=true > test/integration/connect/envoy/results/case-gateways-remote.log
echo "Completed 66%"
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-ingress-mesh-gateways-resolver" -win=true > test/integration/connect/envoy/results/case-ingress-mesh-gateways-resolver.log
echo "Completed 100%"
elif [ $SET == "unique" ]
then
echo "Total is 35"
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-badauthz" -win=true > test/integration/connect/envoy/results/case-badauthz.log
echo "Completed 01"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-basic" -win=true > test/integration/connect/envoy/results/case-basic.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-basic" -win=true > test/integration/connect/envoy/results/case-basic.log
echo "Completed 02"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-centralconf" -win=true > test/integration/connect/envoy/results/case-centralconf.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-centralconf" -win=true > test/integration/connect/envoy/results/case-centralconf.log
echo "Completed 03"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-consul-exec" -win=true > test/integration/connect/envoy/results/case-consul-exec.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-defaultsubset" -win=true > test/integration/connect/envoy/results/case-cfg-resolver-defaultsubset.log
echo "Completed 04"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-expose-checks" -win=true > test/integration/connect/envoy/results/case-expose-checks.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-features" -win=true > test/integration/connect/envoy/results/case-cfg-resolver-features.log
echo "Completed 05"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-l7-intentions" -win=true > test/integration/connect/envoy/results/case-l7-intentions.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-subset-onlypassing" -win=true > test/integration/connect/envoy/results/case-cfg-resolver-subset-onlypassing.log
echo "Completed 06"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-prometheus" -win=true > test/integration/connect/envoy/results/case-prometheus.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-subset-redirect" -win=true > test/integration/connect/envoy/results/case-cfg-resolver-subset-redirect.log
echo "Completed 07"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-upstream-config" -win=true > test/integration/connect/envoy/results/case-upstream-config.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-svc-failover" -win=true > test/integration/connect/envoy/results/case-cfg-resolver-svc-failover.log
echo "Completed 08"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-zipkin" -win=true > test/integration/connect/envoy/results/case-zipkin.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-svc-redirect-http" -win=true > test/integration/connect/envoy/results/case-cfg-resolver-svc-redirect-http.log
echo "Completed 09"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-defaultsubset" -win=true > test/integration/connect/envoy/results/case-cfg-resolver-defaultsubset.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-svc-redirect-tcp" -win=true > test/integration/connect/envoy/results/case-cfg-resolver-svc-redirect-tcp.log
echo "Completed 10"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-features" -win=true > test/integration/connect/envoy/results/case-cfg-resolver-features.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-router-features" -win=true > test/integration/connect/envoy/results/case-cfg-router-features.log
echo "Completed 11"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-subset-onlypassing" -win=true > test/integration/connect/envoy/results/case-cfg-resolver-subset-onlypassing.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-splitter-features" -win=true > test/integration/connect/envoy/results/case-cfg-splitter-features.log
echo "Completed 12"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-subset-redirect" -win=true > test/integration/connect/envoy/results/case-cfg-resolver-subset-redirect.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-consul-exec" -win=true > test/integration/connect/envoy/results/case-consul-exec.log
echo "Completed 13"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-svc-failover" -win=true > test/integration/connect/envoy/results/case-cfg-resolver-svc-failover.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-dogstatsd-udp" -win=true > test/integration/connect/envoy/results/case-dogstatsd-udp.log
echo "Completed 14"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-svc-redirect-http" -win=true > test/integration/connect/envoy/results/case-cfg-resolver-svc-redirect-http.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-expose-checks" -win=true > test/integration/connect/envoy/results/case-expose-checks.log
echo "Completed 15"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-svc-redirect-tcp" -win=true > test/integration/connect/envoy/results/case-cfg-resolver-svc-redirect-tcp.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-gateway-without-services" -win=true > test/integration/connect/envoy/results/case-gateway-without-services.log
echo "Completed 16"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-router-features" -win=true > test/integration/connect/envoy/results/case-cfg-router-features.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-grpc" -win=true > test/integration/connect/envoy/results/case-grpc.log
echo "Completed 17"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-splitter-features" -win=true > test/integration/connect/envoy/results/case-cfg-splitter-features.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-http$" -win=true > test/integration/connect/envoy/results/case-http.log
echo "Completed 18"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-ingress-gateway-grpc" -win=true > test/integration/connect/envoy/results/case-ingress-gateway-grpc.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-http-badauthz" -win=true > test/integration/connect/envoy/results/case-http-badauthz.log
echo "Completed 19"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-ingress-gateway-http" -win=true > test/integration/connect/envoy/results/case-ingress-gateway-http.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-ingress-gateway-grpc" -win=true > test/integration/connect/envoy/results/case-ingress-gateway-grpc.log
echo "Completed 20"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-ingress-gateway-multiple-services" -win=true > test/integration/connect/envoy/results/case-ingress-gateway-multiple-services.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-ingress-gateway-http" -win=true > test/integration/connect/envoy/results/case-ingress-gateway-http.log
echo "Completed 21"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-ingress-gateway-sds" -win=true > test/integration/connect/envoy/results/case-ingress-gateway-sds.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-ingress-gateway-multiple-services" -win=true > test/integration/connect/envoy/results/case-ingress-gateway-multiple-services.log
echo "Completed 22"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-ingress-gateway-simple" -win=true > test/integration/connect/envoy/results/case-ingress-gateway-simple.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-ingress-gateway-sds" -win=true > test/integration/connect/envoy/results/case-ingress-gateway-sds.log
echo "Completed 23"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-ingress-gateway-tls" -win=true > test/integration/connect/envoy/results/case-ingress-gateway-tls.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-ingress-gateway-simple" -win=true > test/integration/connect/envoy/results/case-ingress-gateway-simple.log
echo "Completed 24"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-gateway-without-services" -win=true > test/integration/connect/envoy/results/case-gateway-without-services.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-ingress-gateway-tls" -win=true > test/integration/connect/envoy/results/case-ingress-gateway-tls.log
echo "Completed 25"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-terminating-gateway-hostnames" -win=true > test/integration/connect/envoy/results/case-terminating-gateway-hostnames.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-l7-intentions" -win=true > test/integration/connect/envoy/results/case-l7-intentions.log
echo "Completed 26"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-terminating-gateway-simple" -win=true > test/integration/connect/envoy/results/case-terminating-gateway-simple.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-prometheus" -win=true > test/integration/connect/envoy/results/case-prometheus.log
echo "Completed 27"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-terminating-gateway-subsets" -win=true > test/integration/connect/envoy/results/case-terminating-gateway-subsets.log
echo "Completed 28"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-terminating-gateway-without-services" -win=true > test/integration/connect/envoy/results/case-terminating-gateway-without-services.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-statsd-udp" -win=true > test/integration/connect/envoy/results/case-statsd-udp.log
echo "Completed 287"
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-stats-proxy" -win=true > test/integration/connect/envoy/results/case-stats-proxy.log
echo "Completed 29"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-dogstatsd-udp" -win=true > test/integration/connect/envoy/results/case-dogstatsd-udp.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-terminating-gateway-hostnames" -win=true > test/integration/connect/envoy/results/case-terminating-gateway-hostnames.log
echo "Completed 30"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-grpc" -win=true > test/integration/connect/envoy/results/case-grpc.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-terminating-gateway-simple" -win=true > test/integration/connect/envoy/results/case-terminating-gateway-simple.log
echo "Completed 31"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-http" -win=true > test/integration/connect/envoy/results/case-http.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-terminating-gateway-subsets" -win=true > test/integration/connect/envoy/results/case-terminating-gateway-subsets.log
echo "Completed 32"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-http-badauthz" -win=true > test/integration/connect/envoy/results/case-http-badauthz.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-terminating-gateway-without-services" -win=true > test/integration/connect/envoy/results/case-terminating-gateway-without-services.log
echo "Completed 33"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-statsd-udp" -win=true > test/integration/connect/envoy/results/case-statsd-udp.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-upstream-config" -win=true > test/integration/connect/envoy/results/case-upstream-config.log
echo "Completed 34"
go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-stats-proxy" -win=true > test/integration/connect/envoy/results/case-stats-proxy.log
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-zipkin" -win=true > test/integration/connect/envoy/results/case-zipkin.log
echo "Completed 35"
elif [ $SET == "multi" ]
then
echo "Total is 12"
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-cluster-peering-failover" -win=true > test/integration/connect/envoy/results/case-cfg-resolver-cluster-peering-failover.log
echo "Completed 1"
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-dc-failover-gateways-none" -win=true > test/integration/connect/envoy/results/case-cfg-resolver-dc-failover-gateways-none.log
echo "Completed 2"
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-dc-failover-gateways-remote" -win=true > test/integration/connect/envoy/results/case-cfg-resolver-dc-failover-gateways-remote.log
echo "Completed 3"
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cross-peers" -win=true > test/integration/connect/envoy/results/case-cross-peers.log
echo "Completed 4"
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cross-peers-http" -win=true > test/integration/connect/envoy/results/case-cross-peers-http.log
echo "Completed 5"
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cross-peers-http-router" -win=true > test/integration/connect/envoy/results/case-cross-peers-http-router.log
echo "Completed 6"
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-cross-peers-resolver-redirect-tcp" -win=true > test/integration/connect/envoy/results/case-cross-peers-resolver-redirect-tcp.log
echo "Completed 7"
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-gateways-local" -win=true > test/integration/connect/envoy/results/case-gateways-local.log
echo "Completed 8"
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-gateways-remote" -win=true > test/integration/connect/envoy/results/case-gateways-remote.log
echo "Completed 9"
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-ingress-mesh-gateways-resolver" -win=true > test/integration/connect/envoy/results/case-ingress-mesh-gateways-resolver.log
echo "Completed 10"
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-multidc-rsa-ca" -win=true > test/integration/connect/envoy/results/case-multidc-rsa-ca.log
echo "Completed 11"
XDS_TARGET=$XDS_TARGET go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-wanfed-gw" -win=true > test/integration/connect/envoy/results/case-wanfed-gw.log
echo "Completed 12"
fi
echo "Completed tests from Set $SET"

6
test/integration/connect/envoy/Dockerfile-consul-envoy-windows
Unescape View File

@ -1,6 +1,6 @@
# From Consul Version 1.13.1 / 1.12.4 / 1.11.8
ARG VERSION=1.13.1-local
# From Envoy version 1.23.0 / 1.22.3 / 1.21.4 / 1.20.6 / 1.19.5
# From Consul Version 1.13.2 / 1.12.4 / 1.11.8
ARG VERSION=1.13.2-local
# From Envoy version 1.23.1 / 1.22.3 / 1.21.4 / 1.20.6 / 1.19.5
ARG ENVOY_VERSION
FROM docker.mirror.hashicorp.services/windows/envoy-windows:v${ENVOY_VERSION} as envoy

8
test/integration/connect/envoy/helpers.windows.bash
Unescape View File

@ -812,7 +812,6 @@ function read_config_entry {
local NAME=$2
local DC=${3:-primary}
get_consul_hostname $DC
docker_consul_exec "$DC" bash -c "consul config read -kind $KIND -name $NAME -http-addr="$CONSUL_HOSTNAME:8500""
}
@ -831,7 +830,6 @@ function delete_config_entry {
local KIND=$1
local NAME=$2
get_consul_hostname primary
retry_default curl -sL -XDELETE "http://${CONSUL_HOSTNAME}:8500/v1/config/${KIND}/${NAME}"
}
@ -845,7 +843,7 @@ function register_services {
# Its first argument must be the datacenter name.
function wait_for_leader {
get_consul_hostname primary
retry_default docker_consul_exec "$1" sh -c "[[ $(curl --fail -sS http://${CONSUL_HOSTNAME}:8500/v1/status/leader) ]]"
retry_default docker_consul_exec "$1" bash -c "[[ $(curl --fail -sS http://${CONSUL_HOSTNAME}:8500/v1/status/leader) ]]"
}
function setup_upsert_l4_intention {
@ -853,7 +851,6 @@ function setup_upsert_l4_intention {
local DESTINATION=$2
local ACTION=$3
get_consul_hostname primary
retry_default docker_consul_exec primary bash -c "curl -sL -X PUT -d '{\"Action\": \"${ACTION}\"}' 'http://${CONSUL_HOSTNAME}:8500/v1/connect/intentions/exact?source=${SOURCE}&destination=${DESTINATION}'"
}
@ -862,7 +859,6 @@ function upsert_l4_intention {
local DESTINATION=$2
local ACTION=$3
get_consul_hostname primary
retry_default curl -sL -XPUT "http://${CONSUL_HOSTNAME}:8500/v1/connect/intentions/exact?source=${SOURCE}&destination=${DESTINATION}" \
-d"{\"Action\": \"${ACTION}\"}" >/dev/null
}
@ -877,7 +873,6 @@ function cacert_curl {
local ADDR=$2
local CA_ROOT="/c/workdir/caroot.pem"
get_ca_root > $CA_ROOT
run retry_default curl --cacert $CA_ROOT -s -f -d hello --resolve $RESOLVE_ADDR $ADDR
[ "$status" -eq 0 ]
@ -888,7 +883,6 @@ function wait_for_agent_service_register {
local SERVICE_ID=$1
local DC=${2:-primary}
get_consul_hostname $DC
retry_default docker_consul_exec "$DC" bash -c "curl -sLf 'http://${CONSUL_HOSTNAME}:8500/v1/agent/service/${SERVICE_ID}' >/dev/null"
}

60
test/integration/connect/envoy/run-tests.windows.sh
Unescape View File

@ -17,7 +17,7 @@ DEBUG=${DEBUG:-}
XDS_TARGET=${XDS_TARGET:-server}
# ENVOY_VERSION to run each test against
ENVOY_VERSION=${ENVOY_VERSION:-"1.23.0"}
ENVOY_VERSION=${ENVOY_VERSION:-"1.23.1"}
export ENVOY_VERSION
export DOCKER_BUILDKIT=0
@ -150,7 +150,7 @@ function start_consul {
# 8500/8502 are for consul
# 9411 is for zipkin which shares the network with consul
# 16686 is for jaeger ui which also shares the network with consul
ports=(
ports=(
'-p=8500:8500'
'-p=8502:8502'
'-p=9411:9411'
@ -184,7 +184,7 @@ function start_consul {
# xDS sessions are served directly by a Consul server, and another in which it
# goes through a client agent.
#
# This is nessasary because servers and clients source configuration data in
# This is necessary because servers and clients source configuration data in
# different ways (client agents use an RPC-backed cache and servers use their
# own local data) and we want to catch regressions in both.
#
@ -323,11 +323,6 @@ function pre_service_setup {
}
function start_services {
# Push the state to the shared docker.exe volume (note this is because CircleCI
# can't use shared volumes)
# docker.exe cp workdir/. envoy_workdir_1:/workdir
# Start containers required
if [ ! -z "$REQUIRED_SERVICES" ] ; then
docker_kill_rm $REQUIRED_SERVICES
@ -353,12 +348,12 @@ function verify {
# need to tell the PID 1 inside of the container that it won't be actual PID
# 1 because we're using --pid=host so we use TINI_SUBREAPER
if docker.exe exec -i ${SINGLE_CONTAINER_BASE_NAME}-${CLUSTER}_1 bash -c "TINI_SUBREAPER=1 \
XDS_TARGET=${XDS_TARGET} \
ENVOY_VERSION=${ENVOY_VERSION} \
/c/bats/bin/bats \
--pretty \
/c/workdir/${CLUSTER}/bats" ; then
if docker.exe exec -i ${SINGLE_CONTAINER_BASE_NAME}-${CLUSTER}_1 bash \
-c "TINI_SUBREAPER=1 \
ENVOY_VERSION=${ENVOY_VERSION} \
XDS_TARGET=${XDS_TARGET} \
/c/bats/bin/bats \
--pretty /c/workdir/${CLUSTER}/bats" ; then
echogreen "✓ PASS"
else
echored "⨯ FAIL"
@ -621,11 +616,12 @@ function common_run_container_service {
local grpcPort="$4"
local CONTAINER_NAME="$SINGLE_CONTAINER_BASE_NAME"-"$CLUSTER"_1
docker.exe exec -d $CONTAINER_NAME bash -c "FORTIO_NAME=${service} \
fortio.exe server \
-http-port ":$httpPort" \
-grpc-port ":$grpcPort" \
-redirect-port disabled >/dev/null"
docker.exe exec -d $CONTAINER_NAME bash \
-c "FORTIO_NAME=${service} \
fortio.exe server \
-http-port ":$httpPort" \
-grpc-port ":$grpcPort" \
-redirect-port disabled >/dev/null"
}
function run_container_s1 {
@ -700,11 +696,12 @@ function common_run_container_sidecar_proxy {
# despite separate containers that don't share IPC namespace. Not quite
# sure how this happens but may be due to unix socket being in some shared
# location?
docker.exe exec -d $CONTAINER_NAME bash -c "envoy.exe \
-c /c/workdir/${CLUSTER}/envoy/${service}-bootstrap.json \
-l trace \
--disable-hot-restart \
--drain-time-s 1 >/dev/null"
docker.exe exec -d $CONTAINER_NAME bash \
-c "envoy.exe \
-c /c/workdir/${CLUSTER}/envoy/${service}-bootstrap.json \
-l trace \
--disable-hot-restart \
--drain-time-s 1 >/dev/null"
}
function run_container_s1-sidecar-proxy {
@ -783,11 +780,12 @@ function common_run_container_gateway {
# despite separate containers that don't share IPC namespace. Not quite
# sure how this happens but may be due to unix socket being in some shared
# location?
docker.exe exec -d $CONTAINER_NAME bash -c "envoy.exe \
-c /c/workdir/${DC}/envoy/${name}-bootstrap.json \
-l trace \
--disable-hot-restart \
--drain-time-s 1 >/dev/null"
docker.exe exec -d $CONTAINER_NAME bash \
-c "envoy.exe \
-c /c/workdir/${DC}/envoy/${name}-bootstrap.json \
-l trace \
--disable-hot-restart \
--drain-time-s 1 >/dev/null"
}
function run_container_gateway-primary {
@ -830,7 +828,7 @@ function run_container_jaeger {
local CONTAINER_NAME="$SINGLE_CONTAINER_BASE_NAME"-"$DC"_1
docker.exe exec -d $CONTAINER_NAME bash -c "jaeger-all-in-one.exe \
--collector.zipkin.http-port=9411"
--collector.zipkin.http-port=9411"
}
function run_container_test-sds-server {
@ -840,7 +838,7 @@ function run_container_test-sds-server {
local CONTAINER_NAME="$SINGLE_CONTAINER_BASE_NAME"-"$DC"_1
docker.exe exec -d $CONTAINER_NAME bash -c "cd /c/test-sds-server &&
./test-sds-server.exe"
./test-sds-server.exe"
}
function container_name {

Write Preview
Loading…
Cancel
Save