From 143a7cc789ded5c884544a50b31d7e9bc33d583c Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Wed, 3 Jul 2024 17:48:15 +0100 Subject: [PATCH] Use yaml anchors in opensci/small-binder config --- .../enc-small-binder.secret.values.yaml | 20 +++++++++---------- .../clusters/opensci/small-binder.values.yaml | 10 ++++------ 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/config/clusters/opensci/enc-small-binder.secret.values.yaml b/config/clusters/opensci/enc-small-binder.secret.values.yaml index 81a23ce4c2..8bd6ba4a13 100644 --- a/config/clusters/opensci/enc-small-binder.secret.values.yaml +++ b/config/clusters/opensci/enc-small-binder.secret.values.yaml @@ -1,27 +1,27 @@ jupyterhub: imagePullSecret: - create: ENC[AES256_GCM,data:kwCgxg==,iv:MhD02uGKd/C52KSZETlhQPDAmICgsukkD1jBJ3MRJRc=,tag:9w9Vg+9TOE4f6AKFzAQ4ow==,type:bool] - registry: ENC[AES256_GCM,data:2bCCBvHtLw==,iv:hiu2gt9XSBF6wHy1Z23BKviT5ttAlJWHSMZgb0dAqnk=,tag:3tSrFHDAWMbRNdF308jp2Q==,type:str] - username: ENC[AES256_GCM,data:1KIci+vBRbLmuodMOxidZN7nhqXasSPgHuKdTEOsv+CqGg==,iv:rx4JCD5/hGQzD4bskNiObCKXEdJo8WnY7FFEUYiJL5E=,tag:fRFC6CbHbU9mF1ld7vtFIg==,type:str] - password: ENC[AES256_GCM,data:SBdPz4bR7j1oBTCcIspa57hVzX18Wz8YXskaloXCwjPYWOCTEh871VpNt377RI6szZWClEVJKmIwPW83Tahv2A==,iv:gJ8wEFS566bPoW2wyYdhmVNZBMxfGdGpCILrknDvq58=,tag:JAqjGZC4jXL2jb6poDDf6A==,type:str] + create: ENC[AES256_GCM,data:TAKpDg==,iv:SiPPdDRIaCBds2M6Y78GeSI6ws5BvTrG0h2NlZ/2FfI=,tag:D9ISIKFqg/48JA2uLufXTg==,type:bool] + registry: ENC[AES256_GCM,data:kXI9zWQ1nQ==,iv:oWOD6xuABJQuvKDxCswd/m48tXUyt4JTaJUmAy5RwI4=,tag:hhmXnNs31AVRBPmLTmm7eg==,type:str] + username: ENC[AES256_GCM,data:AvJVLLDlFTguKm4oIp/GhJtmAU2TgdDYoG62j+gIz60r8g==,iv:Il22jakRBLiMDWoWMYqcmZjwiGzZkEQeibl3PICbjHY=,tag:ifUMYzhbAPIcNOTOA/9GjA==,type:str] + password: ENC[AES256_GCM,data:u9eYni6XSwFXk2u/N7pHJiCTX43sc6na3DqujkXDJ31qA2pigwxWd35yNjiTS78aTlM0nM2P6h2K9AmhKZk0kg==,iv:K+Ow+Rx1HWktxNZxcf1jrk9j4wAjvfYF4KAxJmuh4+c=,tag:OG1QvIFmBONsVeb2LsT+VA==,type:str] binderhub-service: config: BinderHub: DockerRegistry: - password: ENC[AES256_GCM,data:1NE+KRfA03apgkN4HiL6DlJIl5mViAi6HfuDJfkDNSE3AeNyyCztLyU0SzsuF9CeIaGqMKLY9ApRrqKKhZdOXA==,iv:ygy+6d9C74QrsD8vpKQlhoZoLvSdWTvjBljsLvTOMeI=,tag:ypKJApuNoFMesmRZntKZpw==,type:str] + password: ENC[AES256_GCM,data:C9CoHntRSVitEO+spxcHjZTzylwFG/CUz99uJcTLf15LZ+fDAxbt8QPDiH6QOx6coCxwsMIQnbEN9MwBHb/YdA==,iv:fOzdExlgKBxGnCvOUxGsgAoIveKEO16ACkU1maTf3aQ=,tag:f/cKaPIJ4/cDGZAV2ankKw==,type:str] buildPodsRegistryCredentials: - password: ENC[AES256_GCM,data:9Y5ZbCxsh7R5Nhung8rM5mbwKr6wc6zP0hetSBm0On9LJu1Bm8DzqKDKvdjKMYVsfSRiXvX1azw14p6tcAD6TA==,iv:pyBnD3/+G/YYROV5L63JZZXTI79qpGfjT3SnXU3w/YA=,tag:zo7K8us3dQ1y4e3HuBci3w==,type:str] + password: ENC[AES256_GCM,data:q3PD3kqWvOchBVcFHT/j3bN3Y2JUroqPkknaN2CDIFWteZz3bU+hk7aTpgyZbVgQXusIl00JrweVuJ53F9ISqg==,iv:AJIM5e7RNimP/PoAlbPtFPjaCOekBMb6xoTqHM3qfKs=,tag:OP4TN2UGsXxC1cGtujXQdg==,type:str] sops: kms: [] gcp_kms: - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs - created_at: "2024-07-03T16:36:10Z" - enc: CiUA4OM7eM0KjNX3txwc7IFFIrAHnUEHeOKHkkhxP9GZl0NkgbaxEkkAWX/fcZVaxi4DVg7RLT89B9lLkKQmxN8wW/HC37U5zE4PKgXHsHzQ1TRYbSLqoqXO38pwfcMSSANRFCTYxUr4QOMfDkBtENVd + created_at: "2024-07-03T16:47:50Z" + enc: CiUA4OM7eLTh65+tiMaNFjex+Bi0At6P4ss58YbhhLDtb5k2c5CoEkkAWX/fcYzqMc4MkYkXh6wFyndgaieotq7hOWOrYAkFBZJcfhXLafVjuIjKkHX0XLmWlN3Og8PUvdyMFc9jRsYCjwU512h+hMa3 azure_kv: [] hc_vault: [] age: [] - lastmodified: "2024-07-03T16:36:10Z" - mac: ENC[AES256_GCM,data:TaephWFTnMM5BrxOVWXUw8eTbt+Oy+QdJJzvcihL+3JaigKI2dEG2Rv8ihkfun7itrOnaDhMqF5I5uyj+7lA1GaVSxAi+4BTgtE4PAghFEoQPsnvVg7Q5uOFRUAHarl6/qz+go/qOiZit1eMWsfIcmvRs3MtTVZho3aSY3c1410=,iv:kWwiK/+97VUk9KUZpqwU022WzlLH39TEajkyv8DMs2g=,tag:dv8vO4sHFHvqqKeImv0QBg==,type:str] + lastmodified: "2024-07-03T16:47:50Z" + mac: ENC[AES256_GCM,data:KpgW0VzSTSKxXbZFdc/U7SpXNyTn5uYqQrvosT35XK1SL4E495WGFcON9u5sIVfp5vVW+fzEPgJmNzEM3PIcVDSLcQgY4BKs0RMQ9OhKNcqHRMp049wZCXfvX/tDdsBiyAQ9lJYHKT5QOLFeAyNuX2MxxMqay6ohOe7bUbCZQgk=,iv:8zz8Y1WXIUIgAw4CcPcrCO2GiHlS4P2IDSB1fQdht0g=,tag:EqKAfD4bngOpM1oxly+85Q==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 diff --git a/config/clusters/opensci/small-binder.values.yaml b/config/clusters/opensci/small-binder.values.yaml index b914b117c0..8243d44dad 100644 --- a/config/clusters/opensci/small-binder.values.yaml +++ b/config/clusters/opensci/small-binder.values.yaml @@ -96,8 +96,8 @@ binderhub-service: # Update the about message as more repos are added to GitHubRepoProvider.allowed_specs about_message: "Launchable repositories are: github.com/binder-examples/requirements and github.com/2i2c-org/*" DockerRegistry: - url: https://quay.io - username: opensci-small-binder+image_builder + url: &url https://quay.io + username: &username opensci-small-binder+image_builder GitHubRepoProvider: allowed_specs: - "^2i2c-org/.*$" @@ -117,7 +117,5 @@ binderhub-service: - name: JUPYTERHUB_BASE_URL value: "https://hub.binder.opensci.2i2c.cloud/" buildPodsRegistryCredentials: - # registry server address like https://quay.io (no org name required) or https://us-central1-docker.pkg.dev - server: "https://quay.io" - # robot account namer or "_json_key" if using grc.io - username: opensci-small-binder+image_builder + server: *url + username: *username