From ec67c0689d5f1ce11a46f3f6de5271d8f4ff2acc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chabrolles?= <s.chabrolles@fr.ibm.com>
Date: Sun, 9 Jun 2024 13:08:38 +0200
Subject: [PATCH] update 1.5.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Sébastien Chabrolles <s.chabrolles@fr.ibm.com>
---
 .../cpd-install-pipeline/templates/cpd-install-pipeline.yaml  | 4 +++-
 .../templates/cpd-uninstall-instance-pipeline.yaml            | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/charts/cpd-install-pipeline/templates/cpd-install-pipeline.yaml b/charts/cpd-install-pipeline/templates/cpd-install-pipeline.yaml
index 821eda5..132f6d5 100644
--- a/charts/cpd-install-pipeline/templates/cpd-install-pipeline.yaml
+++ b/charts/cpd-install-pipeline/templates/cpd-install-pipeline.yaml
@@ -377,10 +377,12 @@ spec:
       value: $(params.CP-INSTALL-OPTIONS)
     - name: OLM_CMD
       value: |-
+        COMPONENTS=$(echo $(params.COMPONENTS) | tr -d '[:space:]')
+
         apply-olm \
         --release=$(params.VERSION) \
         --cpd_operator_ns=$(params.PROJECT_CPD_INST_OPERATORS) \
-        --components=$(params.COMPONENTS) \
+        --components=$COMPONENTS \
         --case_download=true \
         --from_oci=$(params.CASE_FROM_OCI) \
         --oci_location=$(params.OCI_LOCATION)
diff --git a/charts/cpd-install-pipeline/templates/cpd-uninstall-instance-pipeline.yaml b/charts/cpd-install-pipeline/templates/cpd-uninstall-instance-pipeline.yaml
index bb67ff6..c83f613 100644
--- a/charts/cpd-install-pipeline/templates/cpd-uninstall-instance-pipeline.yaml
+++ b/charts/cpd-install-pipeline/templates/cpd-uninstall-instance-pipeline.yaml
@@ -75,7 +75,7 @@ spec:
           value: '$(params.OLM_UTILS_IMAGE):$(params.VERSION){{- if ne .Values.arch "x86" -}} .{{  .Values.arch }}{{- end }}'
         - name: OLM_CMD
           value: |-
-            IBM_LICENSING=$(params.PROJECT_LICENSE_SERVICE)
+            IBM_LICENSING=$(echo $(params.PROJECT_LICENSE_SERVICE) | tr -d '[:space:]')
             oc get project ${IBM_LICENSING} > /dev/null 2>&1
             if [ $? -eq 0 ];then
                 echo "Deleting everything in the ${IBM_LICENSING} project"
@@ -112,7 +112,7 @@ spec:
           value: '$(params.OLM_UTILS_IMAGE):$(params.VERSION){{- if ne .Values.arch "x86" -}} .{{  .Values.arch }}{{- end }}'
         - name: OLM_CMD
           value: |-
-            IBM_CERT_MANAGER=$(params.PROJECT_CERT_MANAGER)
+            IBM_CERT_MANAGER=$( echo $(params.PROJECT_CERT_MANAGER) | tr -d '[:space:]')
             oc get project ${IBM_CERT_MANAGER} > /dev/null 2>&1
             if [ $? -eq 0 ];then
                 echo "Deleting everything in the ${IBM_CERT_MANAGER} project"