From bc12d7a5c375dec769df500dc56c0e8c7666a4e2 Mon Sep 17 00:00:00 2001
From: Vitor Hideyoshi <vitor.h.n.batista@gmail.com>
Date: Fri, 7 Nov 2025 18:32:16 -0300
Subject: [PATCH] fix: fixes broken deployment

---
 .github/workflows/deploy.yml |  9 +++------
 deploy.sh                    | 25 +++++++++++--------------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index ca59d14..b99dca8 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,5 +1,3 @@
-name: remote ssh command
-
 on:
     repository_dispatch:
         types: 
@@ -13,6 +11,9 @@ jobs:
         name: Deploy to Cluster
         runs-on: ubuntu-latest
         timeout-minutes: 30
+        env:
+            GHCR_USERNAME: ${{ secrets.GHCR_USERNAME }}
+            GHCR_TOKEN: ${{ secrets.GHCR_TOKEN }}
 
         steps:
             - name: Checkout Repository
@@ -24,10 +25,6 @@ jobs:
                   method: kubeconfig
                   kubeconfig: ${{ secrets.PORTFOLIO_KUBECONFIG }}
 
-            - name: Configures GHCR credentials
-              run: |
-                  echo ${{ secrets.GHCR_TOKEN }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin
-
             - name: Execute deploy
               run: |
                   ./deploy.sh
\ No newline at end of file
diff --git a/deploy.sh b/deploy.sh
index 4aa1a85..094b750 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -28,17 +28,14 @@ kubectl apply -f manifest/charts/cert-manager
 
 
 ### set application namespaces and configures docker registry secret ###
-if [[ -f $HOME/.docker/config.json ]]; then
-    for NAMESPACE in ${NAMESPACES_LIST//,/ }; do
-        kubectl create namespace $NAMESPACE \
-            --dry-run=client -o yaml | kubectl apply -f -
-            
-        kubectl create secret generic $(echo $NAMESPACE | tr '[:upper:]' '[:lower:]')-regcred \
-            --from-file=.dockerconfigjson=$HOME/.docker/config.json \
-            --type=kubernetes.io/dockerconfigjson \
-            -n $NAMESPACE \
-            --dry-run=client -o yaml | kubectl apply -f -
-    done
-else
-    echo "Docker config file not found at $HOME/.docker/config.json. Skipping registry secret creation."
-fi
\ No newline at end of file
+for NAMESPACE in ${NAMESPACES_LIST//,/ }; do
+    kubectl create namespace $NAMESPACE \
+        --dry-run=client -o yaml | kubectl apply -f -
+
+    kubectl create secret docker-registry ghcr-secret \
+        --docker-server=ghcr.io \
+        --docker-username=$GHCR_USERNAME \
+        --docker-password=$GHCR_TOKEN \
+        --docker-email=unused \
+        --namespace=$NAMESPACE
+done
\ No newline at end of file