Re-organizing some functions.
This commit is contained in:
+3
-4
@@ -206,7 +206,7 @@ wait_for_service() {
|
|||||||
if [ -z $ip ]; then
|
if [ -z $ip ]; then
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
echo "IP for $svc : $ip"
|
echo "IP for $svc : $ip, healthendpoint : $health_endpoint"
|
||||||
http_status=`curl -sw "%{http_code}" "http://$ip/$health_endpoint"`
|
http_status=`curl -sw "%{http_code}" "http://$ip/$health_endpoint"`
|
||||||
echo "http_status for svc $svc : $http_status"
|
echo "http_status for svc $svc : $http_status"
|
||||||
if [ "$http_status" -ne "200" ]; then
|
if [ "$http_status" -ne "200" ]; then
|
||||||
@@ -259,9 +259,6 @@ helm_uninstall_fission() {(set +e
|
|||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dump_kubernetes_events $id
|
|
||||||
dump_tiller_logs
|
|
||||||
|
|
||||||
echo "Uninstalling fission"
|
echo "Uninstalling fission"
|
||||||
helm delete --purge $id
|
helm delete --purge $id
|
||||||
kubectl delete ns f-$id
|
kubectl delete ns f-$id
|
||||||
@@ -442,6 +439,8 @@ install_and_test() {
|
|||||||
if ! helm_install_fission $id $image $imageTag $fetcherImage $fetcherImageTag $controllerPort $routerPort $fluentdImage $fluentdImageTag $pruneInterval
|
if ! helm_install_fission $id $image $imageTag $fetcherImage $fetcherImageTag $controllerPort $routerPort $fluentdImage $fluentdImageTag $pruneInterval
|
||||||
then
|
then
|
||||||
dump_logs $id
|
dump_logs $id
|
||||||
|
dump_kubernetes_events $id
|
||||||
|
dump_tiller_logs
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user