From a3cf5ff3639e42a02b89968c75a7fd0d941e8393 Mon Sep 17 00:00:00 2001
From: Luiz Carvalho <lucarval@redhat.com>
Date: Tue, 20 Feb 2024 11:50:26 -0500
Subject: [PATCH] Use official tkn-cli image

This also disables the shellspec tests used to test the tkn-bundle Task
definition. These will be ported over to e2e-tests in EC-456.

Ref: https://issues.redhat.com/browse/EC-425

Signed-off-by: Luiz Carvalho <lucarval@redhat.com>
---
 .github/workflows/shellspec.yaml    | 28 ----------------------------
 policies/all-tasks.yaml             |  2 --
 renovate.json                       |  2 +-
 task/tkn-bundle/0.1/tkn-bundle.yaml |  2 +-
 4 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 .github/workflows/shellspec.yaml

diff --git a/.github/workflows/shellspec.yaml b/.github/workflows/shellspec.yaml
deleted file mode 100644
index 0bc6d82aad..0000000000
--- a/.github/workflows/shellspec.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-name: Shellspec Tests
-
-"on":
-  pull_request:
-    branches:
-      - main
-  push:
-    branches:
-      - main
-
-jobs:
-  Shellspec:
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - uses: jerop/tkn@v0.2.0
-        with:
-          version: v0.32.2
-
-      - name: Shellspec
-        run: hack/test-shellspec.sh
diff --git a/policies/all-tasks.yaml b/policies/all-tasks.yaml
index 707b4a1d5b..3f14816a9f 100644
--- a/policies/all-tasks.yaml
+++ b/policies/all-tasks.yaml
@@ -13,7 +13,5 @@ sources:
       exclude:
         # https://issues.redhat.com/browse/KFLUXBUGS-1111
         - step_image_registries.step_images_permitted:generate-odcs-compose/noversion
-        # https://issues.redhat.com/browse/EC-425
-        - step_image_registries.step_images_permitted:tkn-bundle/0.1
         # https://issues.redhat.com/browse/KFLUXBUGS-1110
         - step_image_registries.step_images_permitted:verify-signed-rpms/noversion
diff --git a/renovate.json b/renovate.json
index e662a34e5a..d4a0c2c63c 100644
--- a/renovate.json
+++ b/renovate.json
@@ -29,7 +29,7 @@
         "quay.io/enterprise-contract/"
       ],
       "matchPackageNames": [
-        "quay.io/openshift-pipeline/openshift-pipelines-cli-tkn"
+        "registry.redhat.io/openshift-pipelines/pipelines-cli-tkn-rhel8"
       ],
       "groupName": "ec",
       "reviewers": ["zregvart", "lcarva"]
diff --git a/task/tkn-bundle/0.1/tkn-bundle.yaml b/task/tkn-bundle/0.1/tkn-bundle.yaml
index 81c4eb1a6e..4e1d62a22c 100644
--- a/task/tkn-bundle/0.1/tkn-bundle.yaml
+++ b/task/tkn-bundle/0.1/tkn-bundle.yaml
@@ -110,7 +110,7 @@ spec:
 
       printf "%s\n" "${FILES[@]}" > "${TASK_FILE}"
     workingDir: $(workspaces.source.path)
-  - image: quay.io/openshift-pipeline/openshift-pipelines-cli-tkn:5.0
+  - image: registry.redhat.io/openshift-pipelines/pipelines-cli-tkn-rhel8:v1.13.1@sha256:575faccd21c06a4f33e39382b9dc17681c60b41ef0e124d2980b75c39909c36a
     name: build
     env:
     - name: CONTEXT