studio/people
Archived
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

💚(ci) improve submodule usage

Browse Source 
- remove deplucate declaration
- simplify helmfile
- use symlink
This commit is contained in:
Jacques ROUSSEL
2024-06-10 14:08:33 +02:00
committed by rouja
parent 0a8c488649
commit 23778fda0d
8 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/docker-hub.yml vendored
View File

@@ -42,7 +42,7 @@ jobs:
name: Load sops secrets name: Load sops secrets
uses: rouja/actions-sops@main uses: rouja/actions-sops@main
with: with:
secret-file: .github/workflows/secrets/numerique-gouv/people/secrets.enc.env secret-file: secrets/numerique-gouv/people/secrets.enc.env
age-key: ${{ secrets.SOPS_PRIVATE }} age-key: ${{ secrets.SOPS_PRIVATE }}
- -
name: Login to DockerHub name: Login to DockerHub
@@ -86,7 +86,7 @@ jobs:
name: Load sops secrets name: Load sops secrets
uses: rouja/actions-sops@main uses: rouja/actions-sops@main
with: with:
secret-file: .github/workflows/secrets/numerique-gouv/people/secrets.enc.env secret-file: secrets/numerique-gouv/people/secrets.enc.env
age-key: ${{ secrets.SOPS_PRIVATE }} age-key: ${{ secrets.SOPS_PRIVATE }}
- -
name: Login to DockerHub name: Login to DockerHub
@@ -128,7 +128,7 @@ jobs:
name: Load sops secrets name: Load sops secrets
uses: rouja/actions-sops@main uses: rouja/actions-sops@main
with: with:
secret-file: .github/workflows/secrets/numerique-gouv/people/secrets.enc.env secret-file: secrets/numerique-gouv/people/secrets.enc.env
age-key: ${{ secrets.SOPS_PRIVATE }} age-key: ${{ secrets.SOPS_PRIVATE }}
- -
name: Call argocd github webhook name: Call argocd github webhook

2
.github/workflows/people.yml vendored
View File

@@ -347,7 +347,7 @@ jobs:
name: Load sops secrets name: Load sops secrets
uses: rouja/actions-sops@main uses: rouja/actions-sops@main
with: with:
secret-file: .github/workflows/secrets/numerique-gouv/people/secrets.enc.env secret-file: secrets/numerique-gouv/people/secrets.enc.env
age-key: ${{ secrets.SOPS_PRIVATE }} age-key: ${{ secrets.SOPS_PRIVATE }}
- name: Setup Node.js - name: Setup Node.js

1
.github/workflows/secrets vendored

Submodule .github/workflows/secrets deleted from eec9a2bad8

11
.gitmodules vendored
View File

@@ -1,8 +1,3 @@
[submodule ".github/workflows/secrets"] [submodule "secrets"]
path = .github/workflows/secrets path = secrets
url = https://github.com/numerique-gouv/secrets.git url = ../secrets
branch = main
[submodule "src/helm/secrets"]
path = src/helm/secrets
url = https://github.com/numerique-gouv/secrets.git
branch = main

1
secrets Submodule

Submodule secrets added at 647b88689c

1
src/helm/env.d/staging/secrets.enc.yaml Symbolic link
View File

@@ -0,0 +1 @@
../../../../secrets/numerique-gouv/people/env/staging/secrets.enc.yaml

6
src/helm/helmfile.yaml
View File

@@ -33,7 +33,7 @@ releases:
namespace: {{ .Namespace }} namespace: {{ .Namespace }}
chart: ./extra chart: ./extra
secrets: secrets:
- {{ ne .Environment.Name "dev" | ternary "secrets/numerique-gouv/people/env" "env.d" }}/{{ .Environment.Name }}/secrets.enc.yaml - env.d/{{ .Environment.Name }}/secrets.enc.yaml
- name: desk - name: desk
version: {{ .Values.version }} version: {{ .Values.version }}
@@ -42,7 +42,7 @@ releases:
values: values:
- env.d/{{ .Environment.Name }}/values.desk.yaml.gotmpl - env.d/{{ .Environment.Name }}/values.desk.yaml.gotmpl
secrets: secrets:
- {{ ne .Environment.Name "dev" | ternary "secrets/numerique-gouv/people/env" "env.d" }}/{{ .Environment.Name }}/secrets.enc.yaml - env.d/{{ .Environment.Name }}/secrets.enc.yaml
environments: environments:
dev: dev:
@@ -54,5 +54,5 @@ environments:
values: values:
- version: 0.0.1 - version: 0.0.1
secrets: secrets:
- {{ ne .Environment.Name "dev" | ternary "secrets/numerique-gouv/people/env" "env.d" }}/{{ .Environment.Name }}/secrets.enc.yaml - env.d/{{ .Environment.Name }}/secrets.enc.yaml

1
src/helm/secrets

Submodule src/helm/secrets deleted from eec9a2bad8