Skip to content

Commit

Permalink
Clean up kapp-deploy and kapp-delete in line with shellcheck
Browse files Browse the repository at this point in the history
  • Loading branch information
edwardecook committed Jul 27, 2020
1 parent 1d62a64 commit cf36aaf
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 13 deletions.
2 changes: 0 additions & 2 deletions scripts/kapp-delete
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/usr/bin/env bash

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"

set -euo pipefail

NAMESPACE="${NAMESPACE:-"projects-operator"}"
Expand Down
22 changes: 11 additions & 11 deletions scripts/kapp-deploy
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,19 @@ if [[ $# -eq 1 && "$1" =~ "--local" ]]; then
LOCAL_YTT_FLAGS="-f ${DIR}/../build/kbld.yaml"
fi

ytt -f $DIR/../deployments/k8s $LOCAL_YTT_FLAGS \
-v name=$NAME \
-v instance=$INSTANCE \
-v namespace=$NAMESPACE \
-v version=$VERSION \
-v registry.hostname=$REGISTRY_HOSTNAME \
-v registry.project=$REGISTRY_PROJECT \
-v registry.username=$REGISTRY_USERNAME \
ytt -f "$DIR"/../deployments/k8s $LOCAL_YTT_FLAGS \
-v name="$NAME" \
-v instance="$INSTANCE" \
-v namespace="$NAMESPACE" \
-v version="$VERSION" \
-v registry.hostname="$REGISTRY_HOSTNAME" \
-v registry.project="$REGISTRY_PROJECT" \
-v registry.username="$REGISTRY_USERNAME" \
-v registry.password="$REGISTRY_PASSWORD" \
-v registry.secretName=$REGISTRY_SECRET_NAME \
-v clusterRoleRef=$CLUSTER_ROLE_REF \
-v registry.secretName="$REGISTRY_SECRET_NAME" \
-v clusterRoleRef="$CLUSTER_ROLE_REF" \
--data-value-file tls.cert=/tmp/webhook-server-tls.crt \
--data-value-file tls.key=/tmp/webhook-server-tls.key \
--data-value-file caCert=/tmp/ca.pem | \
kbld $LOCAL_KBLD_FLAGS -f - | \
kapp deploy -y -a projects-operator -n $NAMESPACE -f -
kapp deploy -y -a projects-operator -n "$NAMESPACE" -f -

0 comments on commit cf36aaf

Please sign in to comment.