From 5242fc2b27963571c218e328c1288b337ee95e17 Mon Sep 17 00:00:00 2001
From: Francois Ferrand <francois.ferrand@scality.com>
Date: Tue, 13 Aug 2024 16:34:21 +0200
Subject: [PATCH] Remove patching of PRA zenkoversion

Issue: ZENKO-4856
---
 .github/actions/deploy/action.yaml                |  6 ------
 .github/scripts/end2end/configs/zenkoversion.yaml |  1 -
 .github/workflows/end2end.yaml                    | 15 ++++-----------
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/.github/actions/deploy/action.yaml b/.github/actions/deploy/action.yaml
index af3e274ed3..1fc7708f0c 100644
--- a/.github/actions/deploy/action.yaml
+++ b/.github/actions/deploy/action.yaml
@@ -7,10 +7,6 @@ inputs:
     description: "The tag of the Zenko Operator image to use"
     required: false
     default: ""
-  extra_components:
-    description: "Extra components to add to zenkoversion"
-    required: false
-    default: ""
 runs:
   using: composite
   steps:
@@ -78,8 +74,6 @@ runs:
       shell: bash
       run: bash deploy-zenko.sh end2end default
       working-directory: ./.github/scripts/end2end
-      env:
-        EXTRA_COMPONENTS: ${{ inputs.extra_components }}
     - name: Add Keycloak user and assign StorageManager role
       shell: bash
       run: bash keycloak-helper.sh add-user default
diff --git a/.github/scripts/end2end/configs/zenkoversion.yaml b/.github/scripts/end2end/configs/zenkoversion.yaml
index b5e60971a2..a50e6c6604 100644
--- a/.github/scripts/end2end/configs/zenkoversion.yaml
+++ b/.github/scripts/end2end/configs/zenkoversion.yaml
@@ -130,7 +130,6 @@ spec:
         image: '${REDIS_EXPORTER_IMAGE}'
         tag: '${REDIS_EXPORTER_TAG}'
       kubedb: '${REDIS_KUBEDB_TAG}'
-    ${EXTRA_COMPONENTS}
   defaults:
     backbeatConcurrency:
       lifecycleBucketProcessor: 30
diff --git a/.github/workflows/end2end.yaml b/.github/workflows/end2end.yaml
index 4d7e42b514..c17533faab 100644
--- a/.github/workflows/end2end.yaml
+++ b/.github/workflows/end2end.yaml
@@ -92,7 +92,6 @@ env:
   KUBECTL_VERSION: "1.30.0"
   TILT_VERSION: "0.23.4"
   KIND_VERSION: "v0.12.0"
-  DRCTL_TAG: "v1.0.2"
   ZENKO_ENABLE_SOSAPI: false
   TIME_PROGRESSION_FACTOR: 1
   EXPIRE_ONE_DAY_EARLIER: true
@@ -381,6 +380,10 @@ jobs:
         shell: bash
         run: |-
           echo "CTST_TAG=$(sed 's/.*"cli-testing": ".*#\(.*\)".*/\1/;t;d' ./tests/ctst/package.json)" >> $GITHUB_ENV
+      - name: Get CTST image tag
+        shell: bash
+        run: |-
+          echo "DRCTL_TAG=$(yq eval .drctl.tag solution/deps.yaml)" >> $GITHUB_ENV
       - name: Build and push CI image
         uses: docker/build-push-action@v5
         with:
@@ -478,12 +481,6 @@ jobs:
           registry: ghcr.io
       - name: Deploy Zenko
         uses: ./.github/actions/deploy
-        with:
-          zkop_tag: 1.6.0-preview.2
-          extra_components: |
-            drctl:
-                  image: ghcr.io/scality/zenko-drctl
-                  tag: ${{ env.DRCTL_TAG }}
       - name: Prepare PRA environment
         run: bash prepare-pra.sh
         working-directory: ./.github/scripts/end2end
@@ -491,10 +488,6 @@ jobs:
         run: bash deploy-zenko.sh end2end-pra default './configs/zenko.yaml'
         env:
           ZENKO_MONGODB_DATABASE: "pradb"
-          EXTRA_COMPONENTS: |
-            drctl:
-                  image: 'ghcr.io/scality/zenko-drctl'
-                  tag: ${{ env.DRCTL_TAG }}
         working-directory: ./.github/scripts/end2end
       - name: Add Keycloak pra user and assign StorageManager role
         shell: bash