From abea6bf35ab071a72177efbf92336b2d659cc9af Mon Sep 17 00:00:00 2001 From: Louise Huyton Date: Wed, 8 Jan 2025 10:36:36 +0000 Subject: [PATCH] DTSPO-18332 - test changes to script (#5932) * test changes to script * test script changes * update script to reference all files correctly and test --- apps/toffee/dev/base/kustomization.yaml | 3 +++ apps/toffee/dev/sops-secrets/kustomization.yaml | 5 +---- .../dev/sops-secrets/recipe-backend-values.enc.yaml | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/toffee/dev/base/kustomization.yaml b/apps/toffee/dev/base/kustomization.yaml index 112515dd5d2..ac1d7e649f7 100644 --- a/apps/toffee/dev/base/kustomization.yaml +++ b/apps/toffee/dev/base/kustomization.yaml @@ -1,6 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: + - ../../../azureserviceoperator-system/resources/flexibleserver-postgres.yaml + - ../../../azureserviceoperator-system/resources/flexibleserver-postgres-config.yaml + - ../sops-secrets - ../../../base - ../../../base/workload-identity - ../../identity/toffee-azure-identity.yaml diff --git a/apps/toffee/dev/sops-secrets/kustomization.yaml b/apps/toffee/dev/sops-secrets/kustomization.yaml index e6bc9e53d58..cd2480c56f0 100644 --- a/apps/toffee/dev/sops-secrets/kustomization.yaml +++ b/apps/toffee/dev/sops-secrets/kustomization.yaml @@ -1,8 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ../../../azureserviceoperator-system/resources/resource-group.yaml - - ../../../azureserviceoperator-system/resources/flexibleserver-postgres.yaml - - ../../../azureserviceoperator-system/resources/flexibleserver-postgres-config.yaml - - recipe-backend-postgres.enc.yaml + - recipe-backend-values.enc.yaml namespace: toffee diff --git a/apps/toffee/dev/sops-secrets/recipe-backend-values.enc.yaml b/apps/toffee/dev/sops-secrets/recipe-backend-values.enc.yaml index 20330c53776..ab3985d5a0e 100644 --- a/apps/toffee/dev/sops-secrets/recipe-backend-values.enc.yaml +++ b/apps/toffee/dev/sops-secrets/recipe-backend-values.enc.yaml @@ -1,6 +1,6 @@ apiVersion: v1 data: - PASSWORD: ENC[AES256_GCM,data:5XRN/8q/nsy34BOV5JfTu2Q0gVY=,iv:cZZzl+9nfiIJjdwi8QT/H0kY/qqfO+zjSdRGWH/qFuo=,tag:tuBodTqEgrrjK28Q781xXw==,type:str] + PASSWORD: ENC[AES256_GCM,data:hwImVWkXnNfpcsyKHDkdCJkX1k8=,iv:CAP9jcdn+MFR/j6ZqwWEI4udMZK+AVZW+75qMyC3SCU=,tag:kMbquhhGnjjspuCDYlrFVg==,type:str] kind: Secret metadata: creationTimestamp: null @@ -14,12 +14,12 @@ sops: - vault_url: https://dtssharedservicesdevkv.vault.azure.net name: sops-key version: 2beba064ddfe454482ad0133af2cf0fd - created_at: "2025-01-06T16:36:12Z" - enc: YU-I2vZkd7ImyMclFY1Zz2Ty9R_EmSxhyd61msbZO99FinNqqM8WbqCt2edOhJNxIs91XFjXqaluKNZLo3oqm7BxLQg8bVT9aI8nKo6VVVOefyaT173d-INhen-s_iNMvICCtgDcAwu95XBUw5Wexpu9BY8XL9JajmyXii_MIgJw5Sf4jhasHUo6z1X4xs6JcUzlYzCtrkmuFUqUOcxHPbYioUCjJEw9x4ZdMXu6Zhr3IqlHxKeU661AiSA1-E2oWty8XwyrtyWcNiz8avA6DGQgdUH_UNU__STbDQH95_xSuAXwRPCKxZBD-JfgdWNDVY2z2ygvIgb9SlRmamyb-w + created_at: "2025-01-07T18:11:03Z" + enc: jda6Tmp6pb39UR_ppHp8heIGxayp_VoS3-AM1JEMDDyyC7fdl8MOoGL2yusGrdax7n_hL-09syibvSj2lzQMKCfZqpj6SZk4B-A_84N9Eu4_FHSd0QHfcx_vYTYe-5vM2_a-sn95-6IDLTlZhJ79h_KF_k5yY3URE3cu3C0m43l_62Ta57pQhumXQkp_74cjnKN_dvRXS-Qs06cX769tJguhYCtqYsl0FNpsNx5ZDePB7zb2r4DlcmMPMkpL6NPhASEig1_RbAXSprLUjhEDGEJxAwU-5A8USnt3sxzd0A4bzNfjwtFAP4J68isiP4RL4unSjdDEW01OF3FBSCm8ZQ hc_vault: [] age: [] - lastmodified: "2025-01-06T16:36:17Z" - mac: ENC[AES256_GCM,data:sQTR5uYt8xDJ+iZUU/PCzDcAKA0V9Q0p/TwN1dPoMbzWcIgKGlg+BnXL3R0sKmJCbPI5CUVLpFNHIwYMK5tmc6cjsmPNoiYJyznqD/BCGUu6eqKe2B5UbTn10QACNJHnXBMvSnon5eSlcPmRkm5FfDK6+dHFhjjD0/fa1tNdVSg=,iv:qUha0suhYWUah8QvGN8z0dJ7FKXyAKFtg5JZStKSm+s=,tag:R9lJObTR+BTFkSA1fi760Q==,type:str] + lastmodified: "2025-01-07T18:11:04Z" + mac: ENC[AES256_GCM,data:ZyWHKFrk+jJjPLgYPX7KYLdzx7A+yKouzBbndkGsiF3BUlUUyHKIdYDQWJ6iv3jcgq6oSCdXGIDJ+oDdjoDQNIYp0/WnrvERCdKbQXyLE5M34O5TR3T8+/5Bvvn4xYcMigOX4Zz9J45K8295iBjYpXhleHQ/UMD4EE0Tnggs9mQ=,iv:uGQraeNXixNrMv324wqzYuj1Mw6anTbAFi7aW5l1vUc=,tag:1UALz0yHpJ+B8mkdCKbipQ==,type:str] pgp: [] encrypted_regex: ^(data|stringData)$ version: 3.9.1