Skip to content

Commit cc8b6a3

Browse files
committed
Merge branch 'main' of github.com:compolabs/spark-middleware
2 parents 52da27e + cce0573 commit cc8b6a3

File tree

1 file changed

+16
-9
lines changed

1 file changed

+16
-9
lines changed

.github/workflows/vault-docker-helm.yaml

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,29 @@ on:
66
- dev
77
- main
88
tags:
9-
- '*'
9+
- "*"
1010
workflow_dispatch:
1111

1212
jobs:
1313
docker:
1414
runs-on: ${{ vars.RUNNER_SCALE_SET }}
15+
env:
16+
REPO_NAME: ${{ github.event.repository.name }}
17+
1518
steps:
16-
- name: Import Secrets from Vault
17-
id: vault
19+
- name: Import management secrets from Vault
20+
id: management
1821
uses: hashicorp/vault-action@v3
1922
with:
2023
url: ${{ vars.VAULT_ADDR }}
21-
path: ${{ vars.VAULT_PATH }}
24+
path: management
2225
method: kubernetes
2326
role: ${{ vars.VAULT_ROLE }}
2427
secrets: |
25-
${{ vars.VAULT_PATH }}/data/${{ vars.VAULT_SECRET_PATH }} *
28+
management/data/${{ vars.VAULT_SECRET_PATH }} *
29+
30+
- name: Checkout code
31+
uses: actions/checkout@v4
2632

2733
- name: Login to Docker Registry
2834
uses: docker/login-action@v3
@@ -39,7 +45,7 @@ jobs:
3945
uses: docker/metadata-action@v5
4046
with:
4147
images: |
42-
${{ env.DOCKER_REGISTRY }}/${{ env.DOCKER_PROJECT }}/${{ vars.DOCKER_IMAGE }}
48+
${{ env.DOCKER_REGISTRY }}/${{ env.DOCKER_PROJECT }}/${{ env.REPO_NAME }}
4349
tags: |
4450
type=ref,event=branch
4551
type=ref,event=pr
@@ -48,6 +54,7 @@ jobs:
4854
- name: Build and Push Docker image
4955
uses: docker/build-push-action@v6
5056
with:
57+
context: . # https://github.com/docker/build-push-action#git-context
5158
push: true
5259
tags: ${{ steps.meta.outputs.tags }}
5360
labels: ${{ steps.meta.outputs.labels }}
@@ -60,11 +67,11 @@ jobs:
6067
uses: hashicorp/vault-action@v3
6168
with:
6269
url: ${{ vars.VAULT_ADDR }}
63-
path: ${{ vars.VAULT_PATH }}
70+
path: management
6471
method: kubernetes
6572
role: ${{ vars.VAULT_ROLE }}
6673
secrets: |
67-
${{ vars.VAULT_PATH }}/data/${{ vars.VAULT_SECRET_PATH }} *
74+
management/data/${{ vars.VAULT_SECRET_PATH }} *
6875
6976
- name: Checkout code
7077
uses: actions/checkout@v4
@@ -84,7 +91,7 @@ jobs:
8491
- name: Push Helm Chart
8592
uses: appany/helm-oci-chart-releaser@v0.3.0
8693
with:
87-
name: ${{ vars.DOCKER_IMAGE }}
94+
name: ${{ github.event.repository.name }}
8895
repository: charts
8996
tag: ${{ steps.meta.outputs.tags }}
9097
path: helm

0 commit comments

Comments
 (0)