From 5f439adc365ee64fafa3955e64c38ca08620d0cf Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Sun, 6 Oct 2019 12:58:26 +0300 Subject: [PATCH] Use kustomize in Linkerd e2e tests --- test/e2e-linkerd-tests.sh | 2 +- test/e2e-linkerd.sh | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/test/e2e-linkerd-tests.sh b/test/e2e-linkerd-tests.sh index 5fe18f9a..47ca6511 100755 --- a/test/e2e-linkerd-tests.sh +++ b/test/e2e-linkerd-tests.sh @@ -32,7 +32,7 @@ spec: progressDeadlineSeconds: 60 service: port: 80 - targertPort: http + targetPort: http portDiscovery: true canaryAnalysis: interval: 15s diff --git a/test/e2e-linkerd.sh b/test/e2e-linkerd.sh index 295f18ca..69849a17 100755 --- a/test/e2e-linkerd.sh +++ b/test/e2e-linkerd.sh @@ -20,12 +20,7 @@ echo '>>> Load Flagger image in Kind' kind load docker-image test/flagger:latest echo '>>> Installing Flagger' -helm upgrade -i flagger ${REPO_ROOT}/charts/flagger \ ---namespace linkerd \ ---set leaderElection.enabled=true \ ---set leaderElection.replicaCount=2 \ ---set metricsServer=http://linkerd-prometheus:9090 \ ---set meshProvider=smi:linkerd +kubectl apply -k ${REPO_ROOT}/kustomize/linkerd kubectl -n linkerd set image deployment/flagger flagger=test/flagger:latest kubectl -n linkerd rollout status deployment/flagger \ No newline at end of file