From e2a9f4b7f15da57e9e332f6ab50d577991512ec7 Mon Sep 17 00:00:00 2001
From: Eguzki Astiz Lezaun <eastizle@redhat.com>
Date: Tue, 1 Oct 2024 12:38:57 +0200
Subject: [PATCH] prepare release: include consoleplugin image

Signed-off-by: Eguzki Astiz Lezaun <eastizle@redhat.com>
---
 .github/workflows/build-images-base.yaml | 10 ++++++++++
 .github/workflows/release.yaml           |  7 ++++++-
 Makefile                                 |  4 +++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-images-base.yaml b/.github/workflows/build-images-base.yaml
index 7ea37057f..74823dbcd 100644
--- a/.github/workflows/build-images-base.yaml
+++ b/.github/workflows/build-images-base.yaml
@@ -27,6 +27,10 @@ on:
         description: WASM Shim version
         default: latest
         type: string
+      consolePluginImageURL:
+        description: ConsolePlugin image URL
+        default: "quay.io/kuadrant/console-plugin:latest"
+        type: string
       replacesVersion:
         description: Kuadrant Operator replaced version
         default: 0.0.0-alpha
@@ -69,6 +73,10 @@ on:
         description: WASM Shim version
         default: latest
         type: string
+      consolePluginImageURL:
+        description: ConsolePlugin image URL
+        default: "quay.io/kuadrant/console-plugin:latest"
+        type: string
       replacesVersion:
         description: Kuadrant Operator replaced version
         default: 0.0.0-alpha
@@ -155,6 +163,7 @@ jobs:
             LIMITADOR_OPERATOR_VERSION=${{ inputs.limitadorOperatorVersion }} \
             DNS_OPERATOR_VERSION=${{ inputs.dnsOperatorVersion }} \
             WASM_SHIM_VERSION=${{ inputs.wasmShimVersion }} \
+            RELATED_IMAGE_CONSOLEPLUGIN=${{ inputs.consolePluginImageURL }} \
             REPLACES_VERSION=${{ inputs.replacesVersion }} \
             DEFAULT_CHANNEL=${{ inputs.defaultChannel }} \
             CHANNELS=${{ inputs.channels }}
@@ -204,6 +213,7 @@ jobs:
             LIMITADOR_OPERATOR_VERSION=${{ inputs.limitadorOperatorVersion }} \
             DNS_OPERATOR_VERSION=${{ inputs.dnsOperatorVersion }} \
             WASM_SHIM_VERSION=${{ inputs.wasmShimVersion }} \
+            RELATED_IMAGE_CONSOLEPLUGIN=${{ inputs.consolePluginImageURL }} \
             REPLACES_VERSION=${{ inputs.replacesVersion }} \
             DEFAULT_CHANNEL=${{ inputs.defaultChannel }}
       - name: Set up Docker Buildx
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 334c2bed1..aa6a60ac8 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -26,6 +26,10 @@ on:
         description: WASM Shim version
         default: latest
         type: string
+      consolePluginImageURL:
+        description: ConsolePlugin image URL
+        default: "quay.io/kuadrant/console-plugin:latest"
+        type: string
       replacesVersion:
         description: Kuadrant Operator replaced version
         default: 0.0.0-alpha
@@ -64,6 +68,7 @@ jobs:
           LIMITADOR_OPERATOR_VERSION=${{ inputs.limitadorOperatorVersion }} \
           DNS_OPERATOR_VERSION=${{ inputs.dnsOperatorVersion }} \
           WASM_SHIM_VERSION=${{ inputs.wasmShimVersion }} \
+          RELATED_IMAGE_CONSOLEPLUGIN=${{ inputs.consolePluginImageURL }} \
           REPLACES_VERSION=${{ inputs.replacesVersion }}
           make prepare-release
       - name: Commit and push
@@ -77,7 +82,7 @@ jobs:
         with:
           name: v${{ inputs.kuadrantOperatorVersion }}
           tag_name: v${{ inputs.kuadrantOperatorVersion }}
-          body: "**This release enables installations of Authorino Operator v${{ inputs.authorinoOperatorVersion }}, Limitador Operator v${{ inputs.limitadorOperatorVersion }}, DNS Operator v${{ inputs.dnsOperatorVersion }} and WASM Shim v${{ inputs.wasmShimVersion }}**"
+          body: "**This release enables installations of Authorino Operator v${{ inputs.authorinoOperatorVersion }}, Limitador Operator v${{ inputs.limitadorOperatorVersion }}, DNS Operator v${{ inputs.dnsOperatorVersion }}, WASM Shim v${{ inputs.wasmShimVersion }} and ConsolePlugin ${{ inputs.consolePluginImageURL }}**"
           generate_release_notes: true
           target_commitish: release-v${{ github.event.inputs.kuadrantOperatorVersion }}
           prerelease: ${{ github.event.inputs.prerelease }}
diff --git a/Makefile b/Makefile
index adfc8f17d..870fa69ec 100644
--- a/Makefile
+++ b/Makefile
@@ -441,12 +441,14 @@ prepare-release: ## Prepare the manifests for OLM and Helm Chart for a release.
 		LIMITADOR_OPERATOR_VERSION=$(LIMITADOR_OPERATOR_VERSION) \
 		DNS_OPERATOR_VERSION=$(DNS_OPERATOR_VERSION) \
 		WASM_SHIM_VERSION=$(WASM_SHIM_VERSION) \
+		RELATED_IMAGE_CONSOLEPLUGIN=$(RELATED_IMAGE_CONSOLEPLUGIN) \
 		REPLACES_VERSION=$(REPLACES_VERSION)
 	$(MAKE) helm-build VERSION=$(VERSION) \
 		AUTHORINO_OPERATOR_VERSION=$(AUTHORINO_OPERATOR_VERSION) \
 		LIMITADOR_OPERATOR_VERSION=$(LIMITADOR_OPERATOR_VERSION) \
 		DNS_OPERATOR_VERSION=$(DNS_OPERATOR_VERSION) \
-		WASM_SHIM_VERSION=$(WASM_SHIM_VERSION)
+		WASM_SHIM_VERSION=$(WASM_SHIM_VERSION) \
+		RELATED_IMAGE_CONSOLEPLUGIN=$(RELATED_IMAGE_CONSOLEPLUGIN)
 	sed -i -e 's/Version = ".*"/Version = "$(VERSION)"/' $(PROJECT_PATH)/version/version.go
 
 ##@ Code Style