Merge pull request #7004 from cert-manager/self-upgrade-master

[CI] Merge self-upgrade-master into master

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: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd
+      repo_hash: b6dc86973e937be38a138f38cf83134760487f26
       repo_path: modules/boilerplate
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd
+      repo_hash: b6dc86973e937be38a138f38cf83134760487f26
       repo_path: modules/generate-verify
     - folder_name: go
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd
+      repo_hash: b6dc86973e937be38a138f38cf83134760487f26
       repo_path: modules/go
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd
+      repo_hash: b6dc86973e937be38a138f38cf83134760487f26
       repo_path: modules/help
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd
+      repo_hash: b6dc86973e937be38a138f38cf83134760487f26
       repo_path: modules/klone
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd
+      repo_hash: b6dc86973e937be38a138f38cf83134760487f26
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd
+      repo_hash: b6dc86973e937be38a138f38cf83134760487f26
       repo_path: modules/tools

make/_shared/tools/00_mod.mk

@@ -126,8 +126,10 @@ tools += operator-sdk=v1.34.1
 tools += gh=v2.49.0
 # https:///github.com/redhat-openshift-ecosystem/openshift-preflight/releases
 tools += preflight=1.9.2
-# https://github.com/daixiang0/gci/releases/
+# https://github.com/daixiang0/gci/releases
 tools += gci=v0.13.4
+# https://github.com/google/yamlfmt/releases
+tools += yamlfmt=v0.12.1
 
 # https://pkg.go.dev/k8s.io/code-generator/cmd?tab=versions
 K8S_CODEGEN_VERSION := v0.29.3
@@ -326,6 +328,7 @@ go_dependencies += govulncheck=golang.org/x/vuln/cmd/govulncheck
 go_dependencies += operator-sdk=github.com/operator-framework/operator-sdk/cmd/operator-sdk
 go_dependencies += gh=github.com/cli/cli/v2/cmd/gh
 go_dependencies += gci=github.com/daixiang0/gci
+go_dependencies += yamlfmt=github.com/google/yamlfmt/cmd/yamlfmt
 
 #################
 # go build tags #