From b6cc76ec6f93c2f7ab81bcd14cd3f7693e74d8e5 Mon Sep 17 00:00:00 2001 From: friedrich goerz Date: Tue, 14 Feb 2023 10:22:52 +0100 Subject: [PATCH] DEV-893: incident - restore nsodev postgres clsuter from last basebackup - added missing envvars - bugfix --- secrets_nsodev.yaml | 6 ++++-- templates/cm_postgres_bkp.yaml | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/secrets_nsodev.yaml b/secrets_nsodev.yaml index b3d23be..ed1c235 100644 --- a/secrets_nsodev.yaml +++ b/secrets_nsodev.yaml @@ -7,6 +7,8 @@ postgres_bkp: bkp_user: ENC[AES256_GCM,data:XRS9EwH669U=,iv:2lrwsoDzNqSy2+7Wy0xuamn3B8M7+TpblJOxfsbEyQI=,tag:782mIVy4jFfKu8WmmYmRRg==,type:str] bkp_pass: ENC[AES256_GCM,data:MicX/6wgm8QLSf0YE60HwCjUFeUlyoO1Lg==,iv:+6pvR3H0QB3ZlyzI+8LK170DcSFpKvJJZY4d95dyGnU=,tag:CMiTlT6VBbB+xOb2oBWsYQ==,type:str] bkp_url: ENC[AES256_GCM,data:qKLfn6AVXFQoiVwCX39pQPpfzSjmekgBggQ0+lIYNQlkhjsjUdCiBypAvfnLDiOkl57d7g==,iv:jP+q8x0RIAQUEM+JrXBdTaSgilN51gDQzrKHjGRPcnQ=,tag:/cG5ChO4sh3ocQ0C3cgLpg==,type:str] + cloneAwsRegion: "" + cloneWalBucketScopePrefix: "" tenant: secrets: name: ENC[AES256_GCM,data:lOvtrBhFlMiK5nT9,iv:vHBzpVb0RlCKiTL+Mz6Wu/2ycibihRu0BqS50UeFZYU=,tag:vePntbFBxBJJgRu0cWPIoQ==,type:str] @@ -110,8 +112,8 @@ sops: azure_kv: [] hc_vault: [] age: [] - lastmodified: "2023-02-13T19:59:41Z" - mac: ENC[AES256_GCM,data:AuQ0CkK1VG47Sce7uM+/cLEMKuxzIW8oizXA88km/eB4R/Z46V2Sb16Y5wCcQ1lW37/GGD2DHURcGC51sJcLWalHoJggtdc9HLUVet4ozeJW89EBC1bNn5FXYIbgiypdGDTyHbSykrL6mf4W/nk+NogGdSAPRz5YwA4WcSKIO7k=,iv:9626P5HsSwKZ/quQ6V5NZAzs/UjWrkSbfv/35IZo8aw=,tag:9oTzZ/UQ23BOwI67iWGYQQ==,type:str] + lastmodified: "2023-02-14T09:21:29Z" + mac: ENC[AES256_GCM,data:sJq+Eovxwi99E7upo9TFx1qgm7XyCoaDqRAmFNxfZqBRFi/LoNKitW229QDW6s0vIJnwDeb+caGlcraof1IUeu3MvqJx8VOFq3+e+u8rmjKJgF5eZYuQD483xFqTRNn5DRpYi4m+4OZAsQqW89Aym9F4uaYKfdsR6BJ0mP0DbD4=,iv:UfJZ0JqhoG1MvSmBthwhRTT//HGqqC4jKS8Onxjr594=,tag:vZijG5M0Iil94q73V9S4jA==,type:str] pgp: - created_at: "2023-02-13T15:07:15Z" enc: | diff --git a/templates/cm_postgres_bkp.yaml b/templates/cm_postgres_bkp.yaml index cd492ce..994fd62 100644 --- a/templates/cm_postgres_bkp.yaml +++ b/templates/cm_postgres_bkp.yaml @@ -23,8 +23,8 @@ data: CLONE_AWS_ACCESS_KEY_ID: {{ .Values.postgres_bkp.bkp_user }} CLONE_AWS_SECRET_ACCESS_KEY: {{ .Values.postgres_bkp.bkp_pass }} CLONE_AWS_ENDPOINT: {{ .Values.postgres_bkp.bkp_url }} - CLONE_AWS_REGION: "" - CLONE_METHOD: CLONE_WITH_WALE - CLONE_WAL_BUCKET_SCOPE_PREFIX: "" + CLONE_AWS_REGION: {{ .Values.postgres_bkp.cloneAwsRegion | quote }} + CLONE_METHOD: 'CLONE_WITH_WALE' + CLONE_WAL_BUCKET_SCOPE_PREFIX: {{ .Values.postgres_bkp.cloneWalBucketScopePrefix | quote }} CLONE_WAL_S3_BUCKET: postgres CLONE_AWS_S3_FORCE_PATH_STYLE: true