BOT: run 'make upgrade-klone' and 'make generate'

Signed-off-by: cert-manager-bot <[email protected]>
cert-manager · May 1, 2024 · d172499 · d172499
1 parent ac88cca
commit d172499
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 21 deletions.
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -30,8 +30,6 @@ linters:
     - gocritic
     - gofmt
     - goheader
-    - gomoddirectives
-    - gomodguard
     - goprintffuncname
     - gosec
     - gosimple

diff --git a/klone.yaml b/klone.yaml
@@ -9,60 +9,60 @@ targets:
     - folder_name: api-docs
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 98c34c9f1a00f9be03d5020b46fccb21c6a566bd
+      repo_hash: f053c2c92459763f424280dde8190aae674743b9
       repo_path: modules/api-docs
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 98c34c9f1a00f9be03d5020b46fccb21c6a566bd
+      repo_hash: f053c2c92459763f424280dde8190aae674743b9
       repo_path: modules/boilerplate
     - folder_name: cert-manager
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 98c34c9f1a00f9be03d5020b46fccb21c6a566bd
+      repo_hash: f053c2c92459763f424280dde8190aae674743b9
       repo_path: modules/cert-manager
     - folder_name: controller-gen
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 98c34c9f1a00f9be03d5020b46fccb21c6a566bd
+      repo_hash: f053c2c92459763f424280dde8190aae674743b9
       repo_path: modules/controller-gen
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 98c34c9f1a00f9be03d5020b46fccb21c6a566bd
+      repo_hash: f053c2c92459763f424280dde8190aae674743b9
       repo_path: modules/generate-verify
     - folder_name: go
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 98c34c9f1a00f9be03d5020b46fccb21c6a566bd
+      repo_hash: f053c2c92459763f424280dde8190aae674743b9
       repo_path: modules/go
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 98c34c9f1a00f9be03d5020b46fccb21c6a566bd
+      repo_hash: f053c2c92459763f424280dde8190aae674743b9
       repo_path: modules/help
     - folder_name: kind
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 98c34c9f1a00f9be03d5020b46fccb21c6a566bd
+      repo_hash: f053c2c92459763f424280dde8190aae674743b9
       repo_path: modules/kind
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 98c34c9f1a00f9be03d5020b46fccb21c6a566bd
+      repo_hash: f053c2c92459763f424280dde8190aae674743b9
       repo_path: modules/klone
     - folder_name: oci-build
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 98c34c9f1a00f9be03d5020b46fccb21c6a566bd
+      repo_hash: f053c2c92459763f424280dde8190aae674743b9
       repo_path: modules/oci-build
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 98c34c9f1a00f9be03d5020b46fccb21c6a566bd
+      repo_hash: f053c2c92459763f424280dde8190aae674743b9
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 98c34c9f1a00f9be03d5020b46fccb21c6a566bd
+      repo_hash: f053c2c92459763f424280dde8190aae674743b9
       repo_path: modules/tools
diff --git a/make/_shared/go/.golangci.override.yaml b/make/_shared/go/.golangci.override.yaml
@@ -25,8 +25,6 @@ linters:
     - gocritic
     - gofmt
     - goheader
-    - gomoddirectives
-    - gomodguard
     - goprintffuncname
     - gosec
     - gosimple

diff --git a/make/_shared/tools/00_mod.mk b/make/_shared/tools/00_mod.mk
@@ -114,7 +114,7 @@ TOOLS += helm-tool=v0.4.2
 # https://github.com/cert-manager/cmctl
 TOOLS += cmctl=2f75014a7c360c319f8c7c8afe8e9ce33fe26dca
 # https://pkg.go.dev/github.com/cert-manager/release/cmd/cmrel?tab=versions
-TOOLS += cmrel=fa10147dadc8c36718b7b08aed6d8c6418eb2
+TOOLS += cmrel=84daedb44d61d25582e22eca48352012e899d1b2
 # https://github.com/golangci/golangci-lint/releases
 TOOLS += golangci-lint=v1.57.1
 # https://pkg.go.dev/golang.org/x/vuln?tab=versions

diff --git a/make/_shared/tools/util/lock.sh b/make/_shared/tools/util/lock.sh
@@ -28,8 +28,6 @@ set -o pipefail
 
 finalfile="$1"
 lockfile="$finalfile.lock"
-# Timeout in seconds.
-timeout=60
 
 # On OSX, flock is not installed, we just skip locking in that case,
 # this means that running verify in parallel without downloading all
@@ -42,8 +40,8 @@ if [[ "$flock_installed" == "yes" ]]; then
   exec {FD}<>"$lockfile"
 
   # wait for the file to be unlocked
-  if ! flock -x -w $timeout $FD; then
-    echo "Failed to obtain a lock for $lockfile within $timeout seconds"
+  if ! flock -x $FD; then
+    echo "Failed to obtain a lock for $lockfile"
     exit 1
   fi
 fi