@@ -23,16 +23,19 @@ include $(ROOT_DIR_RELATIVE)/common.mk
23
23
export GO111MODULE =on
24
24
unexport GOPATH
25
25
26
+ # Enables shell script tracing. Enable by running: TRACE=1 make <target>
27
+ TRACE ?= 0
28
+
26
29
# Go
27
30
GO_VERSION ?= 1.22.7
28
31
29
32
# Directories.
30
33
ARTIFACTS ?= $(REPO_ROOT ) /_artifacts
31
34
TOOLS_DIR := hack/tools
35
+ BIN_DIR := bin
32
36
TOOLS_DIR_DEPS := $(TOOLS_DIR ) /go.sum $(TOOLS_DIR ) /go.mod $(TOOLS_DIR ) /Makefile
33
- TOOLS_BIN_DIR := $(TOOLS_DIR ) /bin
37
+ TOOLS_BIN_DIR := $(TOOLS_DIR ) /$( BIN_DIR )
34
38
35
- BIN_DIR := bin
36
39
REPO_ROOT := $(shell git rev-parse --show-toplevel)
37
40
GH_REPO ?= kubernetes-sigs/cluster-api-provider-openstack
38
41
TEST_E2E_DIR := test/e2e
@@ -49,6 +52,13 @@ GO_APIDIFF_VER := v0.8.2
49
52
GO_APIDIFF_BIN := go-apidiff
50
53
GO_APIDIFF_PKG := github.com/joelanford/go-apidiff
51
54
55
+ # govulncheck
56
+ GOVULNCHECK_VER := v1.1.4
57
+ GOVULNCHECK_BIN := govulncheck
58
+ GOVULNCHECK_PKG := golang.org/x/vuln/cmd/govulncheck
59
+
60
+ TRIVY_VER := 0.49.1
61
+
52
62
# Binaries.
53
63
CONTROLLER_GEN := $(TOOLS_BIN_DIR ) /controller-gen
54
64
CONVERSION_GEN := $(TOOLS_BIN_DIR ) /conversion-gen
@@ -63,6 +73,7 @@ RELEASE_NOTES := $(TOOLS_BIN_DIR)/release-notes
63
73
SETUP_ENVTEST := $(TOOLS_BIN_DIR ) /setup-envtest
64
74
GEN_CRD_API_REFERENCE_DOCS := $(TOOLS_BIN_DIR ) /gen-crd-api-reference-docs
65
75
GO_APIDIFF := $(TOOLS_BIN_DIR ) /$(GO_APIDIFF_BIN ) -$(GO_APIDIFF_VER )
76
+ GOVULNCHECK := $(TOOLS_BIN_DIR ) /$(GOVULNCHECK_BIN ) -$(GOVULNCHECK_VER )
66
77
67
78
# Kubebuilder
68
79
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.28.0
@@ -252,6 +263,12 @@ $(GO_APIDIFF_BIN): $(GO_APIDIFF)
252
263
$(GO_APIDIFF ) : # Build go-apidiff.
253
264
GOBIN=$(abspath $(TOOLS_BIN_DIR ) ) $(GO_INSTALL ) $(GO_APIDIFF_PKG ) $(GO_APIDIFF_BIN ) $(GO_APIDIFF_VER )
254
265
266
+ .PHONY : $(GOVULNCHECK_BIN )
267
+ $(GOVULNCHECK_BIN ) : $(GOVULNCHECK ) # # Build a local copy of govulncheck.
268
+
269
+ $(GOVULNCHECK ) : # Build govulncheck.
270
+ GOBIN=$(abspath $(TOOLS_BIN_DIR ) ) $(GO_INSTALL ) $(GOVULNCHECK_PKG ) $(GOVULNCHECK_BIN ) $(GOVULNCHECK_VER )
271
+
255
272
# # --------------------------------------
256
273
# #@ Linting
257
274
# # --------------------------------------
@@ -563,8 +580,12 @@ clean-temporary: ## Remove all temporary files and folders
563
580
clean-release : # # Remove the release folder
564
581
rm -rf $(RELEASE_DIR )
565
582
583
+ .PHONY : clean-release-git
584
+ clean-release-git : # # Restores the git files usually modified during a release
585
+ git restore ./* manager_image_patch.yaml ./* manager_pull_policy.yaml
586
+
566
587
.PHONY : verify
567
- verify : verify-boilerplate verify-modules verify-gen verify-orc
588
+ verify : verify-boilerplate verify-modules verify-gen verify-orc verify-govulncheck
568
589
569
590
.PHONY : verify-boilerplate
570
591
verify-boilerplate :
@@ -588,6 +609,27 @@ verify-gen: generate
588
609
verify-orc :
589
610
$(MAKE ) -C $(REPO_ROOT ) /orc verify-generated
590
611
612
+ .PHONY : verify-container-images
613
+ verify-container-images : # # Verify container images
614
+ TRACE=$(TRACE ) ./hack/verify-container-images.sh $(TRIVY_VER )
615
+
616
+ .PHONY : verify-govulncheck
617
+ verify-govulncheck : $(GOVULNCHECK ) # # Verify code for vulnerabilities
618
+ $(GOVULNCHECK ) ./... && R1=$$? || R1=$$? ; \
619
+ $(GOVULNCHECK ) -C " $( TOOLS_DIR) " ./... && R2=$$? || R2=$$? ; \
620
+ if [ " $$ R1" -ne " 0" ] || [ " $$ R2" -ne " 0" ]; then \
621
+ exit 1; \
622
+ fi
623
+
624
+ .PHONY : verify-security
625
+ verify-security : # # Verify code and images for vulnerabilities
626
+ $(MAKE ) verify-container-images && R1=$$? || R1=$$? ; \
627
+ $(MAKE ) verify-govulncheck && R2=$$? || R2=$$? ; \
628
+ if [ " $$ R1" -ne " 0" ] || [ " $$ R2" -ne " 0" ]; then \
629
+ echo " Check for vulnerabilities failed! There are vulnerabilities to be fixed" ; \
630
+ exit 1; \
631
+ fi
632
+
591
633
.PHONY : compile-e2e
592
634
compile-e2e : # # Test e2e compilation
593
635
go test -c -o /dev/null -tags=e2e ./test/e2e/suites/conformance
0 commit comments