From 07b78aba6dd8ec4299958c6fbbadf487c433e6b8 Mon Sep 17 00:00:00 2001
From: "amy.muhimpundu" <amy.muhimpundu@oneacrefund.org>
Date: Tue, 3 Dec 2024 17:52:42 +0200
Subject: [PATCH] chore: Fix issue of secrets not working in with block

---
 .github/workflows/build.yml  |  4 ++++
 .github/workflows/deploy.yml | 15 +++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 085e34720..91368b7ca 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -125,19 +125,23 @@ jobs:
   ## Deploy to the various clusters
   Integration-k8s:
     if: github.event.ref == 'refs/heads/develop'
+    runs-on: ubuntu-latest
     needs: [build, sonarcloud]
     uses: ./.github/workflows/deploy.yml
     with:
       environment: "Integration"
+    secrets:
       k8s_url: "${{ secrets.K8S_TEST_URL }}"
       k8s_secret: "${{ secrets.K8S_TEST_DEFAULT }}"
 
   QA-k8s:
+    runs-on: ubuntu-latest
     needs: Integration-k8s
     if: github.event.ref == 'refs/heads/develop'
     uses: ./.github/workflows/deploy.yml
     with:
       environment: "QA"
+    secrets:
       k8s_url: "${{ secrets.K8S_QA_URL }}"
       k8s_secret: "${{ secrets.K8S_QA_DEFAULT }}"
 
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 719607eb1..c88421f26 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -6,12 +6,11 @@ on:
       environment:
         required: true
         type: string
-      k8s_url:
-        required: true
-        type: string
-      k8s_secret:
-        required: true
-        type: string
+      secrets:
+        k8s_url:
+          required: true
+        k8s_secret:
+          required: true
 
 jobs:
   deploy:
@@ -27,8 +26,8 @@ jobs:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           RUN_ID: "${{ github.run_id }}"
           CI_REPOSITORY: "${{ github.repository }}"
-          K8S_URL: "${{ inputs.k8s_url }}"
-          K8S_SECRET: "${{ inputs.k8s_secret }}"
+          K8S_URL: "${{ secrets.k8s_url }}"
+          K8S_SECRET: "${{ secrets.k8s_secret }}"
 
       - uses: "./.github/actions/helm_fineract_frontend"
         with: