From eeb82e2098a58fbdc0a4fb9321dc6de0f6e4a973 Mon Sep 17 00:00:00 2001
From: David Zager <dzager@redhat.com>
Date: Mon, 1 Jul 2024 21:50:16 -0400
Subject: [PATCH] :seedling: pin provider images in our release artifacts
 (#347)

Signed-off-by: David Zager <dzager@redhat.com>
---
 .github/actions/make-bundle/action.yml | 10 ++++++++++
 .github/workflows/create-release.yml   |  7 ++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.github/actions/make-bundle/action.yml b/.github/actions/make-bundle/action.yml
index 9a6866f..44f9a34 100644
--- a/.github/actions/make-bundle/action.yml
+++ b/.github/actions/make-bundle/action.yml
@@ -41,6 +41,14 @@ inputs:
     description: "image uri for discovery addon (ie. quay.io/<namespace>/<image-name>:<tag>)"
     required: false
     default: ""
+  provider_generic:
+    description: "image uri for generic provider (ie. quay.io/<namespace>/<image-name>:<tag>)"
+    required: false
+    default: ""
+  provider_java:
+    description: "image uri for generic provider (ie. quay.io/<namespace>/<image-name>:<tag>)"
+    required: false
+    default: ""
   version:
     description: "operator version"
     required: false
@@ -70,6 +78,8 @@ runs:
       [ -n "${{ inputs.tackle_ui }}" ] && OPTS+=" --set images.tackle_ui=${{ inputs.tackle_ui }}"
       [ -n "${{ inputs.addon_analyzer }}" ] && OPTS+=" --set images.addon_analyzer=${{ inputs.addon_analyzer }}"
       [ -n "${{ inputs.addon_discovery }}" ] && OPTS+=" --set images.addon_discovery=${{ inputs.addon_discovery }}"
+      [ -n "${{ inputs.provider_generic }}" ] && OPTS+=" --set images.provider_generic=${{ inputs.provider_generic }}"
+      [ -n "${{ inputs.provider_java }}" ] && OPTS+=" --set images.provider_java=${{ inputs.provider_java }}"
       HELM_OPTS="${OPTS}" make bundle
       cat ./bundle/manifests/konveyor-operator.clusterserviceversion.yaml
       make bundle-build
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index 3e74e97..7892da4 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -216,6 +216,8 @@ jobs:
         tackle_ui: quay.io/konveyor/tackle2-ui:${{ inputs.version }}
         addon_analyzer: quay.io/konveyor/tackle2-addon-analyzer:${{ inputs.version }}
         addon_discovery: quay.io/konveyor/tackle2-addon-discovery:${{ inputs.version }}
+        provider_generic: quay.io/konveyor/generic-external-provider:${{ inputs.version }}
+        provider_java: quay.io/konveyor/java-external-provider:${{ inputs.version }}
         # The ones we don't own
         oauth_proxy: quay.io/konveyor/origin-oauth-proxy:${{ inputs.version }}
         tackle_postgres: quay.io/konveyor/postgresql-15-c9s:${{ inputs.version }}
@@ -267,11 +269,6 @@ jobs:
     uses: konveyor/ci/.github/workflows/global-ci-bundle.yml@main
     with:
       operator_bundle: quay.io/konveyor/tackle2-operator-bundle:${{ inputs.version }}
-      tackle_hub: quay.io/konveyor/tackle2-hub:${{ inputs.version }}
-      keycloak_init: quay.io/konveyor/tackle-keycloak-init:${{ inputs.version }}
-      tackle_ui: quay.io/konveyor/tackle2-ui:${{ inputs.version }}
-      addon_analyzer: quay.io/konveyor/tackle2-addon-analyzer:${{ inputs.version }}
-      addon_discovery: quay.io/konveyor/tackle2-addon-discovery:${{ inputs.version }}
       api_tests_ref: ${{ inputs.branch }}
       ui_tests_ref: ${{ inputs.branch }}