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

[CI] Merge self-upgrade into main
cert-manager · Apr 4, 2024 · c55524a · c55524a
2 parents 4a22361 + dd4c0f4
commit c55524a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 25 deletions.
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -1,8 +1,6 @@
 issues:
   exclude-rules:
     - linters:
-        - errorlint
-        - prealloc
         - gosec
       text: ".*"
 linters:
@@ -13,7 +11,6 @@ linters:
     - asciicheck
     - bidichk
     - bodyclose
-    - containedctx
     - contextcheck
     - decorder
     - dogsled
@@ -22,7 +19,6 @@ linters:
     - errcheck
     - errchkjson
     - errname
-    - errorlint
     - execinquery
     - exhaustive
     - exportloopref
@@ -34,7 +30,6 @@ linters:
     - gocritic
     - gofmt
     - goheader
-    - goimports
     - gomoddirectives
     - gomodguard
     - goprintffuncname
@@ -56,7 +51,6 @@ linters:
     - nilnil
     - noctx
     - nosprintfhostport
-    - prealloc
     - predeclared
     - promlinter
     - protogetter

diff --git a/klone.yaml b/klone.yaml
@@ -10,65 +10,65 @@ targets:
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 9ce477bd5bd50415ebf74ec26d8dc3c6e06c9e03
+      repo_hash: ceafef61921de400cb6ce75c5e5e40c63a3ca719
       repo_path: modules/boilerplate
     - folder_name: cert-manager
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 9ce477bd5bd50415ebf74ec26d8dc3c6e06c9e03
+      repo_hash: ceafef61921de400cb6ce75c5e5e40c63a3ca719
       repo_path: modules/cert-manager
     - folder_name: controller-gen
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 9ce477bd5bd50415ebf74ec26d8dc3c6e06c9e03
+      repo_hash: ceafef61921de400cb6ce75c5e5e40c63a3ca719
       repo_path: modules/controller-gen
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 9ce477bd5bd50415ebf74ec26d8dc3c6e06c9e03
+      repo_hash: ceafef61921de400cb6ce75c5e5e40c63a3ca719
       repo_path: modules/generate-verify
     - folder_name: go
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 9ce477bd5bd50415ebf74ec26d8dc3c6e06c9e03
+      repo_hash: ceafef61921de400cb6ce75c5e5e40c63a3ca719
       repo_path: modules/go
     - folder_name: helm
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 9ce477bd5bd50415ebf74ec26d8dc3c6e06c9e03
+      repo_hash: ceafef61921de400cb6ce75c5e5e40c63a3ca719
       repo_path: modules/helm
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 9ce477bd5bd50415ebf74ec26d8dc3c6e06c9e03
+      repo_hash: ceafef61921de400cb6ce75c5e5e40c63a3ca719
       repo_path: modules/help
     - folder_name: kind
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 9ce477bd5bd50415ebf74ec26d8dc3c6e06c9e03
+      repo_hash: ceafef61921de400cb6ce75c5e5e40c63a3ca719
       repo_path: modules/kind
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 9ce477bd5bd50415ebf74ec26d8dc3c6e06c9e03
+      repo_hash: ceafef61921de400cb6ce75c5e5e40c63a3ca719
       repo_path: modules/klone
     - folder_name: oci-build
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 9ce477bd5bd50415ebf74ec26d8dc3c6e06c9e03
+      repo_hash: ceafef61921de400cb6ce75c5e5e40c63a3ca719
       repo_path: modules/oci-build
     - folder_name: oci-publish
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 9ce477bd5bd50415ebf74ec26d8dc3c6e06c9e03
+      repo_hash: ceafef61921de400cb6ce75c5e5e40c63a3ca719
       repo_path: modules/oci-publish
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 9ce477bd5bd50415ebf74ec26d8dc3c6e06c9e03
+      repo_hash: ceafef61921de400cb6ce75c5e5e40c63a3ca719
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 9ce477bd5bd50415ebf74ec26d8dc3c6e06c9e03
+      repo_hash: ceafef61921de400cb6ce75c5e5e40c63a3ca719
       repo_path: modules/tools
diff --git a/make/_shared/go/.golangci.override.yaml b/make/_shared/go/.golangci.override.yaml
@@ -6,7 +6,6 @@ linters:
     - asciicheck
     - bidichk
     - bodyclose
-    - containedctx
     - contextcheck
     - decorder
     - dogsled
@@ -15,7 +14,6 @@ linters:
     - errcheck
     - errchkjson
     - errname
-    - errorlint
     - execinquery
     - exhaustive
     - exportloopref
@@ -27,7 +25,6 @@ linters:
     - gocritic
     - gofmt
     - goheader
-    - goimports
     - gomoddirectives
     - gomodguard
     - goprintffuncname
@@ -49,7 +46,6 @@ linters:
     - nilnil
     - noctx
     - nosprintfhostport
-    - prealloc
     - predeclared
     - promlinter
     - protogetter

diff --git a/make/_shared/go/01_mod.mk b/make/_shared/go/01_mod.mk
@@ -83,7 +83,7 @@ verify-golangci-lint: | $(NEEDS_GOLANGCI-LINT) $(NEEDS_YQ) $(bin_dir)/scratch
 		| while read d; do \
 				echo "Running '$(bin_dir)/tools/golangci-lint run --go $(VENDORED_GO_VERSION) -c $(CURDIR)/$(golangci_lint_config)' in directory '$${d}'"; \
 				pushd "$${d}" >/dev/null; \
-				$(GOLANGCI-LINT) run --go $(VENDORED_GO_VERSION) -c $(CURDIR)/$(golangci_lint_config) || exit; \
+				$(GOLANGCI-LINT) run --go $(VENDORED_GO_VERSION) -c $(CURDIR)/$(golangci_lint_config) --timeout 4m || exit; \
 				popd >/dev/null; \
 				echo ""; \
 			done

diff --git a/make/_shared/oci-publish/01_mod.mk b/make/_shared/oci-publish/01_mod.mk
@@ -117,7 +117,8 @@ $(call sanitize_target,oci-sign-$2): $(oci_digest_path_$1) | $(NEEDS_CRANE) $(NE
 oci-sign-$1: $(call sanitize_target,oci-sign-$2)
 endef
 
-$(foreach build_name,$(build_names),$(eval $(call oci_sign_target,$(build_name),$(oci_$(build_name)_image_name))))
+oci_sign_target_per_image = $(foreach image_name,$2,$(eval $(call oci_sign_target,$1,$(image_name))))
+$(foreach build_name,$(build_names),$(eval $(call oci_sign_target_per_image,$(build_name),$(oci_$(build_name)_image_name))))
 
 .PHONY: $(oci_sign_targets)
 ## Sign an OCI image.