From 3968e84efd6732116f1bd2f51193ea25c8000f46 Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Sat, 22 Feb 2020 00:46:00 +0200 Subject: [PATCH 1/2] Fix Contour header override for Linkerd --- pkg/router/contour.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/router/contour.go b/pkg/router/contour.go index 8d540441..50bbee2a 100644 --- a/pkg/router/contour.go +++ b/pkg/router/contour.go @@ -423,7 +423,7 @@ func (cr *ContourRouter) makeRetryPolicy(canary *flaggerv1.Canary) *contourv1.Re func (cr *ContourRouter) makeLinkerdHeaderValue(canary *flaggerv1.Canary, serviceName string) contourv1.HeaderValue { return contourv1.HeaderValue{ Name: "l5d-dst-override", - Value: fmt.Sprintf("%s.%.s.svc.cluster.local:%v", serviceName, canary.Namespace, canary.Spec.Service.Port), + Value: fmt.Sprintf("%s.%s.svc.cluster.local:%v", serviceName, canary.Namespace, canary.Spec.Service.Port), } } From 0c2d7da13610e07b20d7216bce10b5cfe1365f7c Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Sat, 22 Feb 2020 00:48:29 +0200 Subject: [PATCH 2/2] Use Contour 1.2 in e2e tests --- docs/gitbook/tutorials/contour-progressive-delivery.md | 2 +- test/e2e-contour.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/gitbook/tutorials/contour-progressive-delivery.md b/docs/gitbook/tutorials/contour-progressive-delivery.md index 6f89b010..abd0805a 100644 --- a/docs/gitbook/tutorials/contour-progressive-delivery.md +++ b/docs/gitbook/tutorials/contour-progressive-delivery.md @@ -385,7 +385,7 @@ podinfod=stefanprodan/podinfo:3.1.3 Flagger detects that the deployment revision changed and starts the A/B test: ```text -kubectl -n appmesh-system logs deploy/flagger -f | jq .msg +kubectl -n projectcontour logs deploy/flagger -f | jq .msg New revision detected! Starting canary analysis for podinfo.test Advance podinfo.test canary iteration 1/10 diff --git a/test/e2e-contour.sh b/test/e2e-contour.sh index b4c5cb2d..6ad37005 100755 --- a/test/e2e-contour.sh +++ b/test/e2e-contour.sh @@ -4,7 +4,7 @@ set -o errexit REPO_ROOT=$(git rev-parse --show-toplevel) -CONTOUR_VER="release-1.1" +CONTOUR_VER="release-1.2" echo '>>> Installing Contour' kubectl apply -f https://raw.githubusercontent.com/projectcontour/contour/${CONTOUR_VER}/examples/render/contour.yaml