From 0c14f98f0c23e46b75afc2e1911efb25850f66ec Mon Sep 17 00:00:00 2001 From: "Greedy.Death" Date: Tue, 18 Mar 2025 09:30:39 +0000 Subject: [PATCH] Update .gitea/workflows/docker-build-and-push.yaml --- .gitea/workflows/docker-build-and-push.yaml | 14 ++++++++------ .gitea/workflows/k8s-deploy.yml | 6 +++++- .gitea/workflows/prisma-migrate.yaml | 16 ++++++++++++++-- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/docker-build-and-push.yaml b/.gitea/workflows/docker-build-and-push.yaml index c7f2253..480684f 100644 --- a/.gitea/workflows/docker-build-and-push.yaml +++ b/.gitea/workflows/docker-build-and-push.yaml @@ -27,12 +27,6 @@ jobs: image: catthehacker/ubuntu:act-22.04 steps: - - - name: Checkout code - uses: actions/checkout@v3 - with: - submodules: recursive - fetch-depth: 0 - name: Import Secrets uses: hashicorp/vault-action@v2 @@ -42,6 +36,14 @@ jobs: secrets: | cicd/data/docker password | REGISTRY_PASSWORD ; cicd/data/docker username | REGISTRY_USERNAME ; + cicd/data/submodule token | SUBMODULE_TOKEN ; + + - name: Checkout code + uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 0 + token: ${{ env.SUBMODULE_TOKEN }} - name: Set up Docker BuildX uses: docker/setup-buildx-action@v2 diff --git a/.gitea/workflows/k8s-deploy.yml b/.gitea/workflows/k8s-deploy.yml index c56124c..e2ddaac 100644 --- a/.gitea/workflows/k8s-deploy.yml +++ b/.gitea/workflows/k8s-deploy.yml @@ -42,6 +42,10 @@ on: required: true type: string description: Kubeconf secret path in vault for prod + HELM_VERSION: + type: string + default: 3.17 + description: Last stable with our chart's secrets: VAULT_TOKEN: required: true @@ -90,7 +94,7 @@ jobs: - name: Install helm uses: azure/setup-helm@v4.2.0 with: - version: latest + version: ${{ inputs.HELM_VERSION }} - name: Set up Kubectl uses: azure/k8s-set-context@v4 diff --git a/.gitea/workflows/prisma-migrate.yaml b/.gitea/workflows/prisma-migrate.yaml index efa6b59..4628bb3 100644 --- a/.gitea/workflows/prisma-migrate.yaml +++ b/.gitea/workflows/prisma-migrate.yaml @@ -22,8 +22,20 @@ jobs: image: catthehacker/ubuntu:act-22.04 steps: - - name: Checkout repo - uses: actions/checkout@v3 + - name: Import Common Secrets + uses: hashicorp/vault-action@v2 + with: + url: https://vault.project-quest-dev.com + token: ${{ secrets.VAULT_TOKEN }} + secrets: | + cicd/data/submodule token | SUBMODULE_TOKEN ; + + - name: Checkout code + uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 0 + token: ${{ env.SUBMODULE_TOKEN }} - name: Setup Node uses: actions/setup-node@v3