Merge pull request #5268 from ElvinEfendi/do-not-require-go
do not require go for building
This commit is contained in:
commit
906e501f57
2 changed files with 14 additions and 6 deletions
15
Makefile
15
Makefile
|
@ -15,10 +15,6 @@
|
|||
# Add the following 'help' target to your Makefile
|
||||
# And add help text after each target name starting with '\#\#'
|
||||
|
||||
ifeq ($(shell which go >/dev/null 2>&1; echo $$?), 1)
|
||||
$(error Can't find 'go' in PATH, please fix and retry. See http://golang.org/doc/install for installation instructions.)
|
||||
endif
|
||||
|
||||
.DEFAULT_GOAL:=help
|
||||
|
||||
.EXPORT_ALL_VARIABLES:
|
||||
|
@ -59,7 +55,11 @@ PKG = k8s.io/ingress-nginx
|
|||
|
||||
BUSTED_ARGS =-v --pattern=_test
|
||||
|
||||
ARCH ?= $(shell go env GOARCH)
|
||||
HOST_ARCH = $(shell which go >/dev/null 2>&1 && go env GOARCH)
|
||||
ARCH ?= $(HOST_ARCH)
|
||||
ifeq ($(ARCH),)
|
||||
$(error mandatory variable ARCH is empty, either set it when calling the command or make sure 'go env GOARCH' works)
|
||||
endif
|
||||
|
||||
REGISTRY ?= quay.io/kubernetes-ingress-controller
|
||||
|
||||
|
@ -274,7 +274,12 @@ run-ingress-controller: ## Run the ingress controller locally using a kubectl pr
|
|||
|
||||
.PHONY: check-go-version
|
||||
check-go-version:
|
||||
ifeq ($(USE_DOCKER), true)
|
||||
@build/run-in-docker.sh \
|
||||
hack/check-go-version.sh
|
||||
else
|
||||
@hack/check-go-version.sh
|
||||
endif
|
||||
|
||||
.PHONY: init-docker-buildx
|
||||
init-docker-buildx:
|
||||
|
|
|
@ -43,7 +43,10 @@ KUBE_ROOT=$(cd $(dirname "${BASH_SOURCE}")/.. && pwd -P)
|
|||
FLAGS=$@
|
||||
|
||||
PKG=k8s.io/ingress-nginx
|
||||
ARCH=$(go env GOARCH)
|
||||
ARCH=${ARCH:-}
|
||||
if [[ -z "$ARCH" ]]; then
|
||||
ARCH=$(go env GOARCH)
|
||||
fi
|
||||
|
||||
# create output directory as current user to avoid problem with docker.
|
||||
mkdir -p "${KUBE_ROOT}/bin" "${KUBE_ROOT}/bin/${ARCH}"
|
||||
|
|
Loading…
Reference in a new issue