Skip to content
This repository was archived by the owner on May 20, 2025. It is now read-only.

Commit 057e838

Browse files
committed
Remove defaulting of DF and Skipper versions
Resolves #181
1 parent aee0dfa commit 057e838

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

kubernetes/init/setenv.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,4 @@ gcp_authenticate_and_target
3333
if [ -z "$KUBERNETES_NAMESPACE" ]; then
3434
export KUBERNETES_NAMESPACE='default'
3535
fi
36-
if [ -z "$SKIPPER_SERVER_IMAGE" ]; then
37-
export SKIPPER_SERVER_IMAGE=springcloud/spring-cloud-skipper-server:$SKIPPER_VERSION
38-
fi
3936
echo "Using namespace $KUBERNETES_NAMESPACE"

kubernetes/skipper-server/config.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
SKIPPER_SERVER_URI=$(kubectl get svc skipper --namespace $KUBERNETES_NAMESPACE | grep skipper | awk '{print $4}')
44
SKIPPER_SERVER_URI="http://$SKIPPER_SERVER_URI:7577"
5-
echo "SKIPPER SERVER IMAGE: $SKIPPER_SERVER_IMAGE"
5+
echo "SKIPPER SERVER IMAGE: springcloud/spring-cloud-skipper-server:$SKIPPER_VERSION"
66
echo "SKIPPER SERVER URI: $SKIPPER_SERVER_URI"
77
export SKIPPER_SERVER_URI
88
export DEPLOY_PAUSE_RETRIES=50

run.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,6 @@ done
303303
# ======================================= DEFAULTS ============================================
304304
[[ -z "${PLATFORM}" ]] && PLATFORM=local
305305
[[ -z "${BINDER}" ]] && BINDER=rabbit
306-
[[ -z "${SKIPPER_VERSION}" ]] && SKIPPER_VERSION=1.0.5.BUILD-SNAPSHOT
307-
[[ -z "${DATAFLOW_VERSION}" ]] && DATAFLOW_VERSION=1.5.1.BUILD-SNAPSHOT
308306
[[ -z "${STREAM_APPS_VERSION}" ]] && STREAM_APPS_VERSION=Celsius.SR3
309307
[[ -z "${TASKS_VERSION}" ]] && TASKS_VERSION=Clark.RELEASE
310308
WAIT_TIME="${WAIT_TIME:-5}"
@@ -316,6 +314,12 @@ APPLICATION_ARGS=""
316314
# ======================================= DEFAULTS END ========================================
317315
[[ ! -d "$PLATFORM" ]] && { echo "$PLATFORM is an invalid platform"; exit 1; }
318316
[[ ! -d "$PLATFORM/binder/$BINDER" ]] && { echo "$BINDER is an invalid binder for $PLATFORM platform"; exit 1; }
317+
[[ -z "$DATAFLOW_VERSION" ]] && { echo "Data Flow version must be defined"; exit 1; }
318+
319+
if [ ! -z "$skipperMode" ] && [ -z "$SKIPPER_VERSION" ]; then
320+
echo "Skipper enabled but Skipper Version not set"
321+
exit 1
322+
fi
319323

320324
if [ -z "$skipSetup" ]; then
321325
setup

0 commit comments

Comments
 (0)