Fix shellcheck lints in dev-env.sh

This commit is contained in:
Andreas Sommer 2019-11-21 10:23:19 +01:00
parent 59a97535e6
commit 885cdb2ac1

View file

@ -37,11 +37,12 @@ test $(minikube status | grep -c Running) -ge 2 && $(minikube status | grep -q '
--extra-config=kubelet.sync-frequency=1s \ --extra-config=kubelet.sync-frequency=1s \
--extra-config=apiserver.authorization-mode=RBAC --extra-config=apiserver.authorization-mode=RBAC
# shellcheck disable=SC2046
eval $(minikube docker-env --shell bash) eval $(minikube docker-env --shell bash)
echo "[dev-env] building container" echo "[dev-env] building container"
make build container make build container
docker tag "${REGISTRY}/nginx-ingress-controller-${ARCH}:${TAG}" ${DEV_IMAGE} docker tag "${REGISTRY}/nginx-ingress-controller-${ARCH}:${TAG}" "${DEV_IMAGE}"
# kubectl >= 1.14 includes Kustomize via "apply -k". Makes it easier to use on Linux as well, assuming kubectl installed # kubectl >= 1.14 includes Kustomize via "apply -k". Makes it easier to use on Linux as well, assuming kubectl installed
KUBE_CLIENT_VERSION=$(kubectl version --client --short | awk '{print $3}' | cut -d. -f2) || true KUBE_CLIENT_VERSION=$(kubectl version --client --short | awk '{print $3}' | cut -d. -f2) || true
@ -56,7 +57,7 @@ if ! kubectl get namespace "${NAMESPACE}"; then
kubectl create namespace "${NAMESPACE}" kubectl create namespace "${NAMESPACE}"
fi fi
kubectl get deploy nginx-ingress-controller -n ${NAMESPACE} && kubectl delete deploy nginx-ingress-controller -n ${NAMESPACE} kubectl get deploy nginx-ingress-controller -n "${NAMESPACE}" && kubectl delete deploy nginx-ingress-controller -n "${NAMESPACE}"
ROOT=./deploy/minikube ROOT=./deploy/minikube