From b054155d2643ad3ced111a1b216d9bae05d7a945 Mon Sep 17 00:00:00 2001
From: Disaiah Bennett <dbennett@redhat.com>
Date: Wed, 11 Oct 2023 14:04:25 -0400
Subject: [PATCH] updated hive to latest mce-2.4 commit (#535)

Signed-off-by: Disaiah Bennett <dbennett@redhat.com>
---
 hack/bundle-automation/config.yaml         | 6 ++++--
 hack/bundle-automation/gen-hive-bundle.sh  | 4 +++-
 hack/bundle-automation/generate-bundles.py | 6 +++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/hack/bundle-automation/config.yaml b/hack/bundle-automation/config.yaml
index 1a72c5f9..6e25796b 100644
--- a/hack/bundle-automation/config.yaml
+++ b/hack/bundle-automation/config.yaml
@@ -1,11 +1,13 @@
 - repo_name: generate-hive-bundle
   gen_command: ./hack/bundle-automation/gen-hive-bundle.sh
   branch: mce-2.4
-  sha: 4418e43e27a3bffdac6192a0c4a5f581146f5d00
+  sha: bcbe8574a970871399b30127082c6d2e8185e866
   bundlePath: /tmp/hive-operator-manifests
   name: hive-operator
   imageMappings:
-     hive: openshift_hive
+    hive: openshift_hive
+  imageRepoOverride: stolostron
+  imageTagOverride: 2.4-bcbe8574a970871399b30127082c6d2e8185e866
 
 - repo_name: "community-operators-prod"
   github_ref: "https://github.com/redhat-openshift-ecosystem/community-operators-prod.git"
diff --git a/hack/bundle-automation/gen-hive-bundle.sh b/hack/bundle-automation/gen-hive-bundle.sh
index 2ac78a1e..3f1b2f38 100755
--- a/hack/bundle-automation/gen-hive-bundle.sh
+++ b/hack/bundle-automation/gen-hive-bundle.sh
@@ -16,6 +16,8 @@ me=$(basename "$0")
 branch="$1"
 commit_ish="$2"
 output_dir="$3"
+image_repo="$4"
+image_tag_override="$5"
 if [[ -z "$output_dir" ]]; then
    >&2 echo "Syntax: $me <commit_ish> <output_path>"
    exit 5
@@ -64,7 +66,7 @@ fi
 mkdir bundle
 cd bundle
 echo "Running Hive bundle-gen tool ($gen_tool)."
-python3 ../hive/$gen_tool --hive-repo "$hive_repo_spot" --commit "$commit_ish" --dummy-bundle "$branch"
+python3 ../hive/$gen_tool --hive-repo "$hive_repo_spot" --commit "$commit_ish" --dummy-bundle "$branch" --image-repo "$image_repo" --image-tag-override "$image_tag_override"
 # Note: We point the bundle-gen tool at the local repo we already checked out
 # since we know that it contains the Git SHA we are using for input.
 rc=$?
diff --git a/hack/bundle-automation/generate-bundles.py b/hack/bundle-automation/generate-bundles.py
index a1d30b1c..a13c14f5 100755
--- a/hack/bundle-automation/generate-bundles.py
+++ b/hack/bundle-automation/generate-bundles.py
@@ -723,10 +723,14 @@ def main():
                 branch = repo["branch"]
                 sha = repo["sha"]
                 bundlePath = repo["bundlePath"]
+                imageRepoOverride = repo["imageRepoOverride"]
+                imageTagOverride = repo["imageTagOverride"]
+
             except KeyError:
                 logging.critical("branch and bundlePath are required for tool-generated bundles")
                 exit(1)
-            cmd = "%s %s %s %s" % (repo["gen_command"], branch, sha, bundlePath)
+            cmd = "%s %s %s %s %s %s" % (repo["gen_command"], branch, sha, bundlePath, imageRepoOverride, imageTagOverride)
+
             logging.info("Running bundle-gen tool: %s", cmd)
             rc = os.system(cmd)
             if rc != 0: