From 4b81a020d001d122bd888c88e4435c27d7d54c8c Mon Sep 17 00:00:00 2001
From: Andrea Mazzotti <andrea.mazzotti@suse.com>
Date: Thu, 22 Aug 2024 16:00:48 +0200
Subject: [PATCH 1/2] Remove -chart suffix from OBS chart build process

Signed-off-by: Andrea Mazzotti <andrea.mazzotti@suse.com>
---
 .obs/chartfile/crds/Chart.yaml     | 6 +++---
 .obs/chartfile/operator/Chart.yaml | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.obs/chartfile/crds/Chart.yaml b/.obs/chartfile/crds/Chart.yaml
index 900e7feb5..3feeb8f0e 100644
--- a/.obs/chartfile/crds/Chart.yaml
+++ b/.obs/chartfile/crds/Chart.yaml
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
-#!BuildTag: rancher/elemental-operator-crds-chart:latest
-#!BuildTag: rancher/elemental-operator-crds-chart:%VERSION%
-#!BuildTag: rancher/elemental-operator-crds-chart:%VERSION%-%RELEASE%
+#!BuildTag: rancher/elemental-operator-crds:latest
+#!BuildTag: rancher/elemental-operator-crds:%VERSION%
+#!BuildTag: rancher/elemental-operator-crds:%VERSION%-%RELEASE%
 apiVersion: v2
 name: elemental-operator-crds
 description: A Helm chart for deploying Rancher Elemental Operator CRDs
diff --git a/.obs/chartfile/operator/Chart.yaml b/.obs/chartfile/operator/Chart.yaml
index 68ca24116..9a394a0e2 100644
--- a/.obs/chartfile/operator/Chart.yaml
+++ b/.obs/chartfile/operator/Chart.yaml
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
-#!BuildTag: rancher/elemental-operator-chart:latest
-#!BuildTag: rancher/elemental-operator-chart:%VERSION%
-#!BuildTag: rancher/elemental-operator-chart:%VERSION%-%RELEASE%
+#!BuildTag: rancher/elemental-operator:latest
+#!BuildTag: rancher/elemental-operator:%VERSION%
+#!BuildTag: rancher/elemental-operator:%VERSION%-%RELEASE%
 apiVersion: v2
 name: elemental-operator
 description: Elemental provides Cloud Native OS Management for Cluster Nodes.

From a75af708262443d0fb20845c2fa16e22290040eb Mon Sep 17 00:00:00 2001
From: Andrea Mazzotti <andrea.mazzotti@suse.com>
Date: Thu, 22 Aug 2024 16:59:50 +0200
Subject: [PATCH 2/2] Fix tests

Signed-off-by: Andrea Mazzotti <andrea.mazzotti@suse.com>
---
 .github/actions/chart/action.yaml | 4 ++--
 .github/workflows/e2e.yaml        | 6 +++---
 .obs/helper_scripts/listimages.sh | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/actions/chart/action.yaml b/.github/actions/chart/action.yaml
index fe3c450d9..64d019a6c 100644
--- a/.github/actions/chart/action.yaml
+++ b/.github/actions/chart/action.yaml
@@ -24,8 +24,8 @@ runs:
     - name: Pull chart from OBS
       env:
         B_REPO: ${{ steps.set_repo.outputs.build_repo }}
-        OPERATOR_CHART: rancher/elemental-operator-chart
-        CRDS_CHART: rancher/elemental-operator-crds-chart
+        OPERATOR_CHART: rancher/elemental-operator
+        CRDS_CHART: rancher/elemental-operator-crds
       shell: bash
       run: |
         mkdir -p build
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index fb1a8b54d..2cd038816 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -65,8 +65,8 @@ jobs:
       - name: Pull chart for PR
         env:
           PR_NUMBER: ${{ github.event.number }}
-          OPERATOR_CHART: rancher/elemental-operator-chart
-          CRDS_CHART: rancher/elemental-operator-crds-chart
+          OPERATOR_CHART: rancher/elemental-operator
+          CRDS_CHART: rancher/elemental-operator-crds
         run: |
           set -x
           B_REPO=registry.opensuse.org/isv/rancher/elemental/pr/rancher/elemental-operator/pr-${PR_NUMBER}/charts
@@ -77,7 +77,7 @@ jobs:
         id: chart
         run: |
           set -x
-          FILE=$(find . -type f  -name "elemental-operator-chart-[1-9]*.tgz" -print)
+          FILE=$(find . -type f  -name "elemental-operator-[1-9]*.tgz" -print)
           CHART=$(basename $FILE)
           echo "chart_name=$CHART" >> $GITHUB_OUTPUT
       - name: Upload chart
diff --git a/.obs/helper_scripts/listimages.sh b/.obs/helper_scripts/listimages.sh
index cff2975a6..4b46a51e8 100755
--- a/.obs/helper_scripts/listimages.sh
+++ b/.obs/helper_scripts/listimages.sh
@@ -47,6 +47,6 @@ if [ ${REGISTRY} != "registry.suse.com" ]; then
   REGISTRY="$(dirname ${REGISTRY})/charts"
 fi
 
-echo "${REGISTRY}/rancher/elemental-operator-crds-chart:${OPERATOR}"
-echo "${REGISTRY}/rancher/elemental-operator-chart:${OPERATOR}"
+echo "${REGISTRY}/rancher/elemental-operator-crds:${OPERATOR}"
+echo "${REGISTRY}/rancher/elemental-operator:${OPERATOR}"