Merge pull request #4290 from mdonkers/make-dev-env-linux

Make dev-env.sh script work on Linux
This commit is contained in:
Kubernetes Prow Robot 2019-07-08 16:10:02 -07:00 committed by GitHub
commit 3261866095
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -47,10 +47,14 @@ make build container
docker save "${DEV_IMAGE}" | (eval $(minikube docker-env --shell bash) && docker load) || true docker save "${DEV_IMAGE}" | (eval $(minikube docker-env --shell bash) && docker load) || true
for tool in kubectl kustomize; do # kubectl >= 1.14 includes Kustomize via "apply -k". Makes it easier to use on Linux as well, assuming kubectl installed
echo "[dev-env] installing $tool" KUBE_CLIENT_VERSION=$(kubectl version --client --short | awk '{print $3}' | cut -d. -f2) || true
$tool version || brew install $tool if [[ ${KUBE_CLIENT_VERSION} -lt 14 ]]; then
done for tool in kubectl kustomize; do
echo "[dev-env] installing $tool"
$tool version || brew install $tool
done
fi
if ! kubectl get namespace "${NAMESPACE}"; then if ! kubectl get namespace "${NAMESPACE}"; then
kubectl create namespace "${NAMESPACE}" kubectl create namespace "${NAMESPACE}"
@ -58,10 +62,18 @@ fi
ROOT=./deploy/minikube ROOT=./deploy/minikube
pushd $ROOT if [[ ${KUBE_CLIENT_VERSION} -lt 14 ]]; then
kustomize edit set namespace "${NAMESPACE}" pushd $ROOT
kustomize edit set image "quay.io/kubernetes-ingress-controller/nginx-ingress-controller=${DEV_IMAGE}" kustomize edit set namespace "${NAMESPACE}"
popd kustomize edit set image "quay.io/kubernetes-ingress-controller/nginx-ingress-controller=${DEV_IMAGE}"
popd
echo "[dev-env] deploying NGINX Ingress controller in namespace $NAMESPACE" echo "[dev-env] deploying NGINX Ingress controller in namespace $NAMESPACE"
kustomize build $ROOT | kubectl apply -f - kustomize build $ROOT | kubectl apply -f -
else
sed -i "\\|^namespace:|c \\namespace: ${NAMESPACE}" "${ROOT}/kustomization.yaml"
sed -i "\\|^- name: quay.io|c \\- name: quay.io/kubernetes-ingress-controller/nginx-ingress-controller=${DEV_IMAGE}" "${ROOT}/kustomization.yaml"
echo "[dev-env] deploying NGINX Ingress controller in namespace $NAMESPACE"
kubectl apply -k "${ROOT}"
fi