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

[CI] Merge self-upgrade-main into main
cert-manager · Sep 5, 2024 · 4a785a5 · 4a785a5
2 parents 13f57d6 + 202ea0e
commit 4a785a5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
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: c67bc53ae3766d938701754ce7bc218145f13958
+      repo_hash: a41760517be419bce7cfc9c60746ce5d9c106ec0
       repo_path: modules/boilerplate
     - folder_name: cert-manager
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
+      repo_hash: a41760517be419bce7cfc9c60746ce5d9c106ec0
       repo_path: modules/cert-manager
     - folder_name: controller-gen
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
+      repo_hash: a41760517be419bce7cfc9c60746ce5d9c106ec0
       repo_path: modules/controller-gen
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
+      repo_hash: a41760517be419bce7cfc9c60746ce5d9c106ec0
       repo_path: modules/generate-verify
     - folder_name: go
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
+      repo_hash: a41760517be419bce7cfc9c60746ce5d9c106ec0
       repo_path: modules/go
     - folder_name: helm
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
+      repo_hash: a41760517be419bce7cfc9c60746ce5d9c106ec0
       repo_path: modules/helm
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
+      repo_hash: a41760517be419bce7cfc9c60746ce5d9c106ec0
       repo_path: modules/help
     - folder_name: kind
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
+      repo_hash: a41760517be419bce7cfc9c60746ce5d9c106ec0
       repo_path: modules/kind
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
+      repo_hash: a41760517be419bce7cfc9c60746ce5d9c106ec0
       repo_path: modules/klone
     - folder_name: oci-build
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
+      repo_hash: a41760517be419bce7cfc9c60746ce5d9c106ec0
       repo_path: modules/oci-build
     - folder_name: oci-publish
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
+      repo_hash: a41760517be419bce7cfc9c60746ce5d9c106ec0
       repo_path: modules/oci-publish
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
+      repo_hash: a41760517be419bce7cfc9c60746ce5d9c106ec0
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
+      repo_hash: a41760517be419bce7cfc9c60746ce5d9c106ec0
       repo_path: modules/tools
diff --git a/make/_shared/helm/01_mod.mk b/make/_shared/helm/01_mod.mk
@@ -12,6 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+ifndef helm_dont_include_crds
 include $(dir $(lastword $(MAKEFILE_LIST)))/crds.mk
+endif
+
 include $(dir $(lastword $(MAKEFILE_LIST)))/helm.mk
 include $(dir $(lastword $(MAKEFILE_LIST)))/deploy.mk
diff --git a/make/_shared/helm/crds.mk b/make/_shared/helm/crds.mk
@@ -42,7 +42,7 @@ endif
 ## @category [shared] Generate/ Verify
 generate-crds: | $(NEEDS_CONTROLLER-GEN) $(NEEDS_YQ)
 	$(eval crds_gen_temp := $(bin_dir)/scratch/crds)
-	$(eval directories := $(shell ls -d */ | grep -v '_bin' | grep -v 'make'))
+	$(eval directories := $(shell ls -d */ | grep -v -e 'make' $(shell git check-ignore -- * | sed 's/^/-e /')))
 
 	rm -rf $(crds_gen_temp)
 	mkdir -p $(crds_gen_temp)