From af003d3eb6283bec1587d4613028b1da0231ead7 Mon Sep 17 00:00:00 2001 From: Louise Huyton Date: Wed, 8 Jan 2025 16:10:46 +0000 Subject: [PATCH] test script changes, remove config yaml in aso folder and references --- apps/toffee/dev/aso/toffee-postgres-config.yaml | 13 ------------- apps/toffee/dev/base/kustomization.yaml | 1 - .../dev/sops-secrets/recipe-backend-values.enc.yaml | 10 +++++----- 3 files changed, 5 insertions(+), 19 deletions(-) delete mode 100644 apps/toffee/dev/aso/toffee-postgres-config.yaml diff --git a/apps/toffee/dev/aso/toffee-postgres-config.yaml b/apps/toffee/dev/aso/toffee-postgres-config.yaml deleted file mode 100644 index dc8cd43342..0000000000 --- a/apps/toffee/dev/aso/toffee-postgres-config.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: dbforpostgresql.azure.com/v1api20230601preview -kind: FlexibleServersConfiguration -metadata: - name: extensions - namespace: ${NAMESPACE} - annotations: - serviceoperator.azure.com/reconcile-policy: detach-on-delete -spec: - owner: - name: ${NAMESPACE}-${ENVIRONMENT} - azureName: azure.extensions - source: user-override - value: "btree_gin" diff --git a/apps/toffee/dev/base/kustomization.yaml b/apps/toffee/dev/base/kustomization.yaml index 6643411b84..510e97e49e 100644 --- a/apps/toffee/dev/base/kustomization.yaml +++ b/apps/toffee/dev/base/kustomization.yaml @@ -3,7 +3,6 @@ kind: Kustomization resources: - ../../../azureserviceoperator-system/resources/resource-group.yaml - ../../../azureserviceoperator-system/resources/flexibleserver-postgres.yaml - - ../../../azureserviceoperator-system/resources/flexibleserver-postgres-config.yaml - ../sops-secrets - ../../../base - ../../../base/workload-identity 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 ed17df09b4..05e29cd4fe 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:5JiuZXxwoyYBuHPSld60HXJ5Jgs=,iv:Cw/KKFHShMVx+ESt94tDw1nW29Qatc/y5lHk8AYJhDM=,tag:ymumhpIN39PzVtG4kPw7Uw==,type:str] + PASSWORD: ENC[AES256_GCM,data:DczOa2XtNaYvcYvGYxobISwxFNA=,iv:kVAVRdP5Vc49nSonUnWK8gba9c3LksW+8tySitsghcw=,tag:ztckty7Ox3j84a0v1VlJlQ==,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-08T13:02:58Z" - enc: PvGIfTPxO09bg9mCATMqjxDL9mtBaT8pXtC2EXQJP3SFsJHron1KyGI6tLVOVCcURqn52eyr543rn3Dma7l66LizvjVIFvkkxGpCOXKjKIKu5L0ys1ljDJ2prjELlajYmEMx4yq928jeXb21Kx0UMdKT7uchAzL7I9BPsSITxoL8kbYkx8Se361xwMui5iO2ZA3oiIujMmSjVIxUWLAmxtB3SJUIxdtLo2yfY3qkBUjbSA6NruySE6piPblhj7cW3VT4NXc7nrLXHiU0LRoLId68-0Or4bQrCnAuz-w60HOkTN2HhLSnjlWDJ4AvJi9G93VOSlvyFbtZ8e8zBciI5A + created_at: "2025-01-08T16:09:11Z" + enc: oyMXo7XAXXxIgn_rGbzqnYPmABNtnsYQyGmQFIDjOPx3hzkSQcP_Rg7Me1cKYH2U_CPHx4-fR1GxHcajSSqwnV6p7SduFmMBdAWGXKF0jU3vCg_ByFtz1l8OiGMjWDIAOnk2Wb7gM_d0h0qh9wGMmSTbGsMgjrOwA_Y2Cg1KMgBBjFvPVMVCE1tXfCr8ScLCy7a87OEoZFs-F7u5g82jZLMbAUioEwHZvBJ3ZMcb_2bNxV8p2PKEe7riUGg7cXqC5prjUWWpkUVd8kh2Q5HckKs9L-0BjneKsVmMkBUvjR4NpMc1hOTD65ffgs9vro82Fq5ZVYdUURII_TaEx986Ew hc_vault: [] age: [] - lastmodified: "2025-01-08T13:02:59Z" - mac: ENC[AES256_GCM,data:MeAaaqseP7N1JgyVZxclxhAp1YeKwMtoV1wk7PRW33i2KSrS9CnrWCJUYzWD163PhD7KDhRGNUOwbbPCWYOFiimuK0aZ6Y0Hay5b4QJUVLeTdcU+vgEI7a4CzXEVQxMlooCY+fAQfM+tNsLn4YVQdMKvHuq6wey1PL+88hzTVZE=,iv:OJWLLTRtsIGCu5NvusNC4++KaGna+i6WjH7vavpXuyc=,tag:6+VhS90f1du/sf3Imf7QrA==,type:str] + lastmodified: "2025-01-08T16:09:14Z" + mac: ENC[AES256_GCM,data:qdt5OjCBBfUzJEICDrtMc/fEGlY72OdZ4Arz+gUNmbI0Y3e4XmD3ikP+2uIM5jz6o2QsUoNe6zfyWIKtOzPwmxldQ1FnzOMK0eWSDv7w+mkqYnrMh35+egika5PasvUHWQCb4kMrPq2ndkZeNW9SAXVPEsOfOFPfuVNS0D8HBlY=,iv:BUTWOT8ZRj7ouSl6BzZ9ulPMAsovgZ5S+AsPLYz3dnw=,tag:7jAE4Ryl2I8woKeYQI9Yxg==,type:str] pgp: [] encrypted_regex: ^(data|stringData)$ version: 3.9.1