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

[CI] Merge self-upgrade-main into main

Author: cert-manager-prow[bot]

LICENSES

@@ -8,7 +8,7 @@ github.com/alecholmes/xfccparser,https://github.com/alecholmes/xfccparser/blob/v
 github.com/alecthomas/participle/v2,https://github.com/alecthomas/participle/blob/v2.1.1/COPYING,MIT
 github.com/antlr4-go/antlr/v4,https://github.com/antlr4-go/antlr/blob/v4.13.1/LICENSE,BSD-3-Clause
 github.com/beorn7/perks/quantile,https://github.com/beorn7/perks/blob/v1.0.1/LICENSE,MIT
-github.com/blang/semver/v4,https://github.com/blang/semver/blob/v4.0.0/LICENSE,MIT
+github.com/blang/semver/v4,https://github.com/blang/semver/blob/v4.0.0/v4/LICENSE,MIT
 github.com/cenkalti/backoff/v4,https://github.com/cenkalti/backoff/blob/v4.3.0/LICENSE,MIT
 github.com/cert-manager/cert-manager,https://github.com/cert-manager/cert-manager/blob/v1.17.2/LICENSE,Apache-2.0
 github.com/cert-manager/istio-csr,https://github.com/cert-manager/istio-csr/blob/HEAD/LICENSE,Apache-2.0
@@ -20,14 +20,14 @@ github.com/emicklei/go-restful/v3,https://github.com/emicklei/go-restful/blob/v3
 github.com/envoyproxy/go-control-plane/contrib/envoy/extensions,https://github.com/envoyproxy/go-control-plane/blob/63a55395d7a3/contrib/LICENSE,Apache-2.0
 github.com/envoyproxy/go-control-plane/envoy,https://github.com/envoyproxy/go-control-plane/blob/63a55395d7a3/envoy/LICENSE,Apache-2.0
 github.com/envoyproxy/protoc-gen-validate/validate,https://github.com/envoyproxy/protoc-gen-validate/blob/v1.2.1/LICENSE,Apache-2.0
-github.com/evanphx/json-patch/v5,https://github.com/evanphx/json-patch/blob/v5.9.11/LICENSE,BSD-3-Clause
+github.com/evanphx/json-patch/v5,https://github.com/evanphx/json-patch/blob/v5.9.11/v5/LICENSE,BSD-3-Clause
 github.com/fsnotify/fsnotify,https://github.com/fsnotify/fsnotify/blob/v1.9.0/LICENSE,BSD-3-Clause
 github.com/fxamacker/cbor/v2,https://github.com/fxamacker/cbor/blob/v2.7.0/LICENSE,MIT
 github.com/go-asn1-ber/asn1-ber,https://github.com/go-asn1-ber/asn1-ber/blob/v1.5.7/LICENSE,MIT
 github.com/go-errors/errors,https://github.com/go-errors/errors/blob/v1.5.1/LICENSE.MIT,MIT
 github.com/go-jose/go-jose/v4,https://github.com/go-jose/go-jose/blob/v4.0.5/LICENSE,Apache-2.0
 github.com/go-jose/go-jose/v4/json,https://github.com/go-jose/go-jose/blob/v4.0.5/json/LICENSE,BSD-3-Clause
-github.com/go-ldap/ldap/v3,https://github.com/go-ldap/ldap/blob/v3.4.8/LICENSE,MIT
+github.com/go-ldap/ldap/v3,https://github.com/go-ldap/ldap/blob/v3.4.8/v3/LICENSE,MIT
 github.com/go-logr/logr,https://github.com/go-logr/logr/blob/v1.4.2/LICENSE,Apache-2.0
 github.com/go-logr/stdr,https://github.com/go-logr/stdr/blob/v1.2.2/LICENSE,Apache-2.0
 github.com/go-logr/zapr,https://github.com/go-logr/zapr/blob/v1.3.0/LICENSE,Apache-2.0
@@ -105,7 +105,7 @@ golang.org/x/sys/unix,https://cs.opensource.google/go/x/sys/+/v0.32.0:LICENSE,BS
 golang.org/x/term,https://cs.opensource.google/go/x/term/+/v0.30.0:LICENSE,BSD-3-Clause
 golang.org/x/text,https://cs.opensource.google/go/x/text/+/v0.23.0:LICENSE,BSD-3-Clause
 golang.org/x/time/rate,https://cs.opensource.google/go/x/time/+/v0.9.0:LICENSE,BSD-3-Clause
-gomodules.xyz/jsonpatch/v2,https://github.com/gomodules/jsonpatch/blob/v2.4.0/LICENSE,Apache-2.0
+gomodules.xyz/jsonpatch/v2,https://github.com/gomodules/jsonpatch/blob/v2.4.0/v2/LICENSE,Apache-2.0
 google.golang.org/genproto/googleapis/api,https://github.com/googleapis/go-genproto/blob/56aae31c358a/googleapis/api/LICENSE,Apache-2.0
 google.golang.org/genproto/googleapis/rpc/status,https://github.com/googleapis/go-genproto/blob/56aae31c358a/googleapis/rpc/LICENSE,Apache-2.0
 google.golang.org/grpc,https://github.com/grpc/grpc-go/blob/v1.72.0/LICENSE,Apache-2.0

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