Merge pull request #405 from cert-manager/self-upgrade-main

[CI] Merge self-upgrade-main into main

Author: cert-manager-prow[bot]

klone.yaml

@@ -10,70 +10,70 @@ targets:
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c845b0b20c6a21023f6bf4a5d8d3f346825c7480
+      repo_hash: 64ae59dc5eefce752ff785f648ac8a8ed0222cbd
       repo_path: modules/boilerplate
     - folder_name: cert-manager
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c845b0b20c6a21023f6bf4a5d8d3f346825c7480
+      repo_hash: 64ae59dc5eefce752ff785f648ac8a8ed0222cbd
       repo_path: modules/cert-manager
     - folder_name: controller-gen
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c845b0b20c6a21023f6bf4a5d8d3f346825c7480
+      repo_hash: 64ae59dc5eefce752ff785f648ac8a8ed0222cbd
       repo_path: modules/controller-gen
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c845b0b20c6a21023f6bf4a5d8d3f346825c7480
+      repo_hash: 64ae59dc5eefce752ff785f648ac8a8ed0222cbd
       repo_path: modules/generate-verify
     - folder_name: go
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c845b0b20c6a21023f6bf4a5d8d3f346825c7480
+      repo_hash: 64ae59dc5eefce752ff785f648ac8a8ed0222cbd
       repo_path: modules/go
     - folder_name: helm
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c845b0b20c6a21023f6bf4a5d8d3f346825c7480
+      repo_hash: 64ae59dc5eefce752ff785f648ac8a8ed0222cbd
       repo_path: modules/helm
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c845b0b20c6a21023f6bf4a5d8d3f346825c7480
+      repo_hash: 64ae59dc5eefce752ff785f648ac8a8ed0222cbd
       repo_path: modules/help
     - folder_name: kind
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c845b0b20c6a21023f6bf4a5d8d3f346825c7480
+      repo_hash: 64ae59dc5eefce752ff785f648ac8a8ed0222cbd
       repo_path: modules/kind
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c845b0b20c6a21023f6bf4a5d8d3f346825c7480
+      repo_hash: 64ae59dc5eefce752ff785f648ac8a8ed0222cbd
       repo_path: modules/klone
     - folder_name: licenses
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c845b0b20c6a21023f6bf4a5d8d3f346825c7480
+      repo_hash: 64ae59dc5eefce752ff785f648ac8a8ed0222cbd
       repo_path: modules/licenses
     - folder_name: oci-build
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c845b0b20c6a21023f6bf4a5d8d3f346825c7480
+      repo_hash: 64ae59dc5eefce752ff785f648ac8a8ed0222cbd
       repo_path: modules/oci-build
     - folder_name: oci-publish
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c845b0b20c6a21023f6bf4a5d8d3f346825c7480
+      repo_hash: 64ae59dc5eefce752ff785f648ac8a8ed0222cbd
       repo_path: modules/oci-publish
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c845b0b20c6a21023f6bf4a5d8d3f346825c7480
+      repo_hash: 64ae59dc5eefce752ff785f648ac8a8ed0222cbd
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c845b0b20c6a21023f6bf4a5d8d3f346825c7480
+      repo_hash: 64ae59dc5eefce752ff785f648ac8a8ed0222cbd
       repo_path: modules/tools

make/_shared/tools/00_mod.mk

@@ -93,7 +93,7 @@ tools += controller-gen=v0.17.3
 # https://pkg.go.dev/golang.org/x/tools/cmd/goimports?tab=versions
 tools += goimports=v0.31.0
 # https://pkg.go.dev/github.com/google/go-licenses/v2?tab=versions
-tools += go-licenses=v2.0.0-alpha.1
+tools += go-licenses=9c778fc0cb52740485f53cc439b1f3c9578a1830
 # https://pkg.go.dev/gotest.tools/gotestsum?tab=versions
 tools += gotestsum=v1.12.1
 # https://pkg.go.dev/sigs.k8s.io/kustomize/kustomize/v4?tab=versions
@@ -325,7 +325,9 @@ go_dependencies :=
 go_dependencies += ginkgo=github.com/onsi/ginkgo/v2/ginkgo
 go_dependencies += controller-gen=sigs.k8s.io/controller-tools/cmd/controller-gen
 go_dependencies += goimports=golang.org/x/tools/cmd/goimports
-go_dependencies += go-licenses=github.com/google/go-licenses/v2
+# switch back to github.com/google/go-licenses once
+# https://github.com/google/go-licenses/pull/327 is merged.
+go_dependencies += go-licenses=github.com/inteon/go-licenses/v2
 go_dependencies += gotestsum=gotest.tools/gotestsum
 go_dependencies += kustomize=sigs.k8s.io/kustomize/kustomize/v4
 go_dependencies += gojq=github.com/itchyny/gojq/cmd/gojq