From 02eef0320ce5db981f55dcbf9252194e9342e4df Mon Sep 17 00:00:00 2001 From: Louise Huyton Date: Thu, 9 Jan 2025 13:20:59 +0000 Subject: [PATCH] test changes of script: adding aso folder as a patch in kustomization (#5938) --- apps/toffee/dev/base/kustomization.yaml | 7 ++++--- .../dev/sops-secrets/recipe-backend-values.enc.yaml | 10 +++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/apps/toffee/dev/base/kustomization.yaml b/apps/toffee/dev/base/kustomization.yaml index 510e97e49e..53c679cecc 100644 --- a/apps/toffee/dev/base/kustomization.yaml +++ b/apps/toffee/dev/base/kustomization.yaml @@ -1,14 +1,15 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ../../../azureserviceoperator-system/resources/resource-group.yaml - - ../../../azureserviceoperator-system/resources/flexibleserver-postgres.yaml - - ../sops-secrets - ../../../base - ../../../base/workload-identity - ../../identity/toffee-azure-identity.yaml - ../../identity/apple-azure-identity.yaml + - ../../../azureserviceoperator-system/resources/resource-group.yaml + - ../../../azureserviceoperator-system/resources/flexibleserver-postgres.yaml + - ../sops-secrets namespace: toffee patches: + - path: ../aso/toffee-postgres.yaml - path: ../../serviceaccount/stg.yaml - path: ../../identity/dev.yaml \ No newline at end of file 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 05e29cd4fe..3f67ee9375 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:DczOa2XtNaYvcYvGYxobISwxFNA=,iv:kVAVRdP5Vc49nSonUnWK8gba9c3LksW+8tySitsghcw=,tag:ztckty7Ox3j84a0v1VlJlQ==,type:str] + PASSWORD: ENC[AES256_GCM,data:U5Y7zR2weTCjH2KA7Y8S8ZJOGI8=,iv:yIsWpkKbUxiGS6skOojnc3TEj2snhmcickV8iKzA7qY=,tag:59WGuYXxDk0Qctl9a77Ajw==,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-08T16:09:11Z" - enc: oyMXo7XAXXxIgn_rGbzqnYPmABNtnsYQyGmQFIDjOPx3hzkSQcP_Rg7Me1cKYH2U_CPHx4-fR1GxHcajSSqwnV6p7SduFmMBdAWGXKF0jU3vCg_ByFtz1l8OiGMjWDIAOnk2Wb7gM_d0h0qh9wGMmSTbGsMgjrOwA_Y2Cg1KMgBBjFvPVMVCE1tXfCr8ScLCy7a87OEoZFs-F7u5g82jZLMbAUioEwHZvBJ3ZMcb_2bNxV8p2PKEe7riUGg7cXqC5prjUWWpkUVd8kh2Q5HckKs9L-0BjneKsVmMkBUvjR4NpMc1hOTD65ffgs9vro82Fq5ZVYdUURII_TaEx986Ew + created_at: "2025-01-09T13:11:51Z" + enc: ajZ_N6SrqKx6gmow3hVqKBKl8-I_64Kh4s0QEK2T-DW8gcvoeKyi_c9dRdCWKzOWpef-HNzBZNCePKl298PZxL-34BlfYjsARviGGqUII9LM5hr-b8SLxFa0_yNiBZb0At3_GATale3CJwlaq8rxPw9kJXFmVd1CzFIdndkaQA6jwfHlVZCsWAwOAn55rOe1srDz2y2sWL3XxALTvgXYEaIOS0Cb5bAlr85hg3T0eXDIbGoB8rASxOK7NgeyBIa4NinO2wNzhzIaYjudAdr2M4KWzhwgn9vngEzmiUHxW_PWWeP_OcvoVKM8Tm5pJhVziVFYweYK6DR7ZO67yOB4TQ hc_vault: [] age: [] - lastmodified: "2025-01-08T16:09:14Z" - mac: ENC[AES256_GCM,data:qdt5OjCBBfUzJEICDrtMc/fEGlY72OdZ4Arz+gUNmbI0Y3e4XmD3ikP+2uIM5jz6o2QsUoNe6zfyWIKtOzPwmxldQ1FnzOMK0eWSDv7w+mkqYnrMh35+egika5PasvUHWQCb4kMrPq2ndkZeNW9SAXVPEsOfOFPfuVNS0D8HBlY=,iv:BUTWOT8ZRj7ouSl6BzZ9ulPMAsovgZ5S+AsPLYz3dnw=,tag:7jAE4Ryl2I8woKeYQI9Yxg==,type:str] + lastmodified: "2025-01-09T13:11:52Z" + mac: ENC[AES256_GCM,data:sbTZOi1OhEfHW7kJBXpCCur69yh0RBh/tKIZjGv6ERotk+TK1pw1zdLpXrzYy+4Yz07QpQ2kYRnA26zyrMuGPs4kSZW7LAti93vNi6Kh2KEyHGsUyPGSkBmxV+uIGklh0BRcd2/p+eR3Fg9kSNDzOWD95fIMsDstXLHc/dMjFyY=,iv:8JeI6hGbEH1NZQOXvYMSLR/x/BT7nhHfoW90TdW5Vok=,tag:rlDDi9ek+UfQ2MBoX3+RAA==,type:str] pgp: [] encrypted_regex: ^(data|stringData)$ version: 3.9.1