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

Remove unused variables and verbose e2e logs

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2020-06-27 11:57:00 -04:00
parent 47b5e20a88
commit 10dcf0db15
35 changed files with 331 additions and 427 deletions
Download patch file Download diff file Expand all files Collapse all files

66
Makefile
View file

@ -29,22 +29,11 @@ SHELL=/bin/bash -o pipefail -o errexit
# Use the 0.0 tag for testing, it shouldn't clobber any release builds
TAG ?= 0.33.0
# Use docker to run makefile tasks
USE_DOCKER ?= true
# Disable run docker tasks if running in prow.
# only checks the existence of the variable, not the value.
ifdef DIND_TASKS
USE_DOCKER=false
endif
# e2e settings
# Allow limiting the scope of the e2e tests. By default run everything
FOCUS ?= .*
# number of parallel test
E2E_NODES ?= 10
# slow test only if takes > 50s
SLOW_E2E_THRESHOLD ?= 50
E2E_NODES ?= 6
# run e2e test suite with tests that check for memory leaks? (default is false)
E2E_CHECK_LEAKS ?=
@ -84,8 +73,7 @@ clean-image: ## Removes local image
@docker rmi -f $(REGISTRY)/nginx-ingress-controller:$(TAG) || true
.PHONY: build
build: check-go-version ## Build ingress controller, debug tool and pre-stop hook.
ifeq ($(USE_DOCKER), true)
build: ## Build ingress controller, debug tool and pre-stop hook.
@build/run-in-docker.sh \
PKG=$(PKG) \
ARCH=$(ARCH) \
@ -94,13 +82,9 @@ ifeq ($(USE_DOCKER), true)
TAG=$(TAG) \
GOBUILD_FLAGS=$(GOBUILD_FLAGS) \
build/build.sh
else
@build/build.sh
endif
.PHONY: build-plugin
build-plugin: check-go-version ## Build ingress-nginx krew plugin.
ifeq ($(USE_DOCKER), true)
build-plugin: ## Build ingress-nginx krew plugin.
@build/run-in-docker.sh \
PKG=$(PKG) \
ARCH=$(ARCH) \
@ -109,9 +93,6 @@ ifeq ($(USE_DOCKER), true)
TAG=$(TAG) \
GOBUILD_FLAGS=$(GOBUILD_FLAGS) \
build/build-plugin.sh
else
@build/build-plugin.sh
endif
.PHONY: clean
clean: ## Remove .gocache directory.
@ -119,16 +100,11 @@ clean: ## Remove .gocache directory.
.PHONY: static-check
static-check: ## Run verification script for boilerplate, codegen, gofmt, golint, lualint and chart-lint.
ifeq ($(USE_DOCKER), true)
@build/run-in-docker.sh \
hack/verify-all.sh
else
@hack/verify-all.sh
endif
.PHONY: test
test: check-go-version ## Run go unit tests.
ifeq ($(USE_DOCKER), true)
test: ## Run go unit tests.
@build/run-in-docker.sh \
PKG=$(PKG) \
ARCH=$(ARCH) \
@ -137,32 +113,21 @@ ifeq ($(USE_DOCKER), true)
TAG=$(TAG) \
GOBUILD_FLAGS=$(GOBUILD_FLAGS) \
build/test.sh
else
@build/test.sh
endif
.PHONY: lua-test
lua-test: ## Run lua unit tests.
ifeq ($(USE_DOCKER), true)
@build/run-in-docker.sh \
BUSTED_ARGS=$(BUSTED_ARGS) \
build/test-lua.sh
else
@build/test-lua.sh
endif
.PHONY: e2e-test
e2e-test: check-go-version ## Run e2e tests (expects access to a working Kubernetes cluster).
e2e-test: ## Run e2e tests (expects access to a working Kubernetes cluster).
@build/run-e2e-suite.sh
.PHONY: e2e-test-binary
e2e-test-binary: check-go-version ## Build ginkgo binary for e2e tests.
ifeq ($(USE_DOCKER), true)
e2e-test-binary: ## Build binary for e2e tests.
@build/run-in-docker.sh \
ginkgo build ./test/e2e
else
@ginkgo build ./test/e2e
endif
.PHONY: print-e2e-suite
print-e2e-suite: e2e-test-binary ## Prints information about the suite of e2e tests.
@ -170,7 +135,7 @@ print-e2e-suite: e2e-test-binary ## Prints information about the suite of e2e te
hack/print-e2e-suite.sh
.PHONY: cover
cover: check-go-version ## Run go coverage unit tests.
cover: ## Run go coverage unit tests.
@build/cover.sh
echo "Uploading coverage results..."
@curl -s https://codecov.io/bash | bash
@ -187,7 +152,7 @@ check_dead_links: ## Check if the documentation contains dead links.
--allow-redirect $(shell find $$PWD -mindepth 1 -name "*.md" -printf '%P\n' | grep -v vendor | grep -v Changelog.md)
.PHONY: dev-env
dev-env: check-go-version ## Starts a local Kubernetes cluster using kind, building and deploying the ingress controller.
dev-env: ## Starts a local Kubernetes cluster using kind, building and deploying the ingress controller.
@build/dev-env.sh
.PHONY: dev-env-stop
@ -202,7 +167,7 @@ live-docs: ## Build and launch a local copy of the documentation website in http
squidfunk/mkdocs-material:5.2.3
.PHONY: misspell
misspell: check-go-version ## Check for spelling errors.
misspell: ## Check for spelling errors.
@go get github.com/client9/misspell/cmd/misspell
misspell \
-locale US \
@ -210,7 +175,7 @@ misspell: check-go-version ## Check for spelling errors.
cmd/* internal/* deploy/* docs/* design/* test/* README.md
.PHONY: kind-e2e-test
kind-e2e-test: check-go-version ## Run e2e tests using kind.
kind-e2e-test: ## Run e2e tests using kind.
@test/e2e/run.sh
.PHONY: kind-e2e-chart-tests
@ -221,20 +186,9 @@ kind-e2e-chart-tests: ## Run helm chart e2e tests
run-ingress-controller: ## Run the ingress controller locally using a kubectl proxy connection.
@build/run-ingress-controller.sh
.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: ensure-buildx
ensure-buildx:
ifeq ($(DIND_TASKS),)
./hack/init-buildx.sh
endif
.PHONY: show-version
show-version: