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

Remove copy of binaries and deprecated e2e task

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2020-06-02 16:59:34 -04:00
parent a34268851e
commit 2b17980e3c
4 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Makefile
View file

@ -74,7 +74,6 @@ help: ## Display this help
.PHONY: image .PHONY: image
image: clean-image ## Build image for a particular arch. image: clean-image ## Build image for a particular arch.
echo "Building docker image ($(ARCH))..." echo "Building docker image ($(ARCH))..."
@cp -R bin/ rootfs/bin
@docker build \ @docker build \
--no-cache \ --no-cache \
--build-arg BASE_IMAGE="$(BASE_IMAGE)" \ --build-arg BASE_IMAGE="$(BASE_IMAGE)" \
@ -159,10 +158,6 @@ endif
e2e-test: check-go-version ## Run e2e tests (expects access to a working Kubernetes cluster). e2e-test: check-go-version ## Run e2e tests (expects access to a working Kubernetes cluster).
@build/run-e2e-suite.sh @build/run-e2e-suite.sh
.PHONY: e2e-test-image
e2e-test-image: ## Build image for e2e tests.
@make -C test/e2e-image
.PHONY: e2e-test-binary .PHONY: e2e-test-binary
e2e-test-binary: check-go-version ## Build ginkgo binary for e2e tests. e2e-test-binary: check-go-version ## Build ginkgo binary for e2e tests.
ifeq ($(USE_DOCKER), true) ifeq ($(USE_DOCKER), true)
@ -265,9 +260,7 @@ COMMA := ,
.PHONY: release # Build a multi-arch docker image .PHONY: release # Build a multi-arch docker image
release: init-docker-buildx clean release: init-docker-buildx clean
echo "Building binaries..." echo "Building binaries..."
$(foreach PLATFORM,$(PLATFORMS), ARCH=$(PLATFORM) make build;) $(foreach PLATFORM,$(PLATFORMS), echo -n "$(PLATFORM)..."; ARCH=$(PLATFORM) make build;)
@cp -R bin/ rootfs/bin
echo "Building and pushing ingress-nginx image..." echo "Building and pushing ingress-nginx image..."
@docker buildx build \ @docker buildx build \

6
build/build.sh
View file

@ -51,18 +51,18 @@ go build \
-X ${PKG}/version.RELEASE=${TAG} \ -X ${PKG}/version.RELEASE=${TAG} \
-X ${PKG}/version.COMMIT=${GIT_COMMIT} \ -X ${PKG}/version.COMMIT=${GIT_COMMIT} \
-X ${PKG}/version.REPO=${REPO_INFO}" \ -X ${PKG}/version.REPO=${REPO_INFO}" \
-o "bin/${ARCH}/nginx-ingress-controller" "${PKG}/cmd/nginx" -o "rootfs/bin/${ARCH}/nginx-ingress-controller" "${PKG}/cmd/nginx"
go build \ go build \
-ldflags "-s -w \ -ldflags "-s -w \
-X ${PKG}/version.RELEASE=${TAG} \ -X ${PKG}/version.RELEASE=${TAG} \
-X ${PKG}/version.COMMIT=${GIT_COMMIT} \ -X ${PKG}/version.COMMIT=${GIT_COMMIT} \
-X ${PKG}/version.REPO=${REPO_INFO}" \ -X ${PKG}/version.REPO=${REPO_INFO}" \
-o "bin/${ARCH}/dbg" "${PKG}/cmd/dbg" -o "rootfs/bin/${ARCH}/dbg" "${PKG}/cmd/dbg"
go build \ go build \
-ldflags "-s -w \ -ldflags "-s -w \
-X ${PKG}/version.RELEASE=${TAG} \ -X ${PKG}/version.RELEASE=${TAG} \
-X ${PKG}/version.COMMIT=${GIT_COMMIT} \ -X ${PKG}/version.COMMIT=${GIT_COMMIT} \
-X ${PKG}/version.REPO=${REPO_INFO}" \ -X ${PKG}/version.REPO=${REPO_INFO}" \
-o "bin/${ARCH}/wait-shutdown" "${PKG}/cmd/waitshutdown" -o "rootfs/bin/${ARCH}/wait-shutdown" "${PKG}/cmd/waitshutdown"

2
docs/development.md
View file

@ -76,7 +76,7 @@ To find the registry simply run: `docker system info | grep Registry`
The e2e test image can also be built through the Makefile. The e2e test image can also be built through the Makefile.
```console ```console
$ make e2e-test-image $ make -C test/e2e-image image
``` ```
You can then make this image available on your minikube host by exporting the image and loading it with the minikube docker context: You can then make this image available on your minikube host by exporting the image and loading it with the minikube docker context:

6
test/e2e/run.sh
View file

@ -63,7 +63,7 @@ export K8S_VERSION=${K8S_VERSION:-v1.18.0@sha256:0e20578828edd939d25eb98496a685c
export DOCKER_CLI_EXPERIMENTAL=enabled export DOCKER_CLI_EXPERIMENTAL=enabled
KIND_CLUSTER_NAME="ingress-nginx-dev" export KIND_CLUSTER_NAME=${KIND_CLUSTER_NAME:-ingress-nginx-dev}
echo "[dev-env] creating Kubernetes cluster with kind" echo "[dev-env] creating Kubernetes cluster with kind"
@ -81,8 +81,8 @@ kubectl get nodes -o wide
echo "[dev-env] building image" echo "[dev-env] building image"
export EXIT_CODE=-1 export EXIT_CODE=-1
echo " echo "
make -C ${DIR}/../../ build image make -C ${DIR}/../../ clean-image build image
make -C ${DIR}/../../ e2e-test-image make -C ${DIR}/../e2e-image image
make -C ${DIR}/../../images/fastcgi-helloserver/ GO111MODULE=\"on\" build image make -C ${DIR}/../../images/fastcgi-helloserver/ GO111MODULE=\"on\" build image
make -C ${DIR}/../../images/httpbin/ image make -C ${DIR}/../../images/httpbin/ image
make -C ${DIR}/../../images/echo/ image make -C ${DIR}/../../images/echo/ image