From ff90c42fa7460e9b961ab837e5935f9505992f5c Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Sat, 29 Jun 2019 15:41:28 +0300 Subject: [PATCH] Fix Linkerd CLI install --- test/e2e-linkerd-tests.sh | 2 +- test/e2e-linkerd.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/e2e-linkerd-tests.sh b/test/e2e-linkerd-tests.sh index 53ad55fb..48462e3d 100755 --- a/test/e2e-linkerd-tests.sh +++ b/test/e2e-linkerd-tests.sh @@ -81,7 +81,7 @@ ok=false until ${ok}; do kubectl -n test describe deployment/podinfo-primary | grep '1.4.1' && ok=true || ok=false sleep 10 - kubectl -n istio-system logs deployment/flagger --tail 1 + kubectl -n linkerd logs deployment/flagger --tail 1 count=$(($count + 1)) if [[ ${count} -eq ${retries} ]]; then kubectl -n linkerd logs deployment/flagger diff --git a/test/e2e-linkerd.sh b/test/e2e-linkerd.sh index e7293e42..4545c64c 100755 --- a/test/e2e-linkerd.sh +++ b/test/e2e-linkerd.sh @@ -6,7 +6,7 @@ LINKERD_VER="edge-19.6.4" REPO_ROOT=$(git rev-parse --show-toplevel) export KUBECONFIG="$(kind get kubeconfig-path --name="kind")" -curl -LO https://github.com/linkerd/linkerd2/releases/download/${LINKERD_VER}/linkerd2-cli-${LINKERD_VER}-linux > ${REPO_ROOT}/bin/linkerd +curl -SsL https://github.com/linkerd/linkerd2/releases/download/${LINKERD_VER}/linkerd2-cli-${LINKERD_VER}-linux > ${REPO_ROOT}/bin/linkerd chmod +x ${REPO_ROOT}/bin/linkerd echo ">>> Installing Linkerd ${LINKERD_VER}" @@ -25,5 +25,5 @@ helm upgrade -i flagger ${REPO_ROOT}/charts/flagger \ --set metricsServer=http://linkerd-prometheus:9090 \ --set meshProvider=smi:linkerd -kubectl -n istio-system set image deployment/flagger flagger=test/flagger:latest -kubectl -n istio-system rollout status deployment/flagger \ No newline at end of file +kubectl -n linkerd set image deployment/flagger flagger=test/flagger:latest +kubectl -n linkerd rollout status deployment/flagger \ No newline at end of file