From da2974b3186dce8e4cfbaf2ce9e48529ccd39721 Mon Sep 17 00:00:00 2001
From: Pascal Delange <pascal@checkmarble.com>
Date: Thu, 24 Oct 2024 20:54:41 +0200
Subject: [PATCH] more changes to CICD

---
 .github/workflows/main.yml | 13 ++++---------
 kubernetes/.vars           |  4 ++--
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cf08e06..4fb3698 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3,14 +3,14 @@ name: Release Charts
 on:
   push:
     tags:
-      - "v[0-9]+.[0-9]+.[0-9]+"
+      - "[0-9]+.[0-9]+.[0-9]+"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 env:
   CHART_NAME: ${{vars.CHART_NAME}}
-  CHART_VERSION: ${{vars.CHART_VERSION}}
+  CHART_VERSION: ${{ github.ref_name }}
 
 jobs:
   release:
@@ -24,11 +24,6 @@ jobs:
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
 
-      - name: Google Auth
-        uses: "google-github-actions/auth@v2"
-        with:
-          credentials_json: "${{ secrets.GCP_SA_KEY_PRODUCTION }}"
-
       - name: "Set up Cloud SDK"
         uses: "google-github-actions/setup-gcloud@v2"
         with:
@@ -37,7 +32,7 @@ jobs:
       - name: Login to artifact registry
         run: |
           cd kubernetes
-          gcloud auth activate-service-account ${{vars.ACCOUNT}} --key-file ${{secrets.KEY_FILE}}
+          gcloud auth activate-service-account ${{vars.SERVICE_ACCOUNT_NAME}} --key-file ${{secrets.GCP_SA_KEY_PRODUCTION}}
           cat key.json | helm registry login -u  _json_key --password-stdin https://${{vars.ARTIFACT_REGISTRY_HOST_NAME}}
 
       - name: Prepare YQ
@@ -60,4 +55,4 @@ jobs:
       - name: Helm push
         run: |
           cd kubernetes
-          helm push $CHART_NAME-$CHART_VERSION.tgz oci://${{vars.ARTIFACT_REGISTRY_HOST_NAME}}/${{vars.INFRA_PROJECT_ID}}/${{vars.ARTIFACT_REGISTRY_REPOSITORY}}
+          helm push $CHART_NAME-${{ github.ref_name }}.tgz oci://${{vars.ARTIFACT_REGISTRY_HOST_NAME}}/${{vars.INFRA_PROJECT_ID}}/${{vars.ARTIFACT_REGISTRY_REPOSITORY}}
diff --git a/kubernetes/.vars b/kubernetes/.vars
index e3be61d..ab2dd47 100644
--- a/kubernetes/.vars
+++ b/kubernetes/.vars
@@ -1,6 +1,6 @@
 ARTIFACT_REGISTRY_HOST_NAME=europe-west1-docker.pkg.dev
 ARTIFACT_REGISTRY_REPOSITORY=helm-chart-tests
 INFRA_PROJECT_ID=marble-infra
-ACCOUNT=franck-test-service-acc@tokyo-country-381508.iam.gserviceaccount.com
+SERVICE_ACCOUNT_NAME=franck-test-service-acc@tokyo-country-381508.iam.gserviceaccount.com
 CHART_VERSION=0.2.0
-CHART_NAME=marble-application
\ No newline at end of file
+CHART_NAME=marble-application