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

[CI] Merge self-upgrade-main into main

deploy/crds/README.md

@@ -0,0 +1,8 @@
+# CRDs source directory
+
+> **WARNING**: if you are an end-user, you probably should NOT need to use the
+> files in this directory. These files are for **reference, development and testing purposes only**.
+
+This directory contains 'source code' used to build our CustomResourceDefinition
+resources consumed by our officially supported deployment methods (e.g. the Helm chart).
+The CRDs in this directory might be incomplete, and should **NOT** be used to provision the operator.

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: 6357eb5f474f69478fd08a918d12dca2f3d1fb42
+      repo_hash: 6eccdeac5eab23905699243209e0f81afad6f081
       repo_path: modules/boilerplate
     - folder_name: cert-manager
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6357eb5f474f69478fd08a918d12dca2f3d1fb42
+      repo_hash: 6eccdeac5eab23905699243209e0f81afad6f081
       repo_path: modules/cert-manager
     - folder_name: controller-gen
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6357eb5f474f69478fd08a918d12dca2f3d1fb42
+      repo_hash: 6eccdeac5eab23905699243209e0f81afad6f081
       repo_path: modules/controller-gen
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6357eb5f474f69478fd08a918d12dca2f3d1fb42
+      repo_hash: 6eccdeac5eab23905699243209e0f81afad6f081
       repo_path: modules/generate-verify
     - folder_name: go
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6357eb5f474f69478fd08a918d12dca2f3d1fb42
+      repo_hash: 6eccdeac5eab23905699243209e0f81afad6f081
       repo_path: modules/go
     - folder_name: helm
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6357eb5f474f69478fd08a918d12dca2f3d1fb42
+      repo_hash: 6eccdeac5eab23905699243209e0f81afad6f081
       repo_path: modules/helm
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6357eb5f474f69478fd08a918d12dca2f3d1fb42
+      repo_hash: 6eccdeac5eab23905699243209e0f81afad6f081
       repo_path: modules/help
     - folder_name: kind
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6357eb5f474f69478fd08a918d12dca2f3d1fb42
+      repo_hash: 6eccdeac5eab23905699243209e0f81afad6f081
       repo_path: modules/kind
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6357eb5f474f69478fd08a918d12dca2f3d1fb42
+      repo_hash: 6eccdeac5eab23905699243209e0f81afad6f081
       repo_path: modules/klone
     - folder_name: oci-build
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6357eb5f474f69478fd08a918d12dca2f3d1fb42
+      repo_hash: 6eccdeac5eab23905699243209e0f81afad6f081
       repo_path: modules/oci-build
     - folder_name: oci-publish
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6357eb5f474f69478fd08a918d12dca2f3d1fb42
+      repo_hash: 6eccdeac5eab23905699243209e0f81afad6f081
       repo_path: modules/oci-publish
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6357eb5f474f69478fd08a918d12dca2f3d1fb42
+      repo_hash: 6eccdeac5eab23905699243209e0f81afad6f081
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6357eb5f474f69478fd08a918d12dca2f3d1fb42
+      repo_hash: 6eccdeac5eab23905699243209e0f81afad6f081
       repo_path: modules/tools

make/_shared/helm/crds.mk

@@ -49,7 +49,7 @@ $(crds_dir)/README.md: $(crds_dir_readme) | $(crds_dir)
 .PHONY: generate-crds
 ## Generate CRD manifests.
 ## @category [shared] Generate/ Verify
-generate-crds: | $(NEEDS_CONTROLLER-GEN) $(NEEDS_YQ)
+generate-crds: | $(crds_dir)/README.md $(NEEDS_CONTROLLER-GEN) $(NEEDS_YQ)
 	$(eval directories := $(shell ls -d */ | grep -v -e 'make' $(shell git check-ignore -- * | sed 's/^/-e /')))
 
 	$(CONTROLLER-GEN) crd \