github/flagger
1
0
Fork 0
mirror of https://github.com/fluxcd/flagger.git synced 2026-04-15 06:57:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #845 from Pothulapati/tarun/l5d-2.10

Browse Source 
linkerd: update prometheus URL based on the latest 2.10 changes
This commit is contained in:
Stefan Prodan
2021-03-23 10:36:33 +02:00
committed by GitHub
parent ef2df0d7bc 4a66a28c01
commit ffef8ba4d9
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kustomize/README.md
+2 -1
View File
@@ -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:
kustomize/linkerd/patch.yaml
+1 -1
View File
@@ -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://prometheus.linkerd-viz:9090
---
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRoleBinding
test/linkerd/install.sh
+5 -4
View File
@@ -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
test/linkerd/test-canary.sh
+1 -1
View File
@@ -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,