diff --git a/.github/workflows/deactivate.yaml b/.github/workflows/deactivate.yaml index 5f278864c..5801ad486 100644 --- a/.github/workflows/deactivate.yaml +++ b/.github/workflows/deactivate.yaml @@ -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 diff --git a/.github/workflows/preproduction.yaml b/.github/workflows/preproduction.yaml index 96259c0f5..37ff42af4 100644 --- a/.github/workflows/preproduction.yaml +++ b/.github/workflows/preproduction.yaml @@ -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 diff --git a/.github/workflows/production.yaml b/.github/workflows/production.yaml index fc57d4c88..1b0bb01da 100644 --- a/.github/workflows/production.yaml +++ b/.github/workflows/production.yaml @@ -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 diff --git a/.github/workflows/review-auto.yaml b/.github/workflows/review-auto.yaml index 26272555c..86caf77d6 100644 --- a/.github/workflows/review-auto.yaml +++ b/.github/workflows/review-auto.yaml @@ -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 diff --git a/.github/workflows/review.yaml b/.github/workflows/review.yaml index e7d42a37c..14a7a9723 100644 --- a/.github/workflows/review.yaml +++ b/.github/workflows/review.yaml @@ -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 diff --git a/.kontinuous/config.yaml b/.kontinuous/config.yaml index f2b7eea90..28c6c8d21 100644 --- a/.kontinuous/config.yaml +++ b/.kontinuous/config.yaml @@ -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 diff --git a/.kontinuous/env/preprod/values.yaml b/.kontinuous/env/preprod/values.yaml index 9bb5ab2c5..40ba9dc78 100644 --- a/.kontinuous/env/preprod/values.yaml +++ b/.kontinuous/env/preprod/values.yaml @@ -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 @@ -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: diff --git a/.kontinuous/env/prod/values.yaml b/.kontinuous/env/prod/values.yaml index 4c3a80fd3..e478672c1 100644 --- a/.kontinuous/env/prod/values.yaml +++ b/.kontinuous/env/prod/values.yaml @@ -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