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

🐛(CI) improve submodule

Browse Source 
- remove deplucate declaration
- simplify helmfile
- use symlink
This commit is contained in:
Jacques ROUSSEL
2024-06-10 14:44:46 +02:00
committed by rouja
parent 63b565e720
commit 9e318f88be
11 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,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/impress/secrets.enc.env secret-file: secrets/numerique-gouv/impress/secrets.enc.env
age-key: ${{ secrets.SOPS_PRIVATE }} age-key: ${{ secrets.SOPS_PRIVATE }}
- -
name: Call argocd github webhook name: Call argocd github webhook

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

@@ -36,7 +36,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/impress/secrets.enc.env secret-file: secrets/numerique-gouv/impress/secrets.enc.env
age-key: ${{ secrets.SOPS_PRIVATE }} age-key: ${{ secrets.SOPS_PRIVATE }}
- -
name: Docker meta name: Docker meta
@@ -80,7 +80,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/impress/secrets.enc.env secret-file: secrets/numerique-gouv/impress/secrets.enc.env
age-key: ${{ secrets.SOPS_PRIVATE }} age-key: ${{ secrets.SOPS_PRIVATE }}
- -
name: Docker meta name: Docker meta
@@ -125,7 +125,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/impress/secrets.enc.env secret-file: secrets/numerique-gouv/impress/secrets.enc.env
age-key: ${{ secrets.SOPS_PRIVATE }} age-key: ${{ secrets.SOPS_PRIVATE }}
- -
name: Docker meta name: Docker meta
@@ -175,7 +175,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/impress/secrets.enc.env secret-file: secrets/numerique-gouv/impress/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/impress.yml vendored
View File

@@ -227,7 +227,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/impress/secrets.enc.env secret-file: secrets/numerique-gouv/impress/secrets.enc.env
age-key: ${{ secrets.SOPS_PRIVATE }} age-key: ${{ secrets.SOPS_PRIVATE }}
- name: Install gettext (required to make messages) - name: Install gettext (required to make messages)

1
.github/workflows/secrets vendored

Submodule .github/workflows/secrets deleted from d5e83b9046

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 a2b1357c0a

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

@@ -0,0 +1 @@
../../../../secrets/numerique-gouv/impress/env/preprod/secrets.enc.yaml

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

@@ -0,0 +1 @@
../../../../secrets/numerique-gouv/impress/env/production/secrets.enc.yaml

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

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

10
src/helm/helmfile.yaml
View File

@@ -48,7 +48,7 @@ releases:
namespace: {{ .Namespace }} namespace: {{ .Namespace }}
chart: ./extra chart: ./extra
secrets: secrets:
- secrets/numerique-gouv/impress/env/{{ .Environment.Name }}/secrets.enc.yaml - env.d/{{ .Environment.Name }}/secrets.enc.yaml
- name: impress - name: impress
version: {{ .Values.version }} version: {{ .Values.version }}
@@ -57,7 +57,7 @@ releases:
values: values:
- env.d/{{ .Environment.Name }}/values.impress.yaml.gotmpl - env.d/{{ .Environment.Name }}/values.impress.yaml.gotmpl
secrets: secrets:
- {{ ne .Environment.Name "dev" | ternary "secrets/numerique-gouv/impress/env" "env.d" }}/{{ .Environment.Name }}/secrets.enc.yaml - env.d/{{ .Environment.Name }}/secrets.enc.yaml
environments: environments:
dev: dev:
@@ -69,14 +69,14 @@ environments:
values: values:
- version: 0.0.1 - version: 0.0.1
secrets: secrets:
- secrets/numerique-gouv/impress/env/{{ .Environment.Name }}/secrets.enc.yaml - env.d/{{ .Environment.Name }}/secrets.enc.yaml
preprod: preprod:
values: values:
- version: 0.0.1 - version: 0.0.1
secrets: secrets:
- secrets/numerique-gouv/impress/env/{{ .Environment.Name }}/secrets.enc.yaml - env.d/{{ .Environment.Name }}/secrets.enc.yaml
production: production:
values: values:
- version: 0.0.1 - version: 0.0.1
secrets: secrets:
- secrets/numerique-gouv/impress/env/{{ .Environment.Name }}/secrets.enc.yaml - env.d/{{ .Environment.Name }}/secrets.enc.yaml

1
src/helm/secrets

Submodule src/helm/secrets deleted from d5e83b9046