Merge pull request #87 from inteon/add_approver_to_release

Fix release target and add approver image
cert-manager · Feb 8, 2024 · c70f3aa · c70f3aa
2 parents c062902 + 3250a50
commit c70f3aa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -45,6 +45,8 @@ jobs:
     outputs:
       RELEASE_OCI_MANAGER_IMAGE: ${{ steps.release.outputs.RELEASE_OCI_MANAGER_IMAGE }}
       RELEASE_OCI_MANAGER_TAG: ${{ steps.release.outputs.RELEASE_OCI_MANAGER_TAG }}
+      RELEASE_OCI_APPROVER_IMAGE: ${{ steps.release.outputs.RELEASE_OCI_APPROVER_IMAGE }}
+      RELEASE_OCI_APPROVER_TAG: ${{ steps.release.outputs.RELEASE_OCI_APPROVER_TAG }}
       RELEASE_HELM_CHART_NAME: ${{ steps.release.outputs.RELEASE_HELM_CHART_NAME }}
       RELEASE_HELM_CHART_VERSION: ${{ steps.release.outputs.RELEASE_HELM_CHART_VERSION }}
 
@@ -62,6 +64,8 @@ jobs:
           touch .notes-file
           echo "OCI_MANAGER_IMAGE: ${{ needs.build_images.outputs.RELEASE_OCI_MANAGER_IMAGE }}" >> .notes-file
           echo "OCI_MANAGER_TAG: ${{ needs.build_images.outputs.RELEASE_OCI_MANAGER_TAG }}" >> .notes-file
+          echo "OCI_APPROVER_IMAGE: ${{ needs.build_images.outputs.RELEASE_OCI_APPROVER_IMAGE }}" >> .notes-file
+          echo "OCI_APPROVER_TAG: ${{ needs.build_images.outputs.RELEASE_OCI_APPROVER_TAG }}" >> .notes-file
           echo "HELM_CHART_NAME: ${{ needs.build_images.outputs.RELEASE_HELM_CHART_NAME }}" >> .notes-file
           echo "HELM_CHART_VERSION: ${{ needs.build_images.outputs.RELEASE_HELM_CHART_VERSION }}" >> .notes-file
 

diff --git a/make/02_mod.mk b/make/02_mod.mk
@@ -24,10 +24,12 @@ include make/test-unit.mk
 ## Publish all release artifacts (image + helm chart)
 ## @category [shared] Release
 release: $(helm_chart_archive)
-	$(MAKE) oci-push-manager
+	$(MAKE) oci-push-manager oci-push-approver
 
 	@echo "RELEASE_OCI_MANAGER_IMAGE=$(oci_manager_image_name)" >> "$(GITHUB_OUTPUT)"
 	@echo "RELEASE_OCI_MANAGER_TAG=$(oci_manager_image_tag)" >> "$(GITHUB_OUTPUT)"
+	@echo "RELEASE_OCI_APPROVER_IMAGE=$(oci_manager_image_name)" >> "$(GITHUB_OUTPUT)"
+	@echo "RELEASE_OCI_APPROVER_TAG=$(oci_manager_image_tag)" >> "$(GITHUB_OUTPUT)"
 	@echo "RELEASE_HELM_CHART_NAME=$(helm_chart_name)" >> "$(GITHUB_OUTPUT)"
 	@echo "RELEASE_HELM_CHART_VERSION=$(helm_chart_version)" >> "$(GITHUB_OUTPUT)"
 	@echo "RELEASE_HELM_CHART_TAR=$(helm_chart_archive)" >> "$(GITHUB_OUTPUT)"