DevFW-CICD/ingress-nginx-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5268 from ElvinEfendi/do-not-require-go

Browse source 
do not require go for building
This commit is contained in:
Kubernetes Prow Robot 2020-03-19 06:37:23 -07:00 committed by GitHub
commit 906e501f57
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Makefile
View file

@ -15,10 +15,6 @@
# Add the following 'help' target to your Makefile # Add the following 'help' target to your Makefile
# And add help text after each target name starting with '\#\#' # 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 .DEFAULT_GOAL:=help
.EXPORT_ALL_VARIABLES: .EXPORT_ALL_VARIABLES:
@ -59,7 +55,11 @@ PKG = k8s.io/ingress-nginx
BUSTED_ARGS =-v --pattern=_test 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 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 .PHONY: check-go-version
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 @hack/check-go-version.sh
endif
.PHONY: init-docker-buildx .PHONY: init-docker-buildx
init-docker-buildx: init-docker-buildx:

3
build/run-in-docker.sh
View file

@ -43,7 +43,10 @@ KUBE_ROOT=$(cd $(dirname "${BASH_SOURCE}")/.. && pwd -P)
FLAGS=$@ FLAGS=$@
PKG=k8s.io/ingress-nginx PKG=k8s.io/ingress-nginx
ARCH=${ARCH:-}
if [[ -z "$ARCH" ]]; then
ARCH=$(go env GOARCH) ARCH=$(go env GOARCH)
fi
# create output directory as current user to avoid problem with docker. # create output directory as current user to avoid problem with docker.
mkdir -p "${KUBE_ROOT}/bin" "${KUBE_ROOT}/bin/${ARCH}" mkdir -p "${KUBE_ROOT}/bin" "${KUBE_ROOT}/bin/${ARCH}"