From 6be97b3fc7c26fb86eade0c5d70f50f289ecaea2 Mon Sep 17 00:00:00 2001 From: Tarun Pothulapati Date: Mon, 8 Mar 2021 13:46:38 +0000 Subject: [PATCH 1/4] linkerd: update prometheus URL based on the latest 2.10 changes In Linkerd 2.10, The Prometheus instance moved into the `viz` extension which is installed separately from the core control-plane. This means that the prometheus now exists in the `linkerd-viz` namespace by default unless overriden. This PR updates the URl to reflect the same Signed-off-by: Tarun Pothulapati --- kustomize/linkerd/patch.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kustomize/linkerd/patch.yaml b/kustomize/linkerd/patch.yaml index 25fcade6..ad919ebb 100644 --- a/kustomize/linkerd/patch.yaml +++ b/kustomize/linkerd/patch.yaml @@ -11,7 +11,7 @@ spec: - -log-level=info - -include-label-prefix=app.kubernetes.io - -mesh-provider=linkerd - - -metrics-server=http://linkerd-prometheus:9090 + - -metrics-server=http://linkerd-prometheus.linkerd-viz:9090 --- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding From 61d272dbbc85398999dcd6acf4655ff6e4477d50 Mon Sep 17 00:00:00 2001 From: Tarun Pothulapati Date: Mon, 8 Mar 2021 13:55:56 +0000 Subject: [PATCH 2/4] update readme Signed-off-by: Tarun Pothulapati --- kustomize/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kustomize/README.md b/kustomize/README.md index c3857421..e719ca5a 100644 --- a/kustomize/README.md +++ b/kustomize/README.md @@ -31,7 +31,8 @@ Install Flagger for Linkerd: kustomize build https://github.com/fluxcd/flagger/kustomize/linkerd?ref=main | kubectl apply -f - ``` -This deploys Flagger in the `linkerd` namespace and sets the metrics server URL to Linkerd's Prometheus instance. +This deploys Flagger in the `linkerd` namespace and sets the metrics server URL to linkerd-viz extension's Prometheus instance +which lives under `linkerd-viz` namespace by default. If you want to install a specific Flagger release, add the version number to the URL: From ec6004963cb0567c34ddfd63b48b2ffd4a04d3a3 Mon Sep 17 00:00:00 2001 From: Tarun Pothulapati Date: Mon, 8 Mar 2021 14:06:20 +0000 Subject: [PATCH 3/4] use correct prom URL Signed-off-by: Tarun Pothulapati --- kustomize/linkerd/patch.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kustomize/linkerd/patch.yaml b/kustomize/linkerd/patch.yaml index ad919ebb..fc3cf923 100644 --- a/kustomize/linkerd/patch.yaml +++ b/kustomize/linkerd/patch.yaml @@ -11,7 +11,7 @@ spec: - -log-level=info - -include-label-prefix=app.kubernetes.io - -mesh-provider=linkerd - - -metrics-server=http://linkerd-prometheus.linkerd-viz:9090 + - -metrics-server=http://prometheus.linkerd-viz:9090 --- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding From 4a66a28c01ef58f4bee0b111728245431adb02e6 Mon Sep 17 00:00:00 2001 From: Tarun Pothulapati Date: Mon, 8 Mar 2021 18:11:36 +0000 Subject: [PATCH 4/4] update to latest stable linkerd version This commit updates the linkerd version to `2.10`, along with the install script to download the arm version. It also updates the install script and metricsTempalte to install and use the viz Prometheus respectively. Signed-off-by: Tarun Pothulapati --- test/linkerd/install.sh | 9 +++++---- test/linkerd/test-canary.sh | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/test/linkerd/install.sh b/test/linkerd/install.sh index 7bfd15b0..b793caa5 100755 --- a/test/linkerd/install.sh +++ b/test/linkerd/install.sh @@ -2,20 +2,21 @@ set -o errexit -LINKERD_VER="stable-2.8.1" +LINKERD_VER="stable-2.10.0" REPO_ROOT=$(git rev-parse --show-toplevel) mkdir -p ${REPO_ROOT}/bin -curl -SsL 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-amd64 > ${REPO_ROOT}/bin/linkerd chmod +x ${REPO_ROOT}/bin/linkerd echo ">>> Installing Linkerd ${LINKERD_VER}" ${REPO_ROOT}/bin/linkerd install | kubectl apply -f - ${REPO_ROOT}/bin/linkerd check -kubectl -n linkerd rollout status deployment/linkerd-controller -kubectl -n linkerd rollout status deployment/linkerd-proxy-injector +echo ">>> Installing Linkerd Viz" +${REPO_ROOT}/bin/linkerd viz install | kubectl apply -f - +${REPO_ROOT}/bin/linkerd viz check echo '>>> Installing Flagger' kubectl apply -k ${REPO_ROOT}/kustomize/linkerd diff --git a/test/linkerd/test-canary.sh b/test/linkerd/test-canary.sh index 499bdecd..8ccedce2 100755 --- a/test/linkerd/test-canary.sh +++ b/test/linkerd/test-canary.sh @@ -15,7 +15,7 @@ metadata: spec: provider: type: prometheus - address: http://linkerd-prometheus.linkerd:9090 + address: http://prometheus.linkerd-viz:9090 query: | histogram_quantile( 0.99,