Skip to content

Commit

Permalink
fix: ovh
Browse files Browse the repository at this point in the history
  • Loading branch information
achauve committed Mar 25, 2024
1 parent 041ea47 commit f272f45
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 44 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deactivate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ concurrency:

jobs:
kontinuous:
uses: socialgouv/workflows/.github/workflows/use-ks-gh-deactivate.yaml@v1
uses: socialgouv/workflows/.github/workflows/use-ks-gh-with-env-deactivate.yaml@v1
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/preproduction.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ concurrency:
jobs:
kontinuous:
name: "Deploy on Kubernetes 🐳"
uses: socialgouv/workflows/.github/workflows/use-ks-gh-preproduction.yaml@v1
uses: socialgouv/workflows/.github/workflows/use-ks-gh-with-env-preproduction.yaml@v1
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/production.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ concurrency:
jobs:
kontinuous:
name: "Deploy on Kubernetes 🐳"
uses: socialgouv/workflows/.github/workflows/use-ks-gh-production.yaml@v1
uses: socialgouv/workflows/.github/workflows/use-ks-gh-with-env-production.yaml@v1
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/review-auto.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ concurrency:
jobs:
kontinuous:
name: "Deploy on Kubernetes 🐳"
uses: socialgouv/workflows/.github/workflows/use-ks-gh-review-auto.yaml@master
uses: socialgouv/workflows/.github/workflows/use-ks-gh-with-env-review-auto.yaml@master
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/review.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ concurrency:
jobs:
kontinuous:
name: "Deploy on Kubernetes 🐳"
uses: socialgouv/workflows/.github/workflows/use-ks-gh-review.yaml@v1
uses: socialgouv/workflows/.github/workflows/use-ks-gh-with-env-review.yaml@v1
secrets: inherit
20 changes: 2 additions & 18 deletions .kontinuous/config.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,4 @@
projectName: cdtn
dependencies:
fabrique:
extends:
- name: buildkit-service
dependencies:
contrib:
preDeploy:
importSecrets:
options:
secrets:
cdtnadminprodserver-backup-credentials:
env: [dev, preprod]
required: true
cdtn-prod-backups-access-key:
env: [prod]
required: true
cdtn-dev-backups-access-key:
env: [dev, preprod]
required: true
extends:
- name: ovh
19 changes: 2 additions & 17 deletions .kontinuous/env/preprod/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ hasura:
name: hasura

www:
host: cdtn-admin-preprod.dev.fabrique.social.gouv.fr
host: cdtn-admin-preprod.ovh.fabrique.social.gouv.fr
env:
- name: "FRONTEND_HOST"
value: cdtn-admin-preprod.dev.fabrique.social.gouv.fr
value: cdtn-admin-preprod.ovh.fabrique.social.gouv.fr

pg:
~chart: pg
Expand All @@ -32,21 +32,6 @@ pg:
~tpl~enabled: "false"
recovery:
enabled: true
~tpl~database: "{{ .Values.global.pgDatabase }}"
~tpl~owner: "{{ .Values.global.pgUser }}"
secretName: "pg-db"
barmanObjectStore:
~tpl~destinationPath: "s3://cdtn-prod-backups/cdtn-admin"
s3Credentials:
accessKeyId:
~tpl~name: "cdtn-prod-backups-access-key"
key: bucket_access_key
secretAccessKey:
~tpl~name: "cdtn-prod-backups-access-key"
key: bucket_secret_key
region:
~tpl~name: "cdtn-prod-backups-access-key"
key: bucket_region

jobs:
runs:
Expand Down
8 changes: 4 additions & 4 deletions .kontinuous/env/prod/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ hasura:

pg:
backup:
name: 2024-03-25-12-54
name: 2024-03-25-21-29
cnpg-cluster:
resources:
requests:
memory: 2Gi
limits:
memory: 2Gi
# recovery:
# enabled: true
# name:
recovery:
enabled: true
name: 2024-03-25-12-54

0 comments on commit f272f45

Please sign in to comment.