Merge pull request #5421 from GeorgianaElena/central-quay

Transition all imagebuilding hubs that don't run on GCP to use one central quay repo
2i2c-org · Jan 27, 2025 · 8e9de51 · 8e9de51
2 parents a0c9d9b + 31d9cf9
commit 8e9de51
Show file tree

Hide file tree

Showing 33 changed files with 237 additions and 250 deletions.
diff --git a/config/clusters/maap/cluster.yaml b/config/clusters/maap/cluster.yaml
@@ -19,6 +19,7 @@ hubs:
     helm_chart_values_files:
       - common.values.yaml
       - staging.values.yaml
+      - enc-common.secret.values.yaml
       - enc-staging.secret.values.yaml
   - name: prod
     display_name: "MAAP - prod"
@@ -27,4 +28,5 @@ hubs:
     helm_chart_values_files:
       - common.values.yaml
       - prod.values.yaml
+      - enc-common.secret.values.yaml
       - enc-prod.secret.values.yaml
diff --git a/config/clusters/maap/common.values.yaml b/config/clusters/maap/common.values.yaml
@@ -283,3 +283,9 @@ binderhub-service:
     KubernetesBuildExecutor:
       node_selector:
         node.kubernetes.io/instance-type: r5.xlarge
+    DockerRegistry:
+      url: &url https://quay.io
+      username: &username imagebuilding-non-gcp-hubs+image_builder
+  buildPodsRegistryCredentials:
+    server: *url
+    username: *username
diff --git a/config/clusters/maap/enc-common.secret.values.yaml b/config/clusters/maap/enc-common.secret.values.yaml
@@ -0,0 +1,26 @@
+jupyterhub:
+    imagePullSecret:
+        create: ENC[AES256_GCM,data:JYeecg==,iv:mRlD75gLu0i3IbHCwXfE5heMIR6zThpydwPTMx/7R4s=,tag:08ZzD7DYcAUI1bLn6Yz31Q==,type:bool]
+        registry: ENC[AES256_GCM,data:D+YkFNpPgQ==,iv:eyfTrk9SmXwYb0OQXxpalgcHVG8t+9uB4tTeGpJeuy8=,tag:oFLnoyuUQksbV+chemkMlg==,type:str]
+        username: ENC[AES256_GCM,data:k1uzBw3OMX0FKYCoVLQKslN1fXxdVDh6kB/277cbchlHoZh449Srcw==,iv:rEHKqBPauS933MJsmnz+WGxTfXWnA62ignQWKCEXAmA=,tag:/83RUArWCSBwTxiAV5MA+g==,type:str]
+        password: ENC[AES256_GCM,data:OoUFIdBZpL6t/r/IBgyVyIsZcG9M8bs9Pi6hc2y5E3ffYgdLsn/JK9jgAqdTYFgaGJJUn5of6zLUl5MdRbRuMQ==,iv:f7ljWULkfUTSX4RkYetUIu0YEzQmGNAdNvVvsw+RUqw=,tag:zTvV/fuo8FEcoAQujmG9PA==,type:str]
+binderhub-service:
+    buildPodsRegistryCredentials:
+        password: ENC[AES256_GCM,data:CF5Ze0fe+a3waG6PylIB6BWVUzYNaOEVZDdAA63KYTb0nGPgBbEMpYLXT/l5M3pq/P0katTTi+EfyxCZU6a7hw==,iv:QaPydbzoxxPCfUY2bFJJ4e9XVrrDpddWbH17WRFagPA=,tag:jK/oimzJpigqc2kFCuPp5w==,type:str]
+    config:
+        DockerRegistry:
+            password: ENC[AES256_GCM,data:aQS+iHeqUOFvfOkH3g7sh/ih7zFebzlo1bpYg/ydc61drROz6Uf0TbMfjutR7VdNT8R1DbzTu914J/WXJUa34A==,iv:oPlRnjB58PKtThA4rmzPS4AUPJxErVaqPrs0OD4skgU=,tag:4OpplNP86xRw++XcVvAJ8w==,type:str]
+sops:
+    kms: []
+    gcp_kms:
+        - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs
+          created_at: "2024-08-28T17:11:51Z"
+          enc: CiUA4OM7eE42MAnJnSRbSgcixhYQanLcxwpkon6oodvg2vfsHlPuEkkA5dG1Q+XBCcm6hV3EDD8c3e85Wdjkcv5CgftsEAzTcvFNGuijE6dUcPxi8yRhjELV8cHYPOwXuFUkdlq3L6LekDrzZoda9fjH
+    azure_kv: []
+    hc_vault: []
+    age: []
+    lastmodified: "2025-01-27T11:57:13Z"
+    mac: ENC[AES256_GCM,data:Y4E6zyVRRMt7duxK4+j1V7IMFd+A+ehtCc97AMAWpyAUltQRvw3Xan15gyTcTCbpBP7DVNmyc45pUp2HbRBqtQQjuLa3klZDRXpW7UdxlZ4XA238i++dW5KQ/nKyxKJxpXEq3eOeNLYsWWhWqmS/qmB6V4nmZxcZmc2iMtrh3IU=,iv:hkJ/J8kChcwAHVVqd2+GKN+e4T6c2S6eYLRPtT5caUg=,tag:AY0DSBPStUjzLWzHtkA+VA==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.9.0
diff --git a/config/clusters/maap/enc-prod.secret.values.yaml b/config/clusters/maap/enc-prod.secret.values.yaml
@@ -4,17 +4,6 @@ jupyterhub:
             GitHubOAuthenticator:
                 client_id: ENC[AES256_GCM,data:SKjWcoVyc0Cep3e+bcW8cEaRlkk=,iv:+aXSXE9+hw1zW/kF6V/gNSR8YhTmEa7o4eJLYa80RGo=,tag:6ePElT0HaTiCKfpQLo3zDA==,type:str]
                 client_secret: ENC[AES256_GCM,data:XlxBcGhMNu8v4topVgUDlBAZd1zPWzlNWNf6g9IcqBRBQc6kzFrv4w==,iv:wf0Gn8sJn4nrJFl3eHhYYdO0C5iQD/5rvCgPfqG2Q20=,tag:Ed6qTXg/veJMUSkLhP65pg==,type:str]
-    imagePullSecret:
-        create: ENC[AES256_GCM,data:JYeecg==,iv:mRlD75gLu0i3IbHCwXfE5heMIR6zThpydwPTMx/7R4s=,tag:08ZzD7DYcAUI1bLn6Yz31Q==,type:bool]
-        registry: ENC[AES256_GCM,data:D+YkFNpPgQ==,iv:eyfTrk9SmXwYb0OQXxpalgcHVG8t+9uB4tTeGpJeuy8=,tag:oFLnoyuUQksbV+chemkMlg==,type:str]
-        username: ENC[AES256_GCM,data:aE4wnNp+ow7+NxMbzIiEXoPxlPYsMhRxcPWRno8kAvk=,iv:zXV5NqtqkD5MX7QV/zDkjGcNfrZtDwH1Ei8HGSEZJlc=,tag:iQrNn4YkuCrTnnL5ujh+WA==,type:str]
-        password: ENC[AES256_GCM,data:dg+MqXDco31BQA+kGKMLokVclahOdcLiN8udF+NNJYUf8OiJ1bAJf3hTVXEzKCbM0Y6pV9gzTXpgp3Cu22l9ZQ==,iv:Q1ypj9H+R9Kj0wC73YaJrMaTFmtmZLgvDw5KSsSMe+o=,tag:QVPcWdttedRQnu6ZuQwSXA==,type:str]
-binderhub-service:
-    buildPodsRegistryCredentials:
-        password: ENC[AES256_GCM,data:FtKzW6cHWppcEu9lA4G9eC06jHU6/i9QfUlmzQQKhUTSISI2QX4ho9AFzWQvLiKqICHylJ47DY14QgrFJ/W1xg==,iv:m+DiUsCh7LH+d+TuN4CsTAxT8Y0VfNNTD/4WxMwwvi4=,tag:+lxUp6YNXzNv76kGFqCn1w==,type:str]
-    config:
-        DockerRegistry:
-            password: ENC[AES256_GCM,data:0QKcLMGCwGD32GvRbbrRPRXZBVIS976kZ6mO93OaCIPmZmmG7LMcAwVhXxr3qkfOm/q/lJUfJ3V+MkgOSBWQYw==,iv:JpsDlLIKVguSZLcppbTNMObpAo4yazNns41SibEIt0E=,tag:Tt0UT1Y7bwEdrTHfrK7lTg==,type:str]
 sops:
     kms: []
     gcp_kms:
@@ -24,8 +13,8 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2024-12-05T13:23:16Z"
-    mac: ENC[AES256_GCM,data:cCP8Y5MIe62tonJSs1PmXfhpQxvDl2TuCmlBIDHRXISzAaV5ZjnhS1XCKq5SmcgJNB4Q3eN0/XsX4dA0cSfc1764xgO1DHZ/kKDvSUIt++/zwFXQkHOqx2Rguu4HY3J/mQDrWAONNTjQyIJFtlXE88i8TJq1f2kr2kr6dbVQ7NI=,iv:9BngLFIEL2u61Zf/KiPH6+KreDAiSKCjPGqf/wYIuDE=,tag:UXtqs4CTWdXr4wNGcgXRlQ==,type:str]
+    lastmodified: "2025-01-27T11:57:45Z"
+    mac: ENC[AES256_GCM,data:0l1e6vzzuDCBBEo7L36kwSJMHqcxyPWgFxwJYRFDVd9cPpt1Hox+sjIg3JG856c2zeSm4BFw4wJSX51/22F9ZscCqvx5ftG6MZQwwfnD2Lc+AdD7CtZRK8QGJeAbTkB429mRIyu20yA8nmu30tOx/+X1WqxG6v0V5gaILxUVmIM=,iv:0t09c7GDeeGwr1FwjfNBRhgvCiI3yqaeq324fY/3+PQ=,tag:8xdNIqreI1OWLYPrtSjBhw==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.9.0
diff --git a/config/clusters/maap/enc-staging.secret.values.yaml b/config/clusters/maap/enc-staging.secret.values.yaml
@@ -4,17 +4,6 @@ jupyterhub:
             GitHubOAuthenticator:
                 client_id: ENC[AES256_GCM,data:asirgqdeCkZqjqItFf/+/8XQg/8=,iv:t3zEcuO3oyyPrFW+3pN2nB+5HviGzRr+oK2op4s+0M8=,tag:vnPRSHriKYmNqJGNQXrjFw==,type:str]
                 client_secret: ENC[AES256_GCM,data:TtOH2w1o88Mtb/HCTOM+vdRQAnzVmgxfKPJtW88l6wCh/8+IRpnmPA==,iv:Ja/zw+dg8+EbQvFG6EqUXdEgkd7l6fyDSlnN4ey8u8U=,tag:rA5oasxwoTQ0ww61dVHC1w==,type:str]
-    imagePullSecret:
-        create: ENC[AES256_GCM,data:JYeecg==,iv:mRlD75gLu0i3IbHCwXfE5heMIR6zThpydwPTMx/7R4s=,tag:08ZzD7DYcAUI1bLn6Yz31Q==,type:bool]
-        registry: ENC[AES256_GCM,data:D+YkFNpPgQ==,iv:eyfTrk9SmXwYb0OQXxpalgcHVG8t+9uB4tTeGpJeuy8=,tag:oFLnoyuUQksbV+chemkMlg==,type:str]
-        username: ENC[AES256_GCM,data:aE4wnNp+ow7+NxMbzIiEXoPxlPYsMhRxcPWRno8kAvk=,iv:zXV5NqtqkD5MX7QV/zDkjGcNfrZtDwH1Ei8HGSEZJlc=,tag:iQrNn4YkuCrTnnL5ujh+WA==,type:str]
-        password: ENC[AES256_GCM,data:dg+MqXDco31BQA+kGKMLokVclahOdcLiN8udF+NNJYUf8OiJ1bAJf3hTVXEzKCbM0Y6pV9gzTXpgp3Cu22l9ZQ==,iv:Q1ypj9H+R9Kj0wC73YaJrMaTFmtmZLgvDw5KSsSMe+o=,tag:QVPcWdttedRQnu6ZuQwSXA==,type:str]
-binderhub-service:
-    buildPodsRegistryCredentials:
-        password: ENC[AES256_GCM,data:FtKzW6cHWppcEu9lA4G9eC06jHU6/i9QfUlmzQQKhUTSISI2QX4ho9AFzWQvLiKqICHylJ47DY14QgrFJ/W1xg==,iv:m+DiUsCh7LH+d+TuN4CsTAxT8Y0VfNNTD/4WxMwwvi4=,tag:+lxUp6YNXzNv76kGFqCn1w==,type:str]
-    config:
-        DockerRegistry:
-            password: ENC[AES256_GCM,data:0QKcLMGCwGD32GvRbbrRPRXZBVIS976kZ6mO93OaCIPmZmmG7LMcAwVhXxr3qkfOm/q/lJUfJ3V+MkgOSBWQYw==,iv:JpsDlLIKVguSZLcppbTNMObpAo4yazNns41SibEIt0E=,tag:Tt0UT1Y7bwEdrTHfrK7lTg==,type:str]
 sops:
     kms: []
     gcp_kms:
@@ -24,8 +13,8 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2024-12-05T12:56:40Z"
-    mac: ENC[AES256_GCM,data:kMn8LQq3x/hG9Sh07ohhp8q1EjPJmXL/oW+zaCHHcr5vnNIoJ8Cng+9/jAo4XCc2+ZdqiDi5kif8gzEKsFvQrMTjpTmh9JAsTl6rDkDWZ6DobnbWCqT36L2m5E5oLq+tBm4f1VKyNYnu3s8ymh6RlPz8ycu49CjSTqUl9zk3n4Y=,iv:VirUSbSpB8NjgpSSd0bu/Quu0RQwhlRnhTXFESa9Ax8=,tag:P/uquG9HqabljQbXWqqQQQ==,type:str]
+    lastmodified: "2025-01-27T11:57:30Z"
+    mac: ENC[AES256_GCM,data:ExihvcTo5fZqhwziA9h0d1VWUCY2asA1BvFN+/UevDxPmwAeu9iomzNz7cKZp8W0d3RP9FcQuPZz7SsUDCete6FfsZT+gpQLQfe8Hd41kol526Q2w2MJcMeU7aj/Sv8VnfQgx0uzK5pr/uPgeVAXb3GarNUQyiopQyJBckuba34=,iv:Z+QYbdnc1HhDvji5+vnZK5Qv0ymWW1BXARqwqCG/ZHU=,tag:geEs0sO6AbiPiteXmtKlZQ==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.9.0
diff --git a/config/clusters/maap/prod.values.yaml b/config/clusters/maap/prod.values.yaml
@@ -64,10 +64,4 @@ binderhub-service:
       node_selector:
         2i2c/hub-name: prod
     BinderHub:
-      image_prefix: quay.io/maap-imagebuilding/prod-
-    DockerRegistry:
-      url: &url https://quay.io
-      username: &username maap-imagebuilding+image_builder
-  buildPodsRegistryCredentials:
-    server: *url
-    username: *username
+      image_prefix: quay.io/imagebuilding-non-gcp-hubs/maap-prod-
diff --git a/config/clusters/maap/staging.values.yaml b/config/clusters/maap/staging.values.yaml
@@ -64,10 +64,4 @@ binderhub-service:
       node_selector:
         2i2c/hub-name: staging
     BinderHub:
-      image_prefix: quay.io/maap-imagebuilding/staging-
-    DockerRegistry:
-      url: &url https://quay.io
-      username: &username maap-imagebuilding+image_builder
-  buildPodsRegistryCredentials:
-    server: *url
-    username: *username
+      image_prefix: quay.io/imagebuilding-non-gcp-hubs/maap-staging-
diff --git a/config/clusters/nasa-veda/binder.values.yaml b/config/clusters/nasa-veda/binder.values.yaml
@@ -113,10 +113,7 @@ binderhub-service:
       badge_base_url: https://binder.openveda.cloud
       auth_enabled: false
       enable_api_only_mode: false
-      image_prefix: quay.io/veda-binder/binder-
-    DockerRegistry:
-      url: https://quay.io
-      username: veda-binder+image_builder
+      image_prefix: quay.io/imagebuilding-non-gcp-hubs/veda-binder-
   extraEnv:
     - name: JUPYTERHUB_API_TOKEN
       valueFrom:
@@ -131,6 +128,3 @@ binderhub-service:
     # appended to binderhub's URL instead of the hub's
     - name: JUPYTERHUB_BASE_URL
       value: "https://hub.binder.openveda.cloud"
-  buildPodsRegistryCredentials:
-    server: https://quay.io
-    username: veda-binder+image_builder
diff --git a/config/clusters/nasa-veda/cluster.yaml b/config/clusters/nasa-veda/cluster.yaml
@@ -21,6 +21,7 @@ hubs:
       - common.values.yaml
       - enc-common.secret.values.yaml
       - staging.values.yaml
+      - enc-imagebuilding-common.secret.values.yaml
       - enc-staging.secret.values.yaml
   - name: prod
     display_name: "NASA VEDA (prod)"
@@ -30,11 +31,13 @@ hubs:
       - common.values.yaml
       - enc-common.secret.values.yaml
       - prod.values.yaml
+      - enc-imagebuilding-common.secret.values.yaml
       - enc-prod.secret.values.yaml
   - name: binder
     display_name: "NASA VEDA (binder)"
     domain: hub.binder.openveda.cloud
     helm_chart: basehub
     helm_chart_values_files:
       - binder.values.yaml
+      - enc-imagebuilding-common.secret.values.yaml
       - enc-binder.secret.values.yaml
diff --git a/config/clusters/nasa-veda/common.values.yaml b/config/clusters/nasa-veda/common.values.yaml
@@ -301,6 +301,12 @@ basehub:
       KubernetesBuildExecutor:
         node_selector:
           node.kubernetes.io/instance-type: r5.xlarge
+      DockerRegistry:
+        url: &url https://quay.io
+        username: &username imagebuilding-non-gcp-hubs+image_builder
+    buildPodsRegistryCredentials:
+      server: *url
+      username: *username
 
   jupyterhub-home-nfs:
     enabled: true

diff --git a/config/clusters/nasa-veda/enc-binder.secret.values.yaml b/config/clusters/nasa-veda/enc-binder.secret.values.yaml
@@ -1,28 +1,17 @@
-jupyterhub:
-  imagePullSecret:
-    create: ENC[AES256_GCM,data:+su1AA==,iv:idizcwXo2blejJUKw6NHV6o2BKUrWvHGh+bPBp+DkbY=,tag:cQhfGgf9VAwt6xeJWR0uqw==,type:bool]
-    registry: ENC[AES256_GCM,data:puh2s4gR+g==,iv:EnfIE0/61yaIL6gd2tl6m4hVh+ES63m3zTG5O1s90dc=,tag:+p7DnJ9WZRqrbaMYO1HRXA==,type:str]
-    username: ENC[AES256_GCM,data:sIrNdDVEN/e+Je5M1KauddfsljI/K897WA==,iv:UHcHc/uSROFe9gZLV4IADG1ltgsi4rxL1xAigi+spCY=,tag:5RLIyas8y4uycXLf2lwjAQ==,type:str]
-    password: ENC[AES256_GCM,data:n1cb6PgW7NsadzrPSJMDTU1Cj2dpXldVVODpeVJ/o15OXim1ZphtLKVR8S3Ji3TB1T+IVhaPT3mcxr5ckT68lA==,iv:2jPjs37cIqMaswFxScWM2Tc48QaZpw7IrwcM69UY5d8=,tag:rl7nzZZH6CLaggh7/1s4Dw==,type:str]
 binderhub-service:
-  buildPodsRegistryCredentials:
-    password: ENC[AES256_GCM,data:ckQcxrnIOowvdoKHQ6uFeUaYXEOTGyCSpDCy04J3VmIcBuuYQyHCRNb7cD/i5jvL0ksIoVfw/j22nHPCoLW9lA==,iv:2pY6L2+15czAjfPjN3PlFkBkp913t87Agn15PC7yUlI=,tag:JDWegdT2bUoCpbuU01hoNw==,type:str]
-  config:
-    DockerRegistry:
-      password: ENC[AES256_GCM,data:ehmzMqe2rllui55OTbvfEMSF0TaKeR92LOBY4DPeccYLmWiXaomvMWhGH+EMIqmncLLGLP1bbDRFP9UcCxyjSQ==,iv:CwQs8iLif66rBkqSNEBX8mu42s2mldFnosxnrXvgNFI=,tag:562WxRPJU2bfPyOUPCI+9Q==,type:str]
-  extraCredentials:
-    googleServiceAccountKey: ENC[AES256_GCM,data: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,iv:4+mBczkd6ORJcVQAF82+8xChNGDDI8L6TTQtlR7781Y=,tag:RhatbwKSNJKboBpUipBvKA==,type:str]
+    extraCredentials:
+        googleServiceAccountKey: ENC[AES256_GCM,data:H7UqH5QUXp4cSNmm7mrCHkLbHMbKIImx7SITpFqLEGrC134K4GhcA0GpdRVvch7+zynBHvJTbo3In0KMAOeiP2A1c2bYGVPNC1HGMIEO2EgQIUZipZwUdkOlzpZQuB9OXU8sXi/om295T9aKFOCwv9kv4fFDhuMIPTPZSLWGRL/gMGE/Ay1w8vYi0MFRYqik68O4daS2L2CGokS7kpRxMRmvIjxvE2hPfZz1A23VB9qLbvMflmSfWMnoJnkFeoZfPmN+VnBtDf3VjkUgf3zD4dzCNYcaSTzIHU69CnyihLLPaeT59VqggVQcaIq3zU+WTz/o30V4ebtMbvp2maGworr1fbxa3U1Ql+fe6IdxR9zHAHzZF+lAE+E1ouEILEtkmle0XqjiQeROXCoU7TLQ9be2r2VnnitSGOQcoZ/bgvpLqgERYvLpAoURA52Eksj8dcpV0Mow/m/H3XX8rcGdCFDT+KSWKaw4rCX7VVtR/4npja8+iTKY1sIzHb8hnDvksK+VjIqIbim5eDkfxsapMOXxR67YcV4X+xcAEUvXHFRqznaZ1vuXhctw87FU01BtWOVUF6wu231qrkhHEAzsfDuVk1EcJUybbrteLEatPDxmfso3EQtGRBzu+uT+LVy8TZtcK4k2HhyfDvRk/QVBcU2DUtRk11O1cV4y9LjWL+xNFN+NFvLv1LGh1SC91mEvdPYRBhQkOY9UDRQN/OohdJ9nM9dFaxrL5MQETBSF4nmJse8DBKgp751R2ZT0KJUSh2+sn/Bal3RrOfrwkaU7jnh9M8/BHgA6IkVhB2MWaUXpFnWpG0T6rqTG2aIBfXDUUac/CYnb7HCJdtHyW9sFRRe1LWTFfrNcJjI1X3GUQwmTg5v29S4zeo6MljOpD6JOPOsIBwmIQI4RzuWh31Qh4QAHtLlNlqYScf9FL95AhFOxo0+hH2M6wmHPzAeQA8fq7IssX6XtDpO2s2qEBb2LbY8qVc7SN/TY3n+m4vhd2hjzxRxMLI0zTbzd7lxtTAYv5F7pfOKCXODgKg0970Ok1MiBNBF6x5urE6rrnQeDCV1EGHxXGf4VvlOY0RdG+q0rqCAXRtQHW7o2z930PPGbOkqjn0Hpl1d72UHGYCzNlLnvi8zEz300fVBMr4Q32sK8loUfWGJCU3JPnodCGZOQsUTGZAQgsMHP6AfhWVokrSxQX/0otNHdrZxAcQKOQBC8tYiQBZgjK5DDR2nrxHbKNs1cDBZmfpCD8WI5NuuJo9CBzDAQqYjhiOhS9dow001427eIQdq6ekag6NVzJLzEAFl3/apdZ5dLL/ohubABJ/U4A70PyNsvkMSor6rrK7kSv52c/PbE/DnRZrfJSWgSKYuqANgB35seOxVVod9KoXfaWE8U8mhmC2CXHpSp5V11EngALAzZa+LuZbh8b1+xYzPCLZbq7YB1j0dAR6dyXBmlUcnISVAReNBmUghKcT5onnk/U6Ld9qP9VGtcSlmGfKddAv7i8DrmFBdqfnXqAgUUf17Z+qygj7nmByI0vDUOjVbbeKTRnnoHhVDvbIJxJXDZWdpaFS1j+Setk5pWtUPjjey16FhqeYwW+DEFrzV0zWsfi4f89K0iXltQFjnEVYpfoH2oU+SMTFcA841XZvETTMHLcHNnb0dng1Nm9CRrajkDlvf104Ip2qxypVH5L3hFjCd/aNJolcFQyN5Cv1oNstOJBQNoNrMjVty1heKC1JwP3z465AWzgEOukNwJ2niiYTHh8JNNX6QaPL6vv/V1Z0xQrASKP/G8csoSCqgWwpUaq+w3GXW98veVGdOh5P8rz92pAhLSIEN9fREQ2j+eANXPnPctWchKvPc12quWXphrucjdZ/otSC2fz/adg1K9eiuX94AElqNJCpAIhtPp6gE9s8ueiXzcDLyz8J/I3XJf5MJ9zBKsjhGXnPD3tGtFAGKnKr0lEgg1sr6pC0XyYDMWXIr9RypiyOnJEL4GOjxoMgGaFqmGmCd7DKWYETxfmrfpvo7xLId6EPMcBMifRxFoGVTzmOdI9f+6luku3vpZ55Ukhi8AWzUlyhpcgEaW5ezVZja8fcRRsiVaJiQTMeA8s/0MCzgXi8PT6REvWG2WWcSRNUU6VjCCSCrLUGeVUNH3HQXQie4SqJanZCbDEpdQiRB9whCzHfPt2Lsi36wydopjkxDDEmwHwMWz1WEYbyTE2S7HJfZNTygPDaQw35gnrfzbHjMYzVK5A5oPgnq24yDyGS/RIPZVZXRN5OZVOjRAb7NXBLxbcopmczasZ+pBz7Vi14duqE4bzmti9zRIR5/bjEKrrqW3qt7UDTd6OAIhJiu5HEojZe9GenBwHPBdDmDztSmhexjX9L0OxvxPsoaLHQDU3wBLZdnxTHvbBaA1HCPm5sbyJa2JPnimnVaEfFIsfS67xbhkUxGNW8JX/vbu9UmP/UzuTFprxxU89FEE1rATUt3gVm0wByVfhFvzbaF8DJ0W3Yy6ncA8iaoJ/ZpePM4MxWzgfxgBFPJZaG9UXJH73Xry3WhdeknqPMIh1AUcw4UNNC6ShkqDGTx0UXfMknokcxV3bBiGyLLCCHrysUpbPcSdYfWepsha4ojs9qaorWqc0UKAFqZZPB5W7wyb5JSDWJ+HHLp2zhgaBAO4qRoVbec8aj33/JM0FAFKyKfGmoMikh9yX3i8JIQwFDYGI8GaOnGogpRIEubaveumL/R7Sg90Z8Max6ZCSHpDD6FMgjWgNqrbMKn0e9b0Y2vdYBywMkEGeLn7qZILwQ8yiBShX6BL3LDLfcQ24DcF/Ufnr38FQb7vsRI1dC4rsEaTRh7Xdud1/y77s9DxjvqMFAn+D8Yk2XBm4BCteYpwuKrUpcoS6ciCFa8y6pKS/qNvPq9e1MlOgl757OXiEgP6gUD3ChT960v0aR0gsoW0/CvNpGXVlCwkSo9rnvQdjHJPFFT6IjL6jHvjq3xHzUq8+12RnNmWQh3GPtbddFiGOTkHJgyXvzYLmVPdED36xFdl5OIWtamwE7lzj7BVjalB+01gtvBnvQxrWBZM8MSXLXTwlxdblH7Gd72vFPJMcBQMNR49te0Tj+Mlavw2M2awXYifPWP/zAeCioROaGClIpqqK3vUqCVHBqPe6uj9GBDzaNx1J2gldWZB40mCq4OF+g==,iv:4+mBczkd6ORJcVQAF82+8xChNGDDI8L6TTQtlR7781Y=,tag:RhatbwKSNJKboBpUipBvKA==,type:str]
 sops:
-  kms: []
-  gcp_kms:
-    - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs
-      created_at: "2024-08-13T09:04:14Z"
-      enc: CiUA4OM7eIxmbFv0F54lOcRzJysIa3YATolAyz3HXfYJsjCivTqxEkkA5dG1QynYUuCPRTkpfvxp3mb1fKp/WsAarXF3NBmLWkT2cdwwQvLzC8h4KgPFh5fsqRI1OtosRm0R1xhJYQA1s5cF5nvWGZhG
-  azure_kv: []
-  hc_vault: []
-  age: []
-  lastmodified: "2024-08-13T09:04:14Z"
-  mac: ENC[AES256_GCM,data:wDuS4L777JHB/8CgCC1PoZc3MNiJosSYfiycNzADwf1s/3rZ+xsDr5ErRfLIusXK++VItBL8Yy3tNflQriXZpqq/v9fz5xKMPlOZrnTyVKj3thZyOTl4+4t3A+RC1BFhGIWvqBKmdmwQrStReQFJ3LApDmTZpfci6rEx+mgyx1c=,iv:FszkfEJK6OYVcnBwz5u1zz0VrJMxB3oDVHwb9TRkTHs=,tag:Te1Up2oWKwqZvCiOUke92Q==,type:str]
-  pgp: []
-  unencrypted_suffix: _unencrypted
-  version: 3.9.0
+    kms: []
+    gcp_kms:
+        - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs
+          created_at: "2024-08-13T09:04:14Z"
+          enc: CiUA4OM7eIxmbFv0F54lOcRzJysIa3YATolAyz3HXfYJsjCivTqxEkkA5dG1QynYUuCPRTkpfvxp3mb1fKp/WsAarXF3NBmLWkT2cdwwQvLzC8h4KgPFh5fsqRI1OtosRm0R1xhJYQA1s5cF5nvWGZhG
+    azure_kv: []
+    hc_vault: []
+    age: []
+    lastmodified: "2025-01-27T11:35:18Z"
+    mac: ENC[AES256_GCM,data:MZwgzjnZeZFFqLUOTFjYyHObII9AtLj6GXmGyeGNkc64TnzEz+N8emzzkRM/g0BSR6D5PExjNJeuNFD6muf7bwgXIIKLIfsUIiqvE22n/EsnWVaHp/wKalIPYY5ODLWbDdJEfAW0Q+HxuwZQWF8wns0MuDuwx3mXko/gRLkh3lI=,iv:cU0HBicqpXmIBIvAvN5p4gazX4U3o86rQITo1Bn4GQY=,tag:oyJecNj0+c+/RW2M/O9EJw==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.9.0