From e0defec4e9c2da1fbaa83f91a08e3022142f624c Mon Sep 17 00:00:00 2001
From: Fabrice Jammes <fabrice.jammes@clermont.in2p3.fr>
Date: Fri, 19 Jul 2024 12:34:19 +0200
Subject: [PATCH] Improve fink-broker configuration

---
 e2e/argocd.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/e2e/argocd.sh b/e2e/argocd.sh
index 16d84e92..a5048154 100755
--- a/e2e/argocd.sh
+++ b/e2e/argocd.sh
@@ -37,20 +37,12 @@ argocd login --core
 kubectl config set-context --current --namespace="$NS"
 
 # Create fink app
-IMAGE="$CIUX_IMAGE_URL"
-echo "Use CIUX_IMAGE_URL to set fink-broker image: $CIUX_IMAGE_URL"
-if [[ "$IMAGE" =~ "-noscience" ]];
-then
-  valueFile=values-ci-noscience.yaml
-else
-  valueFile=values-ci-science.yaml
-fi
 argocd app create fink --dest-server https://kubernetes.default.svc \
     --dest-namespace "$NS" \
     --repo https://github.com/astrolabsoftware/fink-cd.git \
     --path apps --revision "$FINK_CD_WORKBRANCH" \
-    -p finkbroker.revision="$FINK_BROKER_WORKBRANCH" \
-    -p finkbroker.valueFile="$valueFile" \
+    -p finkbroker.revision="$FINK_BROKER_WORKBRANCH"
+
 
 # Sync fink app-of-apps
 argocd app sync fink
@@ -70,7 +62,15 @@ retry kubectl wait --for condition=established --timeout=60s crd/kafkas.kafka.st
 # TODO Wait for all applications to be synced (problem with spark-operator secret)
 
 # Set fink-broker parameters
+echo "Use fink-broker image: $CIUX_IMAGE_URL"
+if [[ "$$CIUX_IMAGE_URL" =~ "-noscience" ]];
+then
+  valueFile=values-ci-noscience.yaml
+else
+  valueFile=values-ci-science.yaml
+fi
 argocd app set fink-broker -p image.repository="$CIUX_IMAGE_REGISTRY" \
+    --values "$valueFile" \
     -p image.name="$CIUX_IMAGE_NAME" \
     -p image.tag="$CIUX_IMAGE_TAG" \
     -p log_level="DEBUG" \