From 2a993e342ea57537812d51d3f4b8493507dd029e0b3e630b1d4afdca09e313ac Mon Sep 17 00:00:00 2001
From: Nicolas Belouin <nicolas.belouin@suse.com>
Date: Thu, 12 Dec 2024 15:25:02 +0100
Subject: [PATCH] Use manifest_repo var to allow for release manifest in
 separate repo

Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com>
---
 release-manifest-image/_service      | 2 +-
 upgrade-controller-chart/_service    | 3 ++-
 upgrade-controller-chart/values.yaml | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/release-manifest-image/_service b/release-manifest-image/_service
index aea1019..8ab2f1c 100644
--- a/release-manifest-image/_service
+++ b/release-manifest-image/_service
@@ -4,7 +4,7 @@
     <param name="file">Dockerfile</param>
     <param name="eval">IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix})</param>
     <param name="var">IMG_PREFIX</param>
-    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
+    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %manifest_repo)</param>
     <param name="var">IMG_REPO</param>
     <param name="eval">SUPPORT_LEVEL=$(rpm --macros=/root/.rpmmacros -E %support_level)</param>
     <param name="var">SUPPORT_LEVEL</param>
diff --git a/upgrade-controller-chart/_service b/upgrade-controller-chart/_service
index 36f7c96..fc5f6f3 100644
--- a/upgrade-controller-chart/_service
+++ b/upgrade-controller-chart/_service
@@ -6,6 +6,8 @@
     <param name="var">IMG_PREFIX</param>
     <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
     <param name="var">IMG_REPO</param>
+    <param name="eval">MANIFEST_REPO=$(rpm --macros=/root/.rpmmacros -E %manifest_repo)</param>
+    <param name="var">MANIFEST_REPO</param>
   </service>
   <service name="replace_using_env" mode="buildtime">
     <param name="file">Chart.yaml</param>
@@ -15,4 +17,3 @@
     <param name="var">CHART_MAJOR</param>
   </service>
 </services>
-
diff --git a/upgrade-controller-chart/values.yaml b/upgrade-controller-chart/values.yaml
index 91ec22e..24beac7 100644
--- a/upgrade-controller-chart/values.yaml
+++ b/upgrade-controller-chart/values.yaml
@@ -12,7 +12,7 @@ image:
 
 env:
   releaseManifest:
-    image: %%IMG_REPO%%/%%IMG_PREFIX%%release-manifest
+    image: %%MANIFEST_REPO%%/%%IMG_PREFIX%%release-manifest
   kubectl:
     image: %%IMG_REPO%%/%%IMG_PREFIX%%kubectl
     version: 1.30.3