Merge pull request #35 from cert-manager/self-upgrade

[CI] Merge self-upgrade into main
cert-manager · Mar 18, 2024 · f5f4439 · f5f4439
2 parents 9ead175 + 11e4bb4
commit f5f4439
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/klone.yaml b/klone.yaml
@@ -10,40 +10,40 @@ targets:
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: bfb9591e1ef2c8dc23069f6ecc426d71978739c5
+      repo_hash: caaef09569dec46733ee1c1e9c79198872f6ff9a
       repo_path: modules/boilerplate
     - folder_name: cert-manager
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: bfb9591e1ef2c8dc23069f6ecc426d71978739c5
+      repo_hash: caaef09569dec46733ee1c1e9c79198872f6ff9a
       repo_path: modules/cert-manager
     - folder_name: executable
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: bfb9591e1ef2c8dc23069f6ecc426d71978739c5
+      repo_hash: caaef09569dec46733ee1c1e9c79198872f6ff9a
       repo_path: modules/executable
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: bfb9591e1ef2c8dc23069f6ecc426d71978739c5
+      repo_hash: caaef09569dec46733ee1c1e9c79198872f6ff9a
       repo_path: modules/generate-verify
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: bfb9591e1ef2c8dc23069f6ecc426d71978739c5
+      repo_hash: caaef09569dec46733ee1c1e9c79198872f6ff9a
       repo_path: modules/help
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: bfb9591e1ef2c8dc23069f6ecc426d71978739c5
+      repo_hash: caaef09569dec46733ee1c1e9c79198872f6ff9a
       repo_path: modules/klone
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: bfb9591e1ef2c8dc23069f6ecc426d71978739c5
+      repo_hash: caaef09569dec46733ee1c1e9c79198872f6ff9a
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: bfb9591e1ef2c8dc23069f6ecc426d71978739c5
+      repo_hash: caaef09569dec46733ee1c1e9c79198872f6ff9a
       repo_path: modules/tools
diff --git a/make/_shared/tools/00_mod.mk b/make/_shared/tools/00_mod.mk
@@ -110,6 +110,8 @@ TOOLS += cmctl=2f75014a7c360c319f8c7c8afe8e9ce33fe26dca
 TOOLS += cmrel=fa10147dadc8c36718b7b08aed6d8c6418eb2
 # https://github.com/golangci/golangci-lint/releases
 TOOLS += golangci-lint=v1.55.2
+# https://pkg.go.dev/golang.org/x/vuln?tab=versions
+TOOLS += govulncheck=v1.0.4
 
 # https://pkg.go.dev/k8s.io/code-generator/cmd?tab=versions
 K8S_CODEGEN_VERSION=v0.29.1
@@ -308,6 +310,7 @@ GO_DEPENDENCIES += helm-tool=github.com/cert-manager/helm-tool
 GO_DEPENDENCIES += cmctl=github.com/cert-manager/cmctl/v2
 GO_DEPENDENCIES += cmrel=github.com/cert-manager/release/cmd/cmrel
 GO_DEPENDENCIES += golangci-lint=github.com/golangci/golangci-lint/cmd/golangci-lint
+GO_DEPENDENCIES += govulncheck=golang.org/x/vuln/cmd/govulncheck
 
 #################
 # go build tags #
@@ -565,7 +568,7 @@ $(bin_dir)/downloaded/tools/rclone@$(RCLONE_VERSION)_%: | $(bin_dir)/downloaded/
 # That means we need to pass vendor-go at the top level if go is not installed (i.e. "make vendor-go abc")
 
 MISSING=$(shell (command -v curl >/dev/null || echo curl) \
-             && (command -v sha256sum >/dev/null || echo sha256sum) \
+             && (command -v sha256sum >/dev/null || command -v shasum >/dev/null || echo sha256sum) \
              && (command -v git >/dev/null || echo git) \
              && ([ -n "$(findstring vendor-go,$(MAKECMDGOALS),)" ] \
                 || command -v $(GO) >/dev/null || echo "$(GO) (or run 'make vendor-go')") \

diff --git a/make/_shared/tools/util/hash.sh b/make/_shared/tools/util/hash.sh
@@ -19,4 +19,7 @@ set -eu -o pipefail
 # This script is a wrapper for outputting purely the sha256 hash of the input file,
 # ideally in a portable way.
 
-sha256sum "$1" | cut -d" " -f1
+case "$(uname -s)" in
+    Darwin*)    shasum -a 256 "$1";;
+    *)          sha256sum "$1" 
+esac | cut -d" " -f1