Getting api_host, api_preset and client_id from Vault

wallarm · Dec 26, 2023 · 654fbf8 · 654fbf8
1 parent 2b8e595
commit 654fbf8
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -126,6 +126,9 @@ jobs:
           path: kubernetes-ci
           secrets: |
             kv-gitlab-ci/data/github/ingress-audit api_token ;
+            kv-gitlab-ci/data/github/ingress-audit api_host ;
+            kv-gitlab-ci/data/github/ingress-audit api_preset ;
+            kv-gitlab-ci/data/github/ingress-audit client_id ;
             kv-gitlab-ci/data/github/ingress-audit user_secret ;
             kv-gitlab-ci/data/github/ingress-audit user_uuid ;
             kv-gitlab-ci/data/github/shared/smoke-tests-registry-creds token_name ;
@@ -150,9 +153,9 @@ jobs:
           SKIP_CLUSTER_CREATION: true
           SKIP_IMAGE_CREATION: true
           WALLARM_API_TOKEN: ${{ steps.secrets.outputs.api_token }}
-          WALLARM_API_HOST: audit.api.wallarm.com # TODO: tmp
-          WALLARM_API_PRESET: audit # TODO: tmp
-          CLIENT_ID: "55146" # TODO: tmp
+          WALLARM_API_HOST: ${{ steps.secrets.outputs.api_host }}
+          WALLARM_API_PRESET: ${{ steps.secrets.outputs.api_preset }}
+          CLIENT_ID: ${{ steps.secrets.outputs.client_id }}
           USER_UUID: ${{ steps.secrets.outputs.user_uuid }}
           USER_SECRET: ${{ steps.secrets.outputs.user_secret }}
           SMOKE_REGISTRY_TOKEN: ${{ steps.secrets.outputs.token_name }}
@@ -191,7 +194,7 @@ jobs:
           role: ${{ secrets.VAULT_ROLE }}
           method: kubernetes
           path: kubernetes-ci
-          secrets: kv-gitlab-ci/data/github/ingress-audit api_token
+          secrets: kv-gitlab-ci/data/github/ingress api_token
 
       - name: Checkout
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v3.0.2
@@ -215,9 +218,6 @@ jobs:
           SKIP_CLUSTER_CREATION: true
           SKIP_IMAGE_CREATION: true
           WALLARM_API_TOKEN: ${{ steps.secrets.outputs.api_token }}
-          WALLARM_API_PRESET: audit # TODO: tmp
-          WALLARM_API_HOST: audit.api.wallarm.com # TODO: tmp
-          CLIENT_ID: "55146" # TODO: tmp
           CT_MODE: ${{ matrix.method }}
         run: |
           kind get kubeconfig > $GITHUB_WORKSPACE/kind-config-kind
@@ -270,7 +270,7 @@ jobs:
     env:
       ARCH: amd64
     strategy:
-      fail-fast: false # TODO: temporary for arm64 new arc testing
+      fail-fast: true
       matrix:
         k8s: [v1.24.12, v1.25.8, v1.26.3,v1.27.1, v1.28.0]
 
@@ -284,7 +284,9 @@ jobs:
           role: ${{ secrets.VAULT_ROLE }}
           method: kubernetes
           path: kubernetes-ci
-          secrets: kv-gitlab-ci/data/github/ingress-audit api_token
+          secrets: |
+            kv-gitlab-ci/data/github/ingress-audit api_token ;
+            kv-gitlab-ci/data/github/ingress-audit api_host ;
 
       - name: Checkout
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v3.0.2
@@ -308,7 +310,7 @@ jobs:
           SKIP_E2E_IMAGE_CREATION: true
           WALLARM_ENABLED: true
           WALLARM_API_TOKEN: ${{ steps.secrets.outputs.api_token }}
-          WALLARM_API_HOST: audit.api.wallarm.com # TODO: tmp
+          WALLARM_API_HOST: ${{ steps.secrets.outputs.api_host }}
         run: |
           kind get kubeconfig > $HOME/.kube/kind-config-kind
           make E2E_NODES=6 kind-e2e-test