From 94593802f2cb070d24c8c150bbee455cda658c08 Mon Sep 17 00:00:00 2001 From: Tim Ramlot <42113979+inteon@users.noreply.github.com> Date: Wed, 17 Sep 2025 22:56:34 +0200 Subject: [PATCH 1/2] fix warnings in makefiles Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.com> --- make/00_mod.mk | 2 ++ make/02_mod.mk | 48 ++++++++++++++++++++++++++------------------- make/extra_tools.mk | 29 --------------------------- 3 files changed, 30 insertions(+), 49 deletions(-) diff --git a/make/00_mod.mk b/make/00_mod.mk index 2e08f20a..d423b26c 100644 --- a/make/00_mod.mk +++ b/make/00_mod.mk @@ -6,6 +6,8 @@ repo_name := github.com/jetstack/jetstack-secure # third-party modules. generate-golangci-lint-config: repo_name := github.com/jetstack/preflight +OCI_BASE ?= # default to an empty value to avoid warnings + license_ignore := gitlab.com/venafi,github.com/jetstack kind_cluster_name := preflight diff --git a/make/02_mod.mk b/make/02_mod.mk index 4eefde13..25bf1602 100644 --- a/make/02_mod.mk +++ b/make/02_mod.mk @@ -1,6 +1,5 @@ include make/test-unit.mk include make/ark/02_mod.mk -include make/extra_tools.mk GITHUB_OUTPUT ?= /dev/stderr .PHONY: release @@ -77,22 +76,31 @@ helm-plugins: $(NEEDS_HELM) echo "helm-diff plugin already installed"; \ fi -.PHONY: verify-govulncheck -## Verify all Go modules for vulnerabilities using govulncheck Copied from makefile-modules -## @category [shared] Generate/ Verify -# -# Runs `govulncheck` on all Go modules related to the project. -# Ignores Go modules among the temporary build artifacts in _bin, to avoid -# scanning the code of the vendored Go, after running make vendor-go. -# Ignores Go modules in make/_shared, because those will be checked in centrally -# in the makefile_modules repository. -verify-govulncheck: | $(NEEDS_GOVULNCHECK) - @find . -name go.mod -not \( -path "./$(bin_dir)/*" -or -path "./make/_shared/*" \) \ - | while read d; do \ - target=$$(dirname $${d}); \ - echo "Running 'GOTOOLCHAIN=go$(VENDORED_GO_VERSION) $(bin_dir)/tools/govulncheck ./...' in directory '$${target}'"; \ - pushd "$${target}" >/dev/null; \ - GOTOOLCHAIN=go$(VENDORED_GO_VERSION) $(GOVULNCHECK) ./... || exit; \ - popd >/dev/null; \ - echo ""; \ - done +# https://docs.venafi.cloud/vaas/venctl/c-venctl-releases/ +venctl_linux_amd64_SHA256SUM=26e7b7a7e134f1cf1f3ffacf4ae53ec6849058db5007ce4088d51f404ededb4a +venctl_darwin_amd64_SHA256SUM=2e76693901abcb2c018f66d3a10558c66ca09d1a3be912258bcd6c58e89aae80 +venctl_darwin_arm64_SHA256SUM=4350912d67683773302655e2a0151320514d1ccf82ee99c895e6780f86b6f031 + +.PRECIOUS: $(DOWNLOAD_DIR)/tools/venctl@$(VENCTL_VERSION)_$(HOST_OS)_$(HOST_ARCH) +$(DOWNLOAD_DIR)/tools/venctl@$(VENCTL_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD_DIR)/tools + @source $(lock_script) $@; \ + $(CURL) https://dl.venafi.cloud/venctl/$(VENCTL_VERSION)/venctl-$(HOST_OS)-$(HOST_ARCH).zip -o $(outfile).zip; \ + $(checkhash_script) $(outfile).zip $(venctl_$(HOST_OS)_$(HOST_ARCH)_SHA256SUM); \ + unzip -p $(outfile).zip venctl > $(outfile); \ + chmod +x $(outfile); \ + rm -f $(outfile).zip + +# https://github.com/smallstep/cli/releases/ +step_linux_amd64_SHA256SUM=2908f3c7d90181eec430070b231da5c0861e37537bf8e2388d031d3bd6c7b8c6 +step_linux_arm64_SHA256SUM=96636a6cc980d53a98c72aa3b99e04f0b874a733d9ddf43fc6b0f1725f425c37 +step_darwin_amd64_SHA256SUM=f6e9a9078cfc5f559c8213e023df6e8ebf8d9d36ffbd82749a41ee1c40a23623 +step_darwin_arm64_SHA256SUM=b856702ee138a9badbe983e88758c0330907ea4f97e429000334ba038597db5b + +.PRECIOUS: $(DOWNLOAD_DIR)/tools/step@$(STEP_VERSION)_$(HOST_OS)_$(HOST_ARCH) +$(DOWNLOAD_DIR)/tools/step@$(STEP_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD_DIR)/tools + @source $(lock_script) $@; \ + $(CURL) https://dl.smallstep.com/gh-release/cli/gh-release-header/v$(STEP_VERSION)/step_$(HOST_OS)_$(STEP_VERSION)_$(HOST_ARCH).tar.gz -o $(outfile).tar.gz; \ + $(checkhash_script) $(outfile).tar.gz $(step_$(HOST_OS)_$(HOST_ARCH)_SHA256SUM); \ + tar xfO $(outfile).tar.gz step_$(STEP_VERSION)/bin/step > $(outfile); \ + chmod +x $(outfile); \ + rm -f $(outfile).tar.gz diff --git a/make/extra_tools.mk b/make/extra_tools.mk index 75584594..5c61c07e 100644 --- a/make/extra_tools.mk +++ b/make/extra_tools.mk @@ -7,32 +7,3 @@ ADDITIONAL_GO_DEPENDENCIES += helm-unittest=github.com/helm-unittest/helm-unitte ADDITIONAL_TOOLS += venctl=1.16.0 ADDITIONAL_TOOLS += step=0.28.2 - -# https://docs.venafi.cloud/vaas/venctl/c-venctl-releases/ -venctl_linux_amd64_SHA256SUM=26e7b7a7e134f1cf1f3ffacf4ae53ec6849058db5007ce4088d51f404ededb4a -venctl_darwin_amd64_SHA256SUM=2e76693901abcb2c018f66d3a10558c66ca09d1a3be912258bcd6c58e89aae80 -venctl_darwin_arm64_SHA256SUM=4350912d67683773302655e2a0151320514d1ccf82ee99c895e6780f86b6f031 - -.PRECIOUS: $(DOWNLOAD_DIR)/tools/venctl@$(VENCTL_VERSION)_$(HOST_OS)_$(HOST_ARCH) -$(DOWNLOAD_DIR)/tools/venctl@$(VENCTL_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD_DIR)/tools - @source $(lock_script) $@; \ - $(CURL) https://dl.venafi.cloud/venctl/$(VENCTL_VERSION)/venctl-$(HOST_OS)-$(HOST_ARCH).zip -o $(outfile).zip; \ - $(checkhash_script) $(outfile).zip $(venctl_$(HOST_OS)_$(HOST_ARCH)_SHA256SUM); \ - unzip -p $(outfile).zip venctl > $(outfile); \ - chmod +x $(outfile); \ - rm -f $(outfile).zip - -# https://github.com/smallstep/cli/releases/ -step_linux_amd64_SHA256SUM=2908f3c7d90181eec430070b231da5c0861e37537bf8e2388d031d3bd6c7b8c6 -step_linux_arm64_SHA256SUM=96636a6cc980d53a98c72aa3b99e04f0b874a733d9ddf43fc6b0f1725f425c37 -step_darwin_amd64_SHA256SUM=f6e9a9078cfc5f559c8213e023df6e8ebf8d9d36ffbd82749a41ee1c40a23623 -step_darwin_arm64_SHA256SUM=b856702ee138a9badbe983e88758c0330907ea4f97e429000334ba038597db5b - -.PRECIOUS: $(DOWNLOAD_DIR)/tools/step@$(STEP_VERSION)_$(HOST_OS)_$(HOST_ARCH) -$(DOWNLOAD_DIR)/tools/step@$(STEP_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD_DIR)/tools - @source $(lock_script) $@; \ - $(CURL) https://dl.smallstep.com/gh-release/cli/gh-release-header/v$(STEP_VERSION)/step_$(HOST_OS)_$(STEP_VERSION)_$(HOST_ARCH).tar.gz -o $(outfile).tar.gz; \ - $(checkhash_script) $(outfile).tar.gz $(step_$(HOST_OS)_$(HOST_ARCH)_SHA256SUM); \ - tar xfO $(outfile).tar.gz step_$(STEP_VERSION)/bin/step > $(outfile); \ - chmod +x $(outfile); \ - rm -f $(outfile).tar.gz \ No newline at end of file From 7a04bca579681816842890adf89448b9850c7550 Mon Sep 17 00:00:00 2001 From: Mladen Rusev Date: Thu, 18 Sep 2025 13:16:03 +0300 Subject: [PATCH 2/2] adding extra empty line to see if the e2e job will start on commit --- make/extra_tools.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/make/extra_tools.mk b/make/extra_tools.mk index 5c61c07e..8b2b8cce 100644 --- a/make/extra_tools.mk +++ b/make/extra_tools.mk @@ -7,3 +7,4 @@ ADDITIONAL_GO_DEPENDENCIES += helm-unittest=github.com/helm-unittest/helm-unitte ADDITIONAL_TOOLS += venctl=1.16.0 ADDITIONAL_TOOLS += step=0.28.2 +