This is an automated email from the ASF dual-hosted git repository.
zhongxjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-kubernetes.git
The following commit(s) were added to refs/heads/master by this push:
new 011e8b66 [charts] jobs update grafana json (#468)
011e8b66 is described below
commit 011e8b66e4aeadc0a2c9e8a6bccd581aca2e22f6
Author: mfordjody <[email protected]>
AuthorDate: Wed Oct 16 18:29:30 2024 +0800
[charts] jobs update grafana json (#468)
---
manifests/charts/admin/templates/jobs.yaml | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/manifests/charts/admin/templates/jobs.yaml
b/manifests/charts/admin/templates/jobs.yaml
index fe66b57e..ff0a0b96 100644
--- a/manifests/charts/admin/templates/jobs.yaml
+++ b/manifests/charts/admin/templates/jobs.yaml
@@ -35,15 +35,24 @@ data:
PROMETHEUS="https://prometheus-community.github.io/helm-charts";
ISTIO="https://istio-release.storage.googleapis.com/charts";
- helm pull kube-prometheus-stack --repo "$PROMETHEUS" --version 65.2.0
--untar && \
+ helm pull kube-prometheus-stack --repo "$PROMETHEUS" --version 65.2.0
--untar && rm -rf kube-prometheus-stack-65.2.0.tgz/ \
+ for i in {1..5}; do
+ if rm -rf kube-prometheus-stack-65.2.0.tgz/; then
+ break
+ else
+ echo "Attempt $i: Failed to remove directory, retrying in 2 seconds..."
+ sleep 2
+ fi
+ done
cp -r "/files/dashboards/"
kube-prometheus-stack/templates/grafana/dashboards-1.14 && \
ls -la kube-prometheus-stack/templates/grafana/dashboards-1.14 && \
- helm install kube-prometheus ./kube-prometheus-stack/ && \
- helm upgrade --install kube-prometheus ./kube-prometheus-stack/ && \
- if [ $? -eq 0 ]; then
- continue
+
+ if helm ls --all | grep -q "kube-prometheus"; then
+ helm upgrade kube-prometheus ./kube-prometheus-stack/
+ else
+ helm install kube-prometheus ./kube-prometheus-stack/
fi
- helm upgrade --install kube-prometheus ./kube-prometheus-stack/
+
helm repo add istio "$ISTIO" && \
helm repo update && \
helm install istio-base istio/base -n istio-system --set
defaultRevision=default && \
