Skip to content

Commit 9a54fd4

Browse files
committed
Change wait script location
1 parent dfa8026 commit 9a54fd4

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

manifest.jps

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@ actions:
158158
wget -qO- https://github.com/ahmetb/kubectx/archive/v${kubectx_version}.tar.gz | tar xz --strip-components=2 -C /etc/bash_completion.d kubectx-${kubectx_version}/completion/kubens.bash kubectx-${kubectx_version}/completion/kubectx.bash
159159
wget -nv https://github.com/weaveworks/weave/releases/download/v2.5.2/weave -O /usr/bin/weave
160160
chmod +x /usr/bin/weave
161-
wget -nv ${baseUrl}/scripts/wait-deployment.sh -O /root/wait-deployment.sh
162-
chmod +x /root/wait-deployment.sh
161+
wget -nv ${baseUrl}/scripts/wait-deployment.sh -O /usr/local/sbin/wait-deployment.sh
162+
chmod +x /usr/local/sbin/wait-deployment.sh
163163
configure-all-post: ${this}
164164

165165
connect-workers:
@@ -224,7 +224,7 @@ actions:
224224
kubectl create -f ${baseUrl}/addons/metrics-server/metrics-server-service.yaml
225225
kubectl create -f ${baseUrl}/addons/metrics-server/resource-reader.yaml
226226
kubectl create -f ${baseUrl}/addons/admin-account.yaml
227-
/root/wait-deployment.sh metrics-server kube-system 1 720
227+
wait-deployment.sh metrics-server kube-system 1 720
228228

229229
- if ('${settings.dashboard}' == 'version1'):
230230
cmd[${nodes.k8sm.master.id}]: |-
@@ -243,7 +243,7 @@ actions:
243243
kubectl create clusterrolebinding tiller-cluster-rule --clusterrole=cluster-admin --serviceaccount=kube-system:tiller
244244
helm init --upgrade --service-account tiller
245245
helm repo update
246-
/root/wait-deployment.sh tiller-deploy kube-system 1 720
246+
wait-deployment.sh tiller-deploy kube-system 1 720
247247

248248
install-helm-slave:
249249
cmd[${this.id}]: |-
@@ -302,13 +302,13 @@ actions:
302302
- cmd[${nodes.k8sm.master.id}]: |-
303303
helm repo update
304304
helm install --name monitoring-prometheus --namespace kubernetes-monitoring stable/prometheus --set server.prefixURL=/prometheus --set server.baseURL=/prometheus
305-
/root/wait-deployment.sh monitoring-prometheus-server kubernetes-monitoring 1 720
305+
wait-deployment.sh monitoring-prometheus-server kubernetes-monitoring 1 720
306306
helm fetch stable/grafana --untar
307307
for dash_name in "kubernetes-prometeus-dashboard" "kubernetes-rchakra3-dashboard" "kubernetes-vanniekerk-dashboard"; do
308308
wget "${baseUrl}/addons/monitoring/${dash_name}.json" -O "grafana/dashboards/${dash_name}.json"
309309
done
310310
helm install --name monitoring-grafana --namespace kubernetes-monitoring --set 'grafana\.ini'.server.root_url=${env.url}grafana -f ${baseUrl}/addons/monitoring/jelastic-values.yaml grafana/.
311-
/root/wait-deployment.sh monitoring-grafana kubernetes-monitoring 1 720
311+
wait-deployment.sh monitoring-grafana kubernetes-monitoring 1 720
312312
grafana_secret=$(kubectl get secret --namespace kubernetes-monitoring monitoring-grafana -o jsonpath='{.data.admin-password}' | base64 --decode ; echo)
313313
[ "${settings.ingress-controller}" == "HAProxy" ] && crypt_option="-1" || crypt_option="-apr1"
314314
kubectl create secret generic monitoring-prometheus --from-literal=auth="admin:$(openssl passwd ${crypt_option} ${grafana_secret})" --namespace=kubernetes-monitoring
@@ -373,8 +373,8 @@ actions:
373373
kubectl create secret generic observability-jaeger --from-literal=auth="admin:$(openssl passwd ${crypt_option} ${jaeger_secret})" --namespace=observability
374374
kubectl apply -f ${baseUrl}/addons/jaeger/jelastic-jaeger.yaml
375375
kubectl apply -f ${baseUrl}/addons/ingress/${globals.ingress-dir}/jaeger-ingress.yaml
376-
/root/wait-deployment.sh jaeger-operator observability 1 720
377-
/root/wait-deployment.sh jaeger observability 1 720
376+
wait-deployment.sh jaeger-operator observability 1 720
377+
wait-deployment.sh jaeger observability 1 720
378378
- cmd[${nodes.k8sm.master.id}]: kubectl get secret --namespace=observability observability-jaeger-plain -o jsonpath='{.data.auth}' | base64 --decode
379379
- setGlobals:
380380
jaeger_secret: ${response.out}

0 commit comments

Comments
 (0)