From 800ec544d2e2dcc7f5fba35d71c2028ca6c8a116 Mon Sep 17 00:00:00 2001 From: Marcus Date: Sat, 31 Jan 2026 15:51:56 -0300 Subject: [PATCH] ajustes novos --- .forgejo/workflows/deploy.yaml | 26 ++++++++++++++++++-------- k8s/dev/backend-deployment-dev.yaml | 2 +- k8s/dev/backoffice-deployment-dev.yaml | 2 +- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index 1bea78c..482b4cf 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -9,7 +9,6 @@ env: REGISTRY: pipe.gohorsejobs.com IMAGE_NAMESPACE: bohessefm DOCKER_HOST: unix:///run/docker.sock - # AJUSTE: BuildKit desativado para compatibilidade com o Docker do seu Runner DOCKER_BUILDKIT: 0 jobs: @@ -30,11 +29,9 @@ jobs: - name: Build & Push Backend run: | - # Build usando o builder padrão (legacy) docker build -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/gohorsejobs:${{ github.sha }} \ -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/gohorsejobs:latest ./backend - # Push --quiet para não sobrecarregar o banco do Forgejo com logs docker push --quiet ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/gohorsejobs:${{ github.sha }} docker push --quiet ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/gohorsejobs:latest @@ -56,20 +53,33 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Deploy to K3s + - name: Configure Kubeconfig + # Esse passo garante que o kubectl tenha autoridade para executar comandos + run: | + mkdir -p ~/.kube + cp /etc/rancher/k3s/k3s.yaml ~/.kube/config + chmod 600 ~/.kube/config + + - name: Sync Registry Secret + # Copia o secret do namespace forgejo para o namespace do dev automaticamente run: | - # Garante o namespace kubectl create namespace gohorsejobsdev --dry-run=client -o yaml | kubectl apply -f - - # Aplica os manifestos do diretório + kubectl get secret forgejo-registry-secret --namespace=forgejo -o yaml | \ + sed 's/namespace: forgejo/namespace: gohorsejobsdev/' | \ + kubectl apply -f - + + - name: Deploy to K3s + run: | + # Aplica os manifestos (Deployment, Service, etc) kubectl apply -f k8s/dev/ -n gohorsejobsdev - # Atualiza as imagens nos deployments + # Força a atualização com a imagem gerada neste commit 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 }} - # Aguarda o rollout para confirmar o sucesso + # Verifica se o deploy estabilizou kubectl -n gohorsejobsdev rollout status deployment/gohorse-backend-dev --timeout=120s \ No newline at end of file diff --git a/k8s/dev/backend-deployment-dev.yaml b/k8s/dev/backend-deployment-dev.yaml index e4e8562..1ee0730 100644 --- a/k8s/dev/backend-deployment-dev.yaml +++ b/k8s/dev/backend-deployment-dev.yaml @@ -15,7 +15,7 @@ spec: env: development spec: imagePullSecrets: - - name: forgejo-registry + - name: forgejo-registry-secret initContainers: - name: set-mtu image: busybox diff --git a/k8s/dev/backoffice-deployment-dev.yaml b/k8s/dev/backoffice-deployment-dev.yaml index c1e57e2..b9be3fb 100644 --- a/k8s/dev/backoffice-deployment-dev.yaml +++ b/k8s/dev/backoffice-deployment-dev.yaml @@ -15,7 +15,7 @@ spec: env: development spec: imagePullSecrets: - - name: forgejo-registry + - name: forgejo-registry-secret initContainers: - name: set-mtu image: busybox