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

[CI] Merge self-upgrade-main into main
cert-manager · Aug 22, 2024 · 0462cbe · 0462cbe
2 parents 4bb977a + b0fa959
commit 0462cbe
Show file tree

Hide file tree

Showing 2 changed files with 19 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: 3208b2ac532c12c777df71eae416093e237f42c3
+      repo_hash: 18dc6358de376cd941b39d6d2eb8f9c2a04fe42a
       repo_path: modules/boilerplate
     - folder_name: cert-manager
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 3208b2ac532c12c777df71eae416093e237f42c3
+      repo_hash: 18dc6358de376cd941b39d6d2eb8f9c2a04fe42a
       repo_path: modules/cert-manager
     - folder_name: controller-gen
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 3208b2ac532c12c777df71eae416093e237f42c3
+      repo_hash: 18dc6358de376cd941b39d6d2eb8f9c2a04fe42a
       repo_path: modules/controller-gen
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 3208b2ac532c12c777df71eae416093e237f42c3
+      repo_hash: 18dc6358de376cd941b39d6d2eb8f9c2a04fe42a
       repo_path: modules/generate-verify
     - folder_name: go
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 3208b2ac532c12c777df71eae416093e237f42c3
+      repo_hash: 18dc6358de376cd941b39d6d2eb8f9c2a04fe42a
       repo_path: modules/go
     - folder_name: helm
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 3208b2ac532c12c777df71eae416093e237f42c3
+      repo_hash: 18dc6358de376cd941b39d6d2eb8f9c2a04fe42a
       repo_path: modules/helm
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 3208b2ac532c12c777df71eae416093e237f42c3
+      repo_hash: 18dc6358de376cd941b39d6d2eb8f9c2a04fe42a
       repo_path: modules/help
     - folder_name: kind
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 3208b2ac532c12c777df71eae416093e237f42c3
+      repo_hash: 18dc6358de376cd941b39d6d2eb8f9c2a04fe42a
       repo_path: modules/kind
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 3208b2ac532c12c777df71eae416093e237f42c3
+      repo_hash: 18dc6358de376cd941b39d6d2eb8f9c2a04fe42a
       repo_path: modules/klone
     - folder_name: oci-build
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 3208b2ac532c12c777df71eae416093e237f42c3
+      repo_hash: 18dc6358de376cd941b39d6d2eb8f9c2a04fe42a
       repo_path: modules/oci-build
     - folder_name: oci-publish
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 3208b2ac532c12c777df71eae416093e237f42c3
+      repo_hash: 18dc6358de376cd941b39d6d2eb8f9c2a04fe42a
       repo_path: modules/oci-publish
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 3208b2ac532c12c777df71eae416093e237f42c3
+      repo_hash: 18dc6358de376cd941b39d6d2eb8f9c2a04fe42a
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 3208b2ac532c12c777df71eae416093e237f42c3
+      repo_hash: 18dc6358de376cd941b39d6d2eb8f9c2a04fe42a
       repo_path: modules/tools
diff --git a/make/_shared/helm/helm.mk b/make/_shared/helm/helm.mk
@@ -32,6 +32,11 @@ ifndef helm_chart_version
 $(error helm_chart_version is not set)
 endif
 
+ifndef helm_chart_app_version
+# Default to the same as the chart version
+helm_chart_app_version = $(helm_chart_version)
+endif
+
 ifndef helm_values_mutation_function
 $(error helm_values_mutation_function is not set)
 endif
@@ -59,7 +64,7 @@ $(helm_chart_archive): $(helm_chart_sources) | $(NEEDS_HELM) $(NEEDS_YQ) $(bin_d
 
 	mkdir -p $(dir $@)
 	$(HELM) package $(helm_chart_source_dir_versioned) \
-		--app-version $(helm_chart_version) \
+		--app-version $(helm_chart_app_version) \
 		--version $(helm_chart_version) \
 		--destination $(dir $@)