Skip to content

Tweak some maintenance make targets #8618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
javorszky merged 8 commits into from
Dec 19, 2025
Merged

Tweak some maintenance make targets #8618

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
044ed5f
Tweak some maintenance make targets
javorszky Dec 5, 2025
a809045
Update snaps always so CI passes
javorszky Dec 17, 2025
a72d5e9
Clean docker builder cache before building images
javorszky Dec 17, 2025
88a981d
Add comment to govulncheck make target
javorszky Dec 17, 2025
0bd5e4b
staticcheck and govulncheck renovate config
javorszky Dec 17, 2025
6220a08
Merge branch 'main' into chore/makefile-tweaks-5.3.0
javorszky Dec 19, 2025
d47da05
Update renovate configs
javorszky Dec 19, 2025
0bbdd74
Merge branch 'main' into chore/makefile-tweaks-5.3.0
vepatel Dec 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ NAP_AGENT_VERSION ?= 2
NGINX_AGENT_VERSION ?= 3.6
PLUS_ARGS = --build-arg NGINX_PLUS_VERSION=$(NGINX_PLUS_VERSION) --secret id=nginx-repo.crt,src=nginx-repo.crt --secret id=nginx-repo.key,src=nginx-repo.key

# renovate: datasource=github-releases depName=dominikh/go-tools
STATICCHECK_VERSION ?= 2025.1.1

# renovate: datasource=github-releases depName=golang/vuln
GOVULNCHECK_VERSION ?= v1.1.4

# Variables that can be overridden
REGISTRY ?= ## The registry where the image is located.
PREFIX ?= nginx/nginx-ingress ## The name of the image. For example, nginx/nginx-ingress
Expand Down Expand Up @@ -79,16 +85,21 @@ format: ## Run goimports & gofmt

.PHONY: staticcheck
staticcheck: ## Run staticcheck linter
@staticcheck -version >/dev/null 2>&1 || go install honnef.co/go/tools/cmd/staticcheck@2022.1.3;
@staticcheck -version >/dev/null 2>&1 || go install honnef.co/go/tools/cmd/staticcheck@${STATICCHECK_VERSION};
staticcheck ./...

.PHONY: govulncheck
govulncheck: ## Run govulncheck linter
@govulncheck -version >/dev/null 2>&1 || go install golang.org/x/vuln/cmd/govulncheck@${GOVULNCHECK_VERSION};
govulncheck ./...

.PHONY: test
test: ## Run GoLang tests
go test -tags=aws,helmunit -shuffle=on ./...

.PHONY: test-update-snaps
test-update-snaps:
UPDATE_SNAPS=true go test -tags=aws,helmunit -shuffle=on ./...
UPDATE_SNAPS=always go test -tags=aws,helmunit -shuffle=on ./...

cover: ## Generate coverage report
go test -tags=aws,helmunit -shuffle=on -race -coverprofile=coverage.txt -covermode=atomic ./...
Expand Down Expand Up @@ -235,7 +246,12 @@ ubi-image-nap-dos-plus: build ## Create Docker image for Ingress Controller (UBI
--build-arg NAP_MODULES=waf,dos --build-arg NAP_WAF_VERSION=$(NAP_WAF_VERSION) --build-arg NAP_AGENT_VERSION=$(NAP_AGENT_VERSION)

.PHONY: all-images ## Create all the Docker images for Ingress Controller
all-images: alpine-image alpine-image-plus alpine-image-plus-fips alpine-image-nap-plus-fips debian-image debian-image-plus debian-image-nap-plus debian-image-dos-plus debian-image-nap-dos-plus ubi-image ubi-image-plus ubi-image-nap-plus ubi-image-dos-plus ubi-image-nap-dos-plus
all-images:
docker builder prune -af; \
images="alpine-image alpine-image-plus alpine-image-plus-fips alpine-image-nap-plus-fips debian-image debian-image-plus debian-image-nap-plus debian-image-dos-plus debian-image-nap-dos-plus ubi-image ubi-image-plus ubi-image-nap-plus ubi-image-dos-plus ubi-image-nap-dos-plus"; \
for img in $$images; do \
TAG="$(strip $(TAG))-$$img" make $$img; \
done

.PHONY: patch-os
patch-os: ## Patch supplied image
Expand Down