Update .forgejo/workflows/deploy.yaml

.forgejo/workflows/deploy.yaml

@@ -23,6 +23,7 @@ jobs:
 
       - name: Build & Push Backend
         run: |
+          # Build usando SHA para imutabilidade e latest para conveniência
           docker build -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/gohorsejobs:${{ github.sha }} \
             -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/gohorsejobs:latest ./backend
           docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/gohorsejobs:${{ github.sha }}
@@ -59,54 +60,86 @@ jobs:
         run: |
           kubectl create namespace gohorsejobsdev --dry-run=client -o yaml | kubectl apply -f -
 
+          # Sincroniza Registry Secret
           kubectl get secret forgejo-registry-secret --namespace=forgejo -o yaml | \
           sed 's/namespace: forgejo/namespace: gohorsejobsdev/' | \
           kubectl apply -f - --force
 
+          # Injeta variáveis (Lembre-se de mudar DATABASE_URL para sslmode=disable no Forgejo!)
           kubectl delete secret backend-secrets -n gohorsejobsdev --ignore-not-found
 
-          # LIMPEZA CRÍTICA DA CHAVE
+          # Prepare RSA key file if available (prefer secrets over vars)
-          RAW_KEY="${{ secrets.RSA_PRIVATE_KEY_BASE64 || vars.RSA_PRIVATE_KEY_BASE64 }}"
+          if [ -n "${{ secrets.RSA_PRIVATE_KEY_BASE64 }}" ]; then
-          CLEAN_KEY=$(echo "$RAW_KEY" | tr -d '[:space:]')
+            echo "Decoding RSA_PRIVATE_KEY_BASE64 from secrets"
+            printf '%b' "${{ secrets.RSA_PRIVATE_KEY_BASE64 }}" > /tmp/rsa_key.pem || true
+            # if it's base64-encoded PEM, decode it
+            if base64 -d /tmp/rsa_key.pem >/dev/null 2>&1; then
+              base64 -d /tmp/rsa_key.pem > /tmp/rsa_key_decoded.pem && mv /tmp/rsa_key_decoded.pem /tmp/rsa_key.pem || true
+            fi
+          elif [ -n "${{ vars.RSA_PRIVATE_KEY_BASE64 }}" ]; then
+            echo "Decoding RSA_PRIVATE_KEY_BASE64 from vars"
+            printf '%b' "${{ vars.RSA_PRIVATE_KEY_BASE64 }}" > /tmp/rsa_key.pem || true
+            if base64 -d /tmp/rsa_key.pem >/dev/null 2>&1; then
+              base64 -d /tmp/rsa_key.pem > /tmp/rsa_key_decoded.pem && mv /tmp/rsa_key_decoded.pem /tmp/rsa_key.pem || true
+            fi
+          fi
 
-          # CONSTRUÇÃO DO SECRET (Misturando stringData para texto e data para a chave binária)
+          # Create secret: if rsa file exists, create secret from file (robust); otherwise fallback to from-literal
-          cat <<EOF | kubectl apply -f -
+          if [ -f /tmp/rsa_key.pem ]; then
-          apiVersion: v1
+            kubectl create secret generic backend-secrets -n gohorsejobsdev \
-          kind: Secret
+              --from-literal=MTU="${{ vars.MTU }}" \
-          metadata:
+              --from-literal=DATABASE_URL="${{ vars.DATABASE_URL }}" \
-            name: backend-secrets
+              --from-literal=AMQP_URL="${{ vars.AMQP_URL }}" \
-            namespace: gohorsejobsdev
+              --from-literal=JWT_SECRET="${{ vars.JWT_SECRET }}" \
-          type: Opaque
+              --from-literal=JWT_EXPIRATION="${{ vars.JWT_EXPIRATION }}" \
-          stringData:
+              --from-literal=PASSWORD_PEPPER="${{ vars.PASSWORD_PEPPER }}" \
-            MTU: "${{ vars.MTU }}"
+              --from-literal=COOKIE_SECRET="${{ vars.COOKIE_SECRET }}" \
-            DATABASE_URL: "${{ vars.DATABASE_URL }}"
+              --from-literal=COOKIE_DOMAIN="${{ vars.COOKIE_DOMAIN }}" \
-            AMQP_URL: "${{ vars.AMQP_URL }}"
+              --from-literal=BACKEND_PORT="${{ vars.BACKEND_PORT }}" \
-            JWT_SECRET: "${{ vars.JWT_SECRET }}"
+              --from-literal=BACKEND_HOST="${{ vars.BACKEND_HOST }}" \
-            JWT_EXPIRATION: "${{ vars.JWT_EXPIRATION }}"
+              --from-literal=ENV="${{ vars.ENV }}" \
-            PASSWORD_PEPPER: "${{ vars.PASSWORD_PEPPER }}"
+              --from-literal=CORS_ORIGINS="${{ vars.CORS_ORIGINS }}" \
-            COOKIE_SECRET: "${{ vars.COOKIE_SECRET }}"
+              --from-literal=S3_BUCKET="${{ vars.S3_BUCKET }}" \
-            COOKIE_DOMAIN: "${{ vars.COOKIE_DOMAIN }}"
+              --from-literal=AWS_REGION="${{ vars.AWS_REGION }}" \
-            BACKEND_PORT: "${{ vars.BACKEND_PORT }}"
+              --from-literal=AWS_ENDPOINT="${{ vars.AWS_ENDPOINT }}" \
-            BACKEND_HOST: "${{ vars.BACKEND_HOST }}"
+              --from-literal=AWS_ACCESS_KEY_ID="${{ vars.AWS_ACCESS_KEY_ID }}" \
-            ENV: "${{ vars.ENV }}"
+              --from-literal=AWS_SECRET_ACCESS_KEY="${{ vars.AWS_SECRET_ACCESS_KEY }}" \
-            CORS_ORIGINS: "${{ vars.CORS_ORIGINS }}"
+              --from-file=private_key.pem=/tmp/rsa_key.pem \
-            S3_BUCKET: "${{ vars.S3_BUCKET }}"
+              --dry-run=client -o yaml | kubectl apply -f -
-            AWS_REGION: "${{ vars.AWS_REGION }}"
+          else
-            AWS_ENDPOINT: "${{ vars.AWS_ENDPOINT }}"
+            kubectl create secret generic backend-secrets -n gohorsejobsdev \
-            AWS_ACCESS_KEY_ID: "${{ vars.AWS_ACCESS_KEY_ID }}"
+              --from-literal=MTU="${{ vars.MTU }}" \
-            AWS_SECRET_ACCESS_KEY: "${{ vars.AWS_SECRET_ACCESS_KEY }}"
+              --from-literal=DATABASE_URL="${{ vars.DATABASE_URL }}" \
-          data:
+              --from-literal=AMQP_URL="${{ vars.AMQP_URL }}" \
-            private_key.pem: "$CLEAN_KEY"
+              --from-literal=JWT_SECRET="${{ vars.JWT_SECRET }}" \
-          EOF
+              --from-literal=JWT_EXPIRATION="${{ vars.JWT_EXPIRATION }}" \
+              --from-literal=PASSWORD_PEPPER="${{ vars.PASSWORD_PEPPER }}" \
+              --from-literal=COOKIE_SECRET="${{ vars.COOKIE_SECRET }}" \
+              --from-literal=COOKIE_DOMAIN="${{ vars.COOKIE_DOMAIN }}" \
+              --from-literal=BACKEND_PORT="${{ vars.BACKEND_PORT }}" \
+              --from-literal=BACKEND_HOST="${{ vars.BACKEND_HOST }}" \
+              --from-literal=ENV="${{ vars.ENV }}" \
+              --from-literal=CORS_ORIGINS="${{ vars.CORS_ORIGINS }}" \
+              --from-literal=S3_BUCKET="${{ vars.S3_BUCKET }}" \
+              --from-literal=AWS_REGION="${{ vars.AWS_REGION }}" \
+              --from-literal=AWS_ENDPOINT="${{ vars.AWS_ENDPOINT }}" \
+              --from-literal=AWS_ACCESS_KEY_ID="${{ vars.AWS_ACCESS_KEY_ID }}" \
+              --from-literal=AWS_SECRET_ACCESS_KEY="${{ vars.AWS_SECRET_ACCESS_KEY }}" \
+              --from-literal=RSA_PRIVATE_KEY_BASE64="${{ vars.RSA_PRIVATE_KEY_BASE64 }}" \
+              --dry-run=client -o yaml | kubectl apply -f -
+          fi
 
       - name: Deploy to K3s
         run: |
           kubectl apply -f k8s/dev/ -n gohorsejobsdev
           
+          # Vincula o deployment ao SHA específico para garantir que o Pull ocorra corretamente
           kubectl -n gohorsejobsdev set image deployment/gohorse-backend-dev backend=${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/gohorsejobs:${{ github.sha }}
           kubectl -n gohorsejobsdev set image deployment/gohorse-backoffice-dev backoffice=${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/backoffice:${{ github.sha }}
           
+          # Força o restart para carregar os novos valores do secret backend-secrets
           kubectl -n gohorsejobsdev rollout restart deployment/gohorse-backend-dev
           kubectl -n gohorsejobsdev rollout restart deployment/gohorse-backoffice-dev
           
+          # Aguarda estabilização
           kubectl -n gohorsejobsdev rollout status deployment/gohorse-backend-dev --timeout=120s