From 4201b932eb52cb0d8305e3aabc27912b75e77a04 Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Fri, 13 Sep 2024 13:06:13 +0100 Subject: [PATCH 1/2] Remove image definition from support values This is now set in the chart --- helm-charts/support/values.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/helm-charts/support/values.yaml b/helm-charts/support/values.yaml index c4805512b8..d0e7c01884 100644 --- a/helm-charts/support/values.yaml +++ b/helm-charts/support/values.yaml @@ -522,7 +522,6 @@ prometheusStorageClass: # Setup a deployment that will periodically backup the Filestore contents gcpFilestoreBackups: enabled: false - image: "quay.io/2i2c/gcp-filestore-backups:0.0.1-0.dev.git.9908.hcc20334f" # A placeholder as global values that can be referenced from the same location # of any chart should be possible to provide, but aren't necessarily provided or From d3ac81d67490c35caccfcae3726e0362313aa29f Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Fri, 13 Sep 2024 11:38:11 +0100 Subject: [PATCH 2/2] Fix gcpFilestoreBackups syntax in 2i2c cluster's support config - towards #4706 - resolves failed validation in #4798 --- config/clusters/2i2c/support.values.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/config/clusters/2i2c/support.values.yaml b/config/clusters/2i2c/support.values.yaml index fb6288acbd..de892461cf 100644 --- a/config/clusters/2i2c/support.values.yaml +++ b/config/clusters/2i2c/support.values.yaml @@ -63,5 +63,6 @@ gcpFilestoreBackups: - pilot-hubs-homedirs project: two-eye-two-see zone: us-central1-b - annotations: - iam.gke.io/gcp-service-account: pilot-hubs-filestore-backup@two-eye-two-see.iam.gserviceaccount.com + serviceAccount: + annotations: + iam.gke.io/gcp-service-account: pilot-hubs-filestore-backup@two-eye-two-see.iam.gserviceaccount.com