From 18626a8fc6346740a3138f875af4b018a382c19a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Benito=20Calzada?= <bjesus@vmware.com>
Date: Thu, 20 Oct 2022 17:56:53 +0200
Subject: [PATCH 1/4] Add a suffix to the "latest" tag for the production
 images generated from GHA in DEV_MODE
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jesús Benito Calzada <bjesus@vmware.com>
---
 .github/workflows/kubeapps.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/kubeapps.yaml b/.github/workflows/kubeapps.yaml
index ba24039d507..2717acc139d 100644
--- a/.github/workflows/kubeapps.yaml
+++ b/.github/workflows/kubeapps.yaml
@@ -508,6 +508,10 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
       - uses: actions/download-artifact@v3
       - run: |
+          if [[ "${DEV_MODE}" == true && "IMG_PROD_TAG" == latest ]]; then
+            IMG_PROD_TAG="${IMG_PROD_TAG}-gha"
+          fi
+          
           for artifact in *; do
             echo "::debug::Processing artifact '${artifact}'"
 

From c3ecc12ce31a5d3efc65d22e16d0daa518857ff3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Benito=20Calzada?= <bjesus@vmware.com>
Date: Thu, 20 Oct 2022 18:15:32 +0200
Subject: [PATCH 2/4] Add a suffix to the tag of the images pushed from GHA's
 "push_images" job (the production ones)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jesús Benito Calzada <bjesus@vmware.com>
---
 .github/workflows/kubeapps.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/kubeapps.yaml b/.github/workflows/kubeapps.yaml
index 2717acc139d..b0cb953bfaf 100644
--- a/.github/workflows/kubeapps.yaml
+++ b/.github/workflows/kubeapps.yaml
@@ -508,7 +508,7 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
       - uses: actions/download-artifact@v3
       - run: |
-          if [[ "${DEV_MODE}" == true && "IMG_PROD_TAG" == latest ]]; then
+          if [[ "${DEV_MODE}" == true ]]; then
             IMG_PROD_TAG="${IMG_PROD_TAG}-gha"
           fi
           

From aa6dc74cd604518138a4bf9e4e29a39d3a507f6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Benito=20Calzada?= <bjesus@vmware.com>
Date: Fri, 21 Oct 2022 07:09:39 +0200
Subject: [PATCH 3/4] Fix show GitHub Event and PR Context steps in GHA
 workflow's setup job
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jesús Benito Calzada <bjesus@vmware.com>
---
 .github/workflows/kubeapps.yaml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/kubeapps.yaml b/.github/workflows/kubeapps.yaml
index b0cb953bfaf..ef1a55c0eb2 100644
--- a/.github/workflows/kubeapps.yaml
+++ b/.github/workflows/kubeapps.yaml
@@ -73,14 +73,10 @@ jobs:
       running_on_tag: ${{ steps.set-outputs.outputs.running_on_tag }}
       triggered_from_fork: ${{ steps.set-outputs.outputs.triggered_from_fork }}
     steps:
-      - name: Show GitHub event
-        env:
-          EVENT_CONTEXT: ${{ toJSON(github.event) }}
-        run: echo $EVENT_CONTEXT | jq
-      - name: Show PR context
-        env:
-          PR_CONTEXT: ${{ toJSON(github.event.pull_request) }}
-        run: echo $EVENT_CONTEXT | jq
+      - name: Show GitHub Event
+        run: echo ${{ toJSON(github.event) }} | jq
+      - name: Show PR Context
+        run: echo ${{ toJSON(github.event.pull_request) }} | jq
       - name: Set outputs
         id: set-outputs
         env:

From 4684d08dee932ffffe521d8a62a09cd1f5ac6142 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Benito=20Calzada?= <bjesus@vmware.com>
Date: Fri, 21 Oct 2022 07:18:31 +0200
Subject: [PATCH 4/4] Fix show PR Context step in GHA kubeapps general
 workflow's setup job
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jesús Benito Calzada <bjesus@vmware.com>
---
 .github/workflows/kubeapps.yaml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/kubeapps.yaml b/.github/workflows/kubeapps.yaml
index ef1a55c0eb2..26b3ccb159b 100644
--- a/.github/workflows/kubeapps.yaml
+++ b/.github/workflows/kubeapps.yaml
@@ -73,10 +73,14 @@ jobs:
       running_on_tag: ${{ steps.set-outputs.outputs.running_on_tag }}
       triggered_from_fork: ${{ steps.set-outputs.outputs.triggered_from_fork }}
     steps:
-      - name: Show GitHub Event
-        run: echo ${{ toJSON(github.event) }} | jq
-      - name: Show PR Context
-        run: echo ${{ toJSON(github.event.pull_request) }} | jq
+      - name: Show GitHub event
+        env:
+          EVENT_CONTEXT: ${{ toJSON(github.event) }}
+        run: echo $EVENT_CONTEXT | jq
+      - name: Show PR context
+        env:
+          PR_CONTEXT: ${{ toJSON(github.event.pull_request) }}
+        run: echo $PR_CONTEXT | jq
       - name: Set outputs
         id: set-outputs
         env: