Merge pull request cert-manager#6974 from cert-manager/self-upgrade-m…

…aster [CI] Merge self-upgrade-master into master
sathisv3 · Apr 30, 2024 · 5d0b738 · 5d0b738
2 parents d7182f4 + 94acaa5
commit 5d0b738
Show file tree

Hide file tree

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

diff --git a/klone.yaml b/klone.yaml
@@ -10,35 +10,35 @@ targets:
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: b4ffe01c4471ab7ff0ba129bb455445b38ca1221
+      repo_hash: f053c2c92459763f424280dde8190aae674743b9
       repo_path: modules/boilerplate
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: b4ffe01c4471ab7ff0ba129bb455445b38ca1221
+      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: b4ffe01c4471ab7ff0ba129bb455445b38ca1221
+      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: b4ffe01c4471ab7ff0ba129bb455445b38ca1221
+      repo_hash: f053c2c92459763f424280dde8190aae674743b9
       repo_path: modules/help
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: b4ffe01c4471ab7ff0ba129bb455445b38ca1221
+      repo_hash: f053c2c92459763f424280dde8190aae674743b9
       repo_path: modules/klone
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: b4ffe01c4471ab7ff0ba129bb455445b38ca1221
+      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: b4ffe01c4471ab7ff0ba129bb455445b38ca1221
+      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/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