🐛(CI) improve submodule
- remove deplucate declaration - simplify helmfile - use symlink
This commit is contained in:
2
.github/workflows/deploy.yml
vendored
2
.github/workflows/deploy.yml
vendored
@@ -29,7 +29,7 @@ jobs:
|
||||
name: Load sops secrets
|
||||
uses: rouja/actions-sops@main
|
||||
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 }}
|
||||
-
|
||||
name: Call argocd github webhook
|
||||
|
||||
8
.github/workflows/docker-hub.yml
vendored
8
.github/workflows/docker-hub.yml
vendored
@@ -36,7 +36,7 @@ jobs:
|
||||
name: Load sops secrets
|
||||
uses: rouja/actions-sops@main
|
||||
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 }}
|
||||
-
|
||||
name: Docker meta
|
||||
@@ -80,7 +80,7 @@ jobs:
|
||||
name: Load sops secrets
|
||||
uses: rouja/actions-sops@main
|
||||
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 }}
|
||||
-
|
||||
name: Docker meta
|
||||
@@ -125,7 +125,7 @@ jobs:
|
||||
name: Load sops secrets
|
||||
uses: rouja/actions-sops@main
|
||||
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 }}
|
||||
-
|
||||
name: Docker meta
|
||||
@@ -175,7 +175,7 @@ jobs:
|
||||
name: Load sops secrets
|
||||
uses: rouja/actions-sops@main
|
||||
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 }}
|
||||
-
|
||||
name: Call argocd github webhook
|
||||
|
||||
2
.github/workflows/impress.yml
vendored
2
.github/workflows/impress.yml
vendored
@@ -227,7 +227,7 @@ jobs:
|
||||
name: Load sops secrets
|
||||
uses: rouja/actions-sops@main
|
||||
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 }}
|
||||
|
||||
- name: Install gettext (required to make messages)
|
||||
|
||||
1
.github/workflows/secrets
vendored
1
.github/workflows/secrets
vendored
Submodule .github/workflows/secrets deleted from d5e83b9046
11
.gitmodules
vendored
11
.gitmodules
vendored
@@ -1,8 +1,3 @@
|
||||
[submodule ".github/workflows/secrets"]
|
||||
path = .github/workflows/secrets
|
||||
url = https://github.com/numerique-gouv/secrets.git
|
||||
branch = main
|
||||
[submodule "src/helm/secrets"]
|
||||
path = src/helm/secrets
|
||||
url = https://github.com/numerique-gouv/secrets.git
|
||||
branch = main
|
||||
[submodule "secrets"]
|
||||
path = secrets
|
||||
url = ../secrets
|
||||
|
||||
1
secrets
Submodule
1
secrets
Submodule
Submodule secrets added at a2b1357c0a
1
src/helm/env.d/preprod/secrets.enc.yaml
Symbolic link
1
src/helm/env.d/preprod/secrets.enc.yaml
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../secrets/numerique-gouv/impress/env/preprod/secrets.enc.yaml
|
||||
1
src/helm/env.d/production/secrets.enc.yaml
Symbolic link
1
src/helm/env.d/production/secrets.enc.yaml
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../secrets/numerique-gouv/impress/env/production/secrets.enc.yaml
|
||||
1
src/helm/env.d/staging/secrets.enc.yaml
Symbolic link
1
src/helm/env.d/staging/secrets.enc.yaml
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../secrets/numerique-gouv/impress/env/staging/secrets.enc.yaml
|
||||
@@ -48,7 +48,7 @@ releases:
|
||||
namespace: {{ .Namespace }}
|
||||
chart: ./extra
|
||||
secrets:
|
||||
- secrets/numerique-gouv/impress/env/{{ .Environment.Name }}/secrets.enc.yaml
|
||||
- env.d/{{ .Environment.Name }}/secrets.enc.yaml
|
||||
|
||||
- name: impress
|
||||
version: {{ .Values.version }}
|
||||
@@ -57,7 +57,7 @@ releases:
|
||||
values:
|
||||
- env.d/{{ .Environment.Name }}/values.impress.yaml.gotmpl
|
||||
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:
|
||||
dev:
|
||||
@@ -69,14 +69,14 @@ environments:
|
||||
values:
|
||||
- version: 0.0.1
|
||||
secrets:
|
||||
- secrets/numerique-gouv/impress/env/{{ .Environment.Name }}/secrets.enc.yaml
|
||||
- env.d/{{ .Environment.Name }}/secrets.enc.yaml
|
||||
preprod:
|
||||
values:
|
||||
- version: 0.0.1
|
||||
secrets:
|
||||
- secrets/numerique-gouv/impress/env/{{ .Environment.Name }}/secrets.enc.yaml
|
||||
- env.d/{{ .Environment.Name }}/secrets.enc.yaml
|
||||
production:
|
||||
values:
|
||||
- version: 0.0.1
|
||||
secrets:
|
||||
- secrets/numerique-gouv/impress/env/{{ .Environment.Name }}/secrets.enc.yaml
|
||||
- env.d/{{ .Environment.Name }}/secrets.enc.yaml
|
||||
|
||||
Submodule src/helm/secrets deleted from d5e83b9046
Reference in New Issue
Block a user