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

[CI] Merge self-upgrade-main into main
cert-manager · Feb 6, 2025 · 782b835 · 782b835
2 parents b74e744 + 1304305
commit 782b835
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 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: 73a0e85b643c7552661ca4f5f8c422cd133b246e
+      repo_hash: 5e0365e0e997012613326ab0bfd9a865d9a2615e
       repo_path: modules/boilerplate
     - folder_name: cert-manager
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 73a0e85b643c7552661ca4f5f8c422cd133b246e
+      repo_hash: 5e0365e0e997012613326ab0bfd9a865d9a2615e
       repo_path: modules/cert-manager
     - folder_name: controller-gen
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 73a0e85b643c7552661ca4f5f8c422cd133b246e
+      repo_hash: 5e0365e0e997012613326ab0bfd9a865d9a2615e
       repo_path: modules/controller-gen
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 73a0e85b643c7552661ca4f5f8c422cd133b246e
+      repo_hash: 5e0365e0e997012613326ab0bfd9a865d9a2615e
       repo_path: modules/generate-verify
     - folder_name: go
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 73a0e85b643c7552661ca4f5f8c422cd133b246e
+      repo_hash: 5e0365e0e997012613326ab0bfd9a865d9a2615e
       repo_path: modules/go
     - folder_name: helm
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 73a0e85b643c7552661ca4f5f8c422cd133b246e
+      repo_hash: 5e0365e0e997012613326ab0bfd9a865d9a2615e
       repo_path: modules/helm
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 73a0e85b643c7552661ca4f5f8c422cd133b246e
+      repo_hash: 5e0365e0e997012613326ab0bfd9a865d9a2615e
       repo_path: modules/help
     - folder_name: kind
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 73a0e85b643c7552661ca4f5f8c422cd133b246e
+      repo_hash: 5e0365e0e997012613326ab0bfd9a865d9a2615e
       repo_path: modules/kind
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 73a0e85b643c7552661ca4f5f8c422cd133b246e
+      repo_hash: 5e0365e0e997012613326ab0bfd9a865d9a2615e
       repo_path: modules/klone
     - folder_name: oci-build
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 73a0e85b643c7552661ca4f5f8c422cd133b246e
+      repo_hash: 5e0365e0e997012613326ab0bfd9a865d9a2615e
       repo_path: modules/oci-build
     - folder_name: oci-publish
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 73a0e85b643c7552661ca4f5f8c422cd133b246e
+      repo_hash: 5e0365e0e997012613326ab0bfd9a865d9a2615e
       repo_path: modules/oci-publish
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 73a0e85b643c7552661ca4f5f8c422cd133b246e
+      repo_hash: 5e0365e0e997012613326ab0bfd9a865d9a2615e
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 73a0e85b643c7552661ca4f5f8c422cd133b246e
+      repo_hash: 5e0365e0e997012613326ab0bfd9a865d9a2615e
       repo_path: modules/tools
diff --git a/make/_shared/helm/helm.mk b/make/_shared/helm/helm.mk
@@ -77,10 +77,12 @@ $(helm_chart_archive): $(helm_chart_sources) | $(NEEDS_HELM) $(NEEDS_YQ) $(bin_d
 ## @category [shared] Publish
 helm-chart-oci-push: $(helm_chart_archive) | $(NEEDS_HELM) $(NEEDS_CRANE)
 	$(HELM) push "$(helm_chart_archive)" "oci://$(helm_chart_image_registry)" 2>&1 \
-		| grep -o "sha256:.\+" \
-		| tee $(helm_digest_path)
-
-	$(CRANE) copy "$(helm_chart_image_name)@$(call helm_digest)" "$(helm_chart_image_name):$(helm_chart_image_tag:v%=%)"
+		| tee >(grep -o "sha256:.\+" | tee $(helm_digest_path))
+
+	@# $(helm_chart_image_tag:v%=%) removes the v prefix from the value stored in helm_chart_image_tag.
+	@# See https://www.gnu.org/software/make/manual/html_node/Substitution-Refs.html for the manual on the syntax.
+	helm_digest=$$(cat $(helm_digest_path)) && \
+	$(CRANE) copy "$(helm_chart_image_name)@$$helm_digest" "$(helm_chart_image_name):$(helm_chart_image_tag:v%=%)"
 
 .PHONY: helm-chart
 ## Create a helm chart