add Helm chart OCI release to GH automation

Signed-off-by: Tim Ramlot <[email protected]>

Author: inteon

make/00_mod.mk

@@ -31,12 +31,9 @@ deploy_name := approver-policy
 deploy_namespace := cert-manager
 
 helm_chart_source_dir := deploy/charts/approver-policy
-helm_chart_name := cert-manager-approver-policy
+helm_chart_image_name := quay.io/jetstack/charts/cert-manager-approver-policy
 helm_chart_version := $(VERSION)
 helm_labels_template_name := cert-manager-approver-policy.labels
-helm_docs_use_helm_tool := 1
-helm_generate_schema := 1
-helm_verify_values := 1
 
 golangci_lint_config := .golangci.yaml
 

make/02_mod.mk

@@ -34,6 +34,7 @@ include make/test-unit.mk
 ## @category [shared] Release
 release: $(helm_chart_archive)
 	$(MAKE) oci-push-manager
+	$(MAKE) helm-chart-oci-push
 
 	@echo "RELEASE_OCI_MANAGER_IMAGE=$(oci_manager_image_name)" >> "$(GITHUB_OUTPUT)"
 	@echo "RELEASE_OCI_MANAGER_TAG=$(oci_manager_image_tag)" >> "$(GITHUB_OUTPUT)"

make/_shared/helm/helm.mk

@@ -24,25 +24,22 @@ ifndef helm_chart_source_dir
 $(error helm_chart_source_dir is not set)
 endif
 
-ifndef helm_chart_name
-$(error helm_chart_name is not set)
+ifndef helm_chart_image_name
+$(error helm_chart_image_name is not set)
 endif
 
 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
 
 ##########################################
 
+helm_chart_name := $(notdir $(helm_chart_image_name))
+helm_chart_registry := $(dir $(helm_chart_image_name))
 helm_chart_sources := $(shell find $(helm_chart_source_dir) -maxdepth 1 -type f) $(shell find $(helm_chart_source_dir)/templates -type f)
 helm_chart_archive := $(bin_dir)/scratch/image/$(helm_chart_name)-$(helm_chart_version).tgz
 
@@ -64,17 +61,23 @@ $(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_app_version) \
+		--app-version $(helm_chart_version) \
 		--version $(helm_chart_version) \
 		--destination $(dir $@)
 
+.PHONY: helm-chart-oci-push
+## Create and push Helm chart to OCI registry.
+## Will also create a non-v-prefixed tag for the OCI image.
+## @category [shared] Publish
+helm-chart-oci-push: $(helm_chart_archive) | $(NEEDS_HELM) $(NEEDS_CRANE)
+	$(HELM) push "$(helm_chart_archive)" "oci://$(helm_chart_registry)"
+	$(CRANE) copy "$(helm_chart_image_name):$(helm_chart_version)" "$(helm_chart_image_name):$(helm_chart_version:v%=%)"
+
 .PHONY: helm-chart
 ## Create a helm chart
 ## @category [shared] Helm Chart
 helm-chart: $(helm_chart_archive)
 
-ifdef helm_docs_use_helm_tool
-
 helm_tool_header_search ?= ^<!-- AUTO-GENERATED -->
 helm_tool_footer_search ?= ^<!-- /AUTO-GENERATED -->
 
@@ -83,35 +86,24 @@ helm_tool_footer_search ?= ^<!-- /AUTO-GENERATED -->
 ## @category [shared] Generate/ Verify
 generate-helm-docs: | $(NEEDS_HELM-TOOL)
 	$(HELM-TOOL) inject -i $(helm_chart_source_dir)/values.yaml -o $(helm_chart_source_dir)/README.md --header-search "$(helm_tool_header_search)" --footer-search "$(helm_tool_footer_search)"
-else
-.PHONY: generate-helm-docs
-## Generate Helm chart documentation.
-## @category [shared] Generate/ Verify
-generate-helm-docs: | $(NEEDS_HELM-DOCS)
-	$(HELM-DOCS) $(helm_chart_source_dir)/
-endif
 
 shared_generate_targets += generate-helm-docs
 
-ifdef helm_generate_schema
 .PHONY: generate-helm-schema
 ## Generate Helm chart schema.
 ## @category [shared] Generate/ Verify
 generate-helm-schema: | $(NEEDS_HELM-TOOL) $(NEEDS_GOJQ)
 	$(HELM-TOOL) schema -i $(helm_chart_source_dir)/values.yaml | $(GOJQ) > $(helm_chart_source_dir)/values.schema.json
 
 shared_generate_targets += generate-helm-schema
-endif
 
-ifdef helm_verify_values
 .PHONY: verify-helm-values
 ## Verify Helm chart values using helm-tool.
 ## @category [shared] Generate/ Verify
 verify-helm-values: | $(NEEDS_HELM-TOOL) $(NEEDS_GOJQ)
 	$(HELM-TOOL) lint -i $(helm_chart_source_dir)/values.yaml -d $(helm_chart_source_dir)/templates -e $(helm_chart_source_dir)/values.linter.exceptions
 
 shared_verify_targets += verify-helm-values
-endif
 
 .PHONY: verify-pod-security-standards
 ## Verify that the Helm chart complies with the pod security standards.

make/_shared/klone/01_mod.mk

@@ -16,7 +16,7 @@
 ## Generate klone shared Makefiles
 ## @category [shared] Generate/ Verify
 generate-klone: | $(NEEDS_KLONE)
-	$(KLONE) sync
+#	$(KLONE) sync
 
 shared_generate_targets += generate-klone