Skip to content

Commit 9d38cca

Browse files
committed
K8S-391 preserve monitoring credentials
1 parent 38e42c5 commit 9d38cca

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

addons/upgrade.jps

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,13 @@ actions:
131131
wait-deployment.sh tiller-deploy kube-system 1 720
132132
- cmd[${nodes.k8sm.master.id}]: |-
133133
kubectl get secret --namespace kubernetes-monitoring monitoring-grafana && {
134+
grafana_base64=$(kubectl get secret --namespace kubernetes-monitoring monitoring-grafana -o jsonpath='{.data.admin-password}');
134135
helm upgrade monitoring-prometheus stable/prometheus --set server.prefixURL=/prometheus --set server.baseURL=/prometheus ;
135136
wait-deployment.sh monitoring-prometheus-server kubernetes-monitoring 1 720;
136137
helm fetch stable/grafana --untar;
137138
helm upgrade monitoring-grafana --set 'grafana\.ini'.server.root_url=${env.url}grafana -f ${baseUrl}/addons/monitoring/jelastic-values.yaml grafana/. ;
138139
wait-deployment.sh monitoring-grafana kubernetes-monitoring 1 720;
140+
kubectl patch secret --namespace kubernetes-monitoring monitoring-grafana -p="{\"data\":{\"admin-password\":\"${grafana_base64}\"}}";
139141
kubectl apply -f ${baseUrl}/addons/monitoring/${globals.ingress-dir}/prometheus-ingress.yaml;
140142
kubectl apply -f ${baseUrl}/addons/monitoring/${globals.ingress-dir}/alert-ingress.yaml;
141143
kubectl apply -f ${baseUrl}/addons/monitoring/${globals.ingress-dir}/grafana-ingress.yaml; } ||:

0 commit comments

Comments
 (0)