Skip to content

Commit 3d54f1c

Browse files
committed
feat(local-script): do not make a skaffold failure stop minikube
1 parent 94a9954 commit 3d54f1c

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

local-scripts/osbv2-local.sh

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@ deploy () {
153153
harness_deployment
154154

155155
echo "-> running skaffold"
156-
$SKAFFOLD dev --cleanup=false || { notify_fail "Failed: skaffold" ; minikube stop; }
157-
#$SKAFFOLD dev || notify_fail "Failed: skaffold"
156+
$SKAFFOLD dev --cleanup=false || { notify_fail "Failed: skaffold" ; }
157+
minkube status
158158
popd
159159
}
160160

@@ -193,10 +193,18 @@ harness_deployment() {
193193
if [ "YES" == "$LIVE" ]
194194
then
195195
echo "-> harnessing live configuration deployment, and deploying"
196+
set -x
197+
set -v
196198
harness-deployment ../cloud-harness . -l -n ${OSB_NAMESPACE} -d osb.local -r gcr.io/metacellllc -e "local" -t "$LIVE_TAG" || notify_fail "Failed: harness-deployment (live)"
199+
set +x
200+
set +v
197201
else
198202
echo "-> harnessing development deployment"
203+
set -x
204+
set -v
199205
harness-deployment ../cloud-harness . -l -n ${OSB_NAMESPACE} -d osb.local -dtls -e "local" ${DEPLOYMENT_APP:+-i $DEPLOYMENT_APP} || notify_fail "Failed: harness-deployment (dev)"
206+
set +x
207+
set +v
200208
fi
201209
popd
202210
}
@@ -242,10 +250,12 @@ deactivate_venv() {
242250
print_versions() {
243251
echo "** docker **"
244252
docker version
253+
echo -e "\n** kubernetes **"
254+
kubectl version
245255
echo -e "\n** minikube **"
246256
minikube version
247257
echo -e "\n** cloud harness **"
248-
pushd "${CLOUD_HARNESS_DIR}" && git log --oneline | head -1 && popd
258+
pushd "${CLOUD_HARNESS_DIR}" 2>&1 > /dev/null && git log --oneline | head -1 && popd 2>&1 > /dev/null
249259
echo -e "\n** helm **"
250260
helm version
251261
echo -e "\n** skaffold **"

0 commit comments

Comments
 (0)