Skip to content

Commit

Permalink
Merge pull request #5 from ovotech/shellcheck
Browse files Browse the repository at this point in the history 
Strictify scripts
  • Loading branch information
@jcderr
jcderr authored Feb 8, 2017
2 parents ceed230 + d0a0580 commit 581f942
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 49 deletions.
28 changes: 15 additions & 13 deletions bin/check
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,46 +3,48 @@ set -e
set -o pipefail
exec 3>&1 # use fd 3 for script output
exec 1>&2 # send normal stdout to stderr for logging
jq -M -S . < /dev/stdin > /tmp/input

cd $1
payload="$(mktemp "$TMPDIR/k8s-resource-request.XXXXXX")"
cat > "$payload" <&0

cd "$1"

mkdir -p /root/.kube

KUBE_URL=$(jq -r .source.cluster_url < /tmp/input)
NAMESPACE=$(jq -r .source.namespace < /tmp/input)
KUBE_URL=$(jq -r .source.cluster_url < "$payload")
NAMESPACE=$(jq -r .source.namespace < "$payload")

KUBECTL="/usr/local/bin/kubectl --server=$KUBE_URL --namespace=$NAMESPACE"

# configure SSL Certs if available
if [[ "$KUBE_URL" =~ https.* ]]; then
KUBE_CA=$(jq -r .source.cluster_ca < /tmp/input)
KUBE_KEY=$(jq -r .source.admin_key < /tmp/input)
KUBE_CERT=$(jq -r .source.admin_cert < /tmp/input)
KUBE_CA=$(jq -r .source.cluster_ca < "$payload")
KUBE_KEY=$(jq -r .source.admin_key < "$payload")
KUBE_CERT=$(jq -r .source.admin_cert < "$payload")
CA_PATH="/root/.kube/ca.pem"
KEY_PATH="/root/.kube/key.pem"
CERT_PATH="/root/.kube/cert.pem"

echo "$KUBE_CA" | base64 -d > $CA_PATH
echo "$KUBE_KEY" | base64 -d > $KEY_PATH
echo "$KUBE_CERT" | base64 -d > $CERT_PATH

KUBECTL="$KUBECTL --certificate-authority=$CA_PATH --client-key=$KEY_PATH --client-certificate=$CERT_PATH"
fi

# get kube resource id
RESOURCE_TYPE=$(jq -r .source.resource_type < /tmp/input)
RESOURCE_NAME=$(jq -r .source.resource_name < /tmp/input)
RESOURCE_TYPE=$(jq -r .source.resource_type < "$payload")
RESOURCE_NAME=$(jq -r .source.resource_name < "$payload")
if [[ -z "$RESOURCE_TYPE" ]] || [[ -z "$RESOURCE_NAME" ]]; then
result=$(jq -n "[]")
else
export KUBECTL

RESOURCE="$RESOURCE_TYPE/$RESOURCE_NAME"

IMG=$($KUBECTL get -o json $RESOURCE | jq -r '.spec.template.spec.containers[0].image')
IMG=$($KUBECTL get -o json "$RESOURCE" | jq -r '.spec.template.spec.containers[0].image')

result=$(jq -n "[{container:\"$IMG\"}]")
fi

echo "$result" | jq -s add >&3
echo "$result" | jq -s add >&3
26 changes: 14 additions & 12 deletions bin/in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,38 @@ set -e
set -o pipefail
exec 3>&1 # use fd 3 for script output
exec 1>&2 # send normal stdout to stderr for logging
jq -M -S . < /dev/stdin > /tmp/input

cd $1
payload="$(mktemp "$TMPDIR/k8s-resource-request.XXXXXX")"
cat > "$payload" <&0

cd "$1"

mkdir -p /root/.kube

KUBE_URL=$(jq -r .source.cluster_url < /tmp/input)
NAMESPACE=$(jq -r .source.namespace < /tmp/input)
KUBE_URL=$(jq -r .source.cluster_url < "$payload")
NAMESPACE=$(jq -r .source.namespace < "$payload")

KUBECTL="/usr/local/bin/kubectl --server=$KUBE_URL --namespace=$NAMESPACE"

# configure SSL Certs if available
if [[ "$KUBE_URL" =~ https.* ]]; then
KUBE_CA=$(jq -r .source.cluster_ca < /tmp/input)
KUBE_KEY=$(jq -r .source.admin_key < /tmp/input)
KUBE_CERT=$(jq -r .source.admin_cert < /tmp/input)
KUBE_CA=$(jq -r .source.cluster_ca < "$payload")
KUBE_KEY=$(jq -r .source.admin_key < "$payload")
KUBE_CERT=$(jq -r .source.admin_cert < "$payload")
CA_PATH="/root/.kube/ca.pem"
KEY_PATH="/root/.kube/key.pem"
CERT_PATH="/root/.kube/cert.pem"

echo "$KUBE_CA" | base64 -d > $CA_PATH
echo "$KUBE_KEY" | base64 -d > $KEY_PATH
echo "$KUBE_CERT" | base64 -d > $CERT_PATH

KUBECTL="$KUBECTL --certificate-authority=$CA_PATH --client-key=$KEY_PATH --client-certificate=$CERT_PATH"
fi

# get kube resource id
RESOURCE_TYPE=$(jq -r .source.resource_type < /tmp/input)
RESOURCE_NAME=$(jq -r .source.resource_name < /tmp/input)
RESOURCE_TYPE=$(jq -r .source.resource_type < "$payload")
RESOURCE_NAME=$(jq -r .source.resource_name < "$payload")

if [[ -z "$RESOURCE_TYPE" ]] || [[ -z "$RESOURCE_NAME" ]]; then
result=""
Expand All @@ -41,7 +43,7 @@ else

RESOURCE="$RESOURCE_TYPE/$RESOURCE_NAME"

IMG=$($KUBECTL get -o json $RESOURCE | jq -r '.spec.template.spec.containers[0].image')
IMG=$($KUBECTL get -o json "$RESOURCE" | jq -r '.spec.template.spec.containers[0].image')

result="$(jq -n "{version:{container:\"$IMG\"}}")"
fi
Expand Down
50 changes: 26 additions & 24 deletions bin/out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ set -e
set -o pipefail
exec 3>&1 # use fd 3 for script output
exec 1>&2 # send normal stdout to stderr for logging
jq -M -S . < /dev/stdin > /tmp/input

payload="$(mktemp "$TMPDIR/k8s-resource-request.XXXXXX")"
cat > "$payload" <&0

deploy() {
DEPLOYMENT=$1
Expand All @@ -14,7 +16,7 @@ deploy() {
[ -n "$IMAGE" ] || exit 1
[ -n "$CONTAINER" ] || exit 1

$KUBECTL set image deployment/$DEPLOYMENT $CONTAINER=$IMAGE
$KUBECTL set image "deployment/$DEPLOYMENT" "$CONTAINER=$IMAGE"
}

rollingupdate() {
Expand All @@ -24,7 +26,7 @@ rollingupdate() {
[ -n "$RC" ] || exit 1
[ -n "$IMAGE" ] || exit 1

$KUBECTL rolling-update rc/$RC --image=$IMAGE
$KUBECTL rolling-update "rc/$RC" --image="$IMAGE"
}

start_job() {
Expand All @@ -36,26 +38,26 @@ start_job() {
[ -n "$IMAGE" ] || exit 1
[ -n "$UID" ] || exit 1

cat $JOB | IMAGE=$IMAGE UID=$UID envsubst | $KUBECTL create -f -
cat "$JOB" | IMAGE=$IMAGE UID=$UID envsubst | $KUBECTL create -f -
}

DEBUG=$(jq -r .source.debug < /tmp/input)
DEBUG=$(jq -r .source.debug < "$payload")
[[ "$DEBUG" == "true" ]] && { echo "Enabling debug mode.";set -x; }

cd $1
cd "$1"

mkdir -p /root/.kube

KUBE_URL=$(jq -r .source.cluster_url < /tmp/input)
NAMESPACE=$(jq -r .source.namespace < /tmp/input)
KUBE_URL=$(jq -r .source.cluster_url < "$payload")
NAMESPACE=$(jq -r .source.namespace < "$payload")

KUBECTL="/usr/local/bin/kubectl --server=$KUBE_URL --namespace=$NAMESPACE"

# configure SSL Certs if available
if [[ "$KUBE_URL" =~ https.* ]]; then
KUBE_CA=$(jq -r .source.cluster_ca < /tmp/input)
KUBE_KEY=$(jq -r .source.admin_key < /tmp/input)
KUBE_CERT=$(jq -r .source.admin_cert < /tmp/input)
KUBE_CA=$(jq -r .source.cluster_ca < "$payload")
KUBE_KEY=$(jq -r .source.admin_key < "$payload")
KUBE_CERT=$(jq -r .source.admin_cert < "$payload")
CA_PATH="/root/.kube/ca.pem"
KEY_PATH="/root/.kube/key.pem"
CERT_PATH="/root/.kube/cert.pem"
Expand All @@ -68,24 +70,24 @@ if [[ "$KUBE_URL" =~ https.* ]]; then
fi

# get image name
IMG_FILE=$(jq -r .params.image_name < /tmp/input)
IMG=$(cat $IMG_FILE)
TAG_FILE=$(jq -r .params.image_tag < /tmp/input)
TAG=$(cat $TAG_FILE)
IMG_FILE=$(jq -r .params.image_name < "$payload")
IMG=$(cat "$IMG_FILE")
TAG_FILE=$(jq -r .params.image_tag < "$payload")
TAG=$(cat "$TAG_FILE")
IMG="$IMG:$TAG"

# get kube resource id
RESOURCE_TYPE=$(jq -r .source.resource_type < /tmp/input)
RESOURCE_NAME=$(jq -r .source.resource_name < /tmp/input)
RESOURCE_PATH=$(jq -r .params.resource_path < /tmp/input)
CONTAINER_NAME=$(jq -r .source.container_name < /tmp/input)
RESOURCE_TYPE=$(jq -r .source.resource_type < "$payload")
RESOURCE_NAME=$(jq -r .source.resource_name < "$payload")
RESOURCE_PATH=$(jq -r .params.resource_path < "$payload")
CONTAINER_NAME=$(jq -r .source.container_name < "$payload")

if [[ -z "$RESOURCE_TYPE" ]]; then
RESOURCE_TYPE=$(jq -r .params.resource_type < /tmp/input)
RESOURCE_TYPE=$(jq -r .params.resource_type < "$payload")
fi

if [[ -z "$RESOURCE_NAME" ]]; then
RESOURCE_TYPE=$(jq -r .params.resource_name < /tmp/input)
RESOURCE_TYPE=$(jq -r .params.resource_name < "$payload")
fi

if [[ "$CONTAINER_NAME" == "null" ]]; then
Expand All @@ -97,11 +99,11 @@ export KUBECTL
# do things
case $RESOURCE_TYPE in
deployment)
deploy $RESOURCE_NAME $CONTAINER_NAME $IMG;;
deploy "$RESOURCE_NAME" "$CONTAINER_NAME" "$IMG";;
replicationcontroller)
rollingupdate $RESOURCE_NAME $IMG;;
rollingupdate "$RESOURCE_NAME" "$IMG";;
job)
start_job $RESOURCE_PATH $IMG $(date +%s);;
start_job "$RESOURCE_PATH" "$IMG" "$(date +%s)";;
*)
exit 1
esac
Expand Down

0 comments on commit 581f942

Please sign in to comment.