From 40ec09ada0a6f517861a92d53c8d9e01b3c70342 Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Wed, 3 Jul 2024 17:38:44 +0100 Subject: [PATCH 1/4] Apply image rebuild fix to opensci/small-binder --- .../enc-small-binder.secret.values.yaml | 22 +++++++++++-------- .../clusters/opensci/small-binder.values.yaml | 3 +++ 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/config/clusters/opensci/enc-small-binder.secret.values.yaml b/config/clusters/opensci/enc-small-binder.secret.values.yaml index 918eb43a7a..81a23ce4c2 100644 --- a/config/clusters/opensci/enc-small-binder.secret.values.yaml +++ b/config/clusters/opensci/enc-small-binder.secret.values.yaml @@ -1,23 +1,27 @@ jupyterhub: imagePullSecret: - create: ENC[AES256_GCM,data:umXJJA==,iv:bKbgBPjU7XkFU1vmSIaORivEoXUu25+hR7sINfCYbpc=,tag:lNQTTIgJzL8JWIeXL4K42w==,type:bool] - registry: ENC[AES256_GCM,data:J4W7ybM2Ig==,iv:d+cajLiXgE1KJMnlGjlacElCbspcMbymuRUiegtcJSE=,tag:tl2zWPBT4pYeK9zORPXRRg==,type:str] - username: ENC[AES256_GCM,data:jhqUIvx9G3WQWHfFmQnvWrlaYh0ICt0pMyGRFwWMlCetEg==,iv:WZP7FMuU4z63emFSSbPNOI1Lf9xOC3uEgvl6QTZOKaw=,tag:bJiX78vC7hU4DNQfODNTJA==,type:str] - password: ENC[AES256_GCM,data:028VxV0DEXJp9QtLL/hc1WX09Hb9rT8knZJ1fdd5WhgibHSGjVmorTRSyaZ0g0YCpWAoREzqFpVLHwyztVk3hA==,iv:xWjYCTCLnyVBTDcQrL+oG9bNFw3dTcAyx46PH/YfwB8=,tag:dgf1XdhbMr4D1HZGtiLd4Q==,type:str] + 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] binderhub-service: + config: + BinderHub: + DockerRegistry: + password: ENC[AES256_GCM,data:1NE+KRfA03apgkN4HiL6DlJIl5mViAi6HfuDJfkDNSE3AeNyyCztLyU0SzsuF9CeIaGqMKLY9ApRrqKKhZdOXA==,iv:ygy+6d9C74QrsD8vpKQlhoZoLvSdWTvjBljsLvTOMeI=,tag:ypKJApuNoFMesmRZntKZpw==,type:str] buildPodsRegistryCredentials: - password: ENC[AES256_GCM,data:eoo3JCD9e2mtNfLMbjbYemzELkfUoKdypwkttAORX3tP59NU24nBPoU58FUi9ZtpECWtxlle+i3IRxEPC1mvuw==,iv:IhgkvD6heIM+m3aLr1j/Pk36TekzoxRXrFLVyroOC48=,tag:3WTQEGj7x1falCgonRc2sA==,type:str] + password: ENC[AES256_GCM,data:9Y5ZbCxsh7R5Nhung8rM5mbwKr6wc6zP0hetSBm0On9LJu1Bm8DzqKDKvdjKMYVsfSRiXvX1azw14p6tcAD6TA==,iv:pyBnD3/+G/YYROV5L63JZZXTI79qpGfjT3SnXU3w/YA=,tag:zo7K8us3dQ1y4e3HuBci3w==,type:str] sops: kms: [] gcp_kms: - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs - created_at: "2024-06-27T09:59:48Z" - enc: CiUA4OM7eHwdKWbfAh7zIFo1z2XbrC1eViOj1rXDynQwnRwhxKrZEkkAWX/fcfzIHo/fSjQsH3cxciDXndH8s4W9Fd6KKCrROg9ArUmMHO7Z7pWynMu2m78STC6CekEXm2BZ/8UXCjRZoIy1RMJzzhKV + created_at: "2024-07-03T16:36:10Z" + enc: CiUA4OM7eM0KjNX3txwc7IFFIrAHnUEHeOKHkkhxP9GZl0NkgbaxEkkAWX/fcZVaxi4DVg7RLT89B9lLkKQmxN8wW/HC37U5zE4PKgXHsHzQ1TRYbSLqoqXO38pwfcMSSANRFCTYxUr4QOMfDkBtENVd azure_kv: [] hc_vault: [] age: [] - lastmodified: "2024-06-27T09:59:48Z" - mac: ENC[AES256_GCM,data:8j7sIBNXJ0vULu3sW7Gcpo5IeNfqDs9ZFEfa95lXNyEeo1AIk3AjUYJ3QXOpLheROutXUOJ8ZWkfCOn9uod8iN+0pYpSBFoKIGzOr3y721k8l7RHneeJPGD5Hd4Ce5ihu3FiiCdsEY9D4vHpyxHOhKMto7zwC4UyYgMgqHH3nP4=,iv:EH6OFOtob7iamn9BNIAKI7Iz2ZA0F6oIz6e2K3x6C8I=,tag:5dSvWHjNsTX/IwCojx+p6w==,type:str] + 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] 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 7cc82f68ab..b914b117c0 100644 --- a/config/clusters/opensci/small-binder.values.yaml +++ b/config/clusters/opensci/small-binder.values.yaml @@ -95,6 +95,9 @@ binderhub-service: banner_message: "Please email support@2i2c.org to request repositories to be added to the allow list" # 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 GitHubRepoProvider: allowed_specs: - "^2i2c-org/.*$" From 945abd9bbdd31b7255bb7c76465d124b565879c4 Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Wed, 3 Jul 2024 17:46:19 +0100 Subject: [PATCH 2/4] Apply image rebuild fix to opensci/big-binder --- .../clusters/opensci/big-binder.values.yaml | 7 +++-- .../opensci/enc-big-binder.secret.values.yaml | 26 +++++++++++-------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/config/clusters/opensci/big-binder.values.yaml b/config/clusters/opensci/big-binder.values.yaml index 54fc764b3a..5f12e08d9e 100644 --- a/config/clusters/opensci/big-binder.values.yaml +++ b/config/clusters/opensci/big-binder.values.yaml @@ -96,6 +96,9 @@ binderhub-service: enable_api_only_mode: false banner_message: "" about_message: "" + DockerRegistry: + url: &url https://quay.io + username: &username opensci-big-binder+image_builder extraEnv: - name: JUPYTERHUB_API_TOKEN valueFrom: @@ -113,5 +116,5 @@ binderhub-service: - name: JUPYTERHUB_OAUTH_CALLBACK_URL value: "https://big.binder.opensci.2i2c.cloud/oauth_callback" buildPodsRegistryCredentials: - server: "https://quay.io" - username: opensci-big-binder+image_builder + server: *url + username: *username diff --git a/config/clusters/opensci/enc-big-binder.secret.values.yaml b/config/clusters/opensci/enc-big-binder.secret.values.yaml index 1c92f44d16..a5f1c97826 100644 --- a/config/clusters/opensci/enc-big-binder.secret.values.yaml +++ b/config/clusters/opensci/enc-big-binder.secret.values.yaml @@ -1,28 +1,32 @@ binderhub-service: buildPodsRegistryCredentials: - password: ENC[AES256_GCM,data:LjAmYI3e8BuXi4K68q613ne5pR61RVRgUSdgCAUaMyiMNP/38z8KMDOyLRpNtllLwwY1VWLND9MqRiRYXFHvMQ==,iv:bqoHRXMENCIDHpdiiuybM4oUpXqAIt4EOcrnUEWBmPQ=,tag:MZqUfRf1m1NZx0Nifo8kng==,type:str] + password: ENC[AES256_GCM,data:jlyeDAdAdaiaFn4fpA/xo2xIe+XDrvK56L5Lbv4jS1M4HuSVtY8Rj+sb04GFMGkECXhLQuW9xTX56K71ExyscA==,iv:pBwWNRhhVMpRTBIm+5xbQduAxfA4OU3rnqBa3UMtGAw=,tag:IpgKcgJn1ziq1bFDXmt8WA==,type:str] + config: + BinderHub: + DockerRegistry: + password: ENC[AES256_GCM,data:xS5DWaaFpnNNsf3ukTcay2iZRKxl6hFmarTaF/dp1UeG+3xGuo3iJ5VsFK2GXO7Drp1GW3QYvnU1A7LrvenWCA==,iv:9IhrvPKMaK/KejN2Hl/gr5GknAIsaBW3hwyPAECj7JA=,tag:gL9NK97L+rMTuZ6U0xbhmQ==,type:str] jupyterhub: hub: config: GitHubOAuthenticator: - client_id: ENC[AES256_GCM,data:OGFXl4BPWB3wxyIRXhxLNJY9GLE=,iv:7aJvKzFLX4QVgOgNqhSojhlJsirvSR9tBvAdq654+wk=,tag:6qkxSYfDkAR8/m4SN5NrHQ==,type:str] - client_secret: ENC[AES256_GCM,data:EBZzMDZ2E6xayQQkQH1KEZ/sF6+JBmqWrGpHs3V4I66L2zbJIG9XxA==,iv:nXJlVoY68JNB1ui773VoUTR8YvGygRN7jbzmG5k71E8=,tag:OFDNIDmUSHIaJXj5R5MdAw==,type:str] + client_id: ENC[AES256_GCM,data:Rz32q49n6BBRefUfG61lvgQZZJM=,iv:Nd3LzMULcWJr4wcOhJwYsYfbtSz8GqzuujkkeNZHosc=,tag:baTyhtW0gnOeLNl7fpYD8w==,type:str] + client_secret: ENC[AES256_GCM,data:J4BdrfIO16SwQ0W61UyOe9LhGjEwtgOUt23+Hj6JMunwNkbfBR9P+A==,iv:ZR+Zy5wGwUqOuXHzZ0RtQ0hsJaTlk6uH3x6XhS+0ufc=,tag:fVnaQGkI7ePkKuBZ2ekRnA==,type:str] imagePullSecret: - create: ENC[AES256_GCM,data:dobSiQ==,iv:3uGTeWyoV2yo2U+u7Qc+l8+dLxwAd2m5w2J4u1bSSFc=,tag:Ob+ygkxTDYaw2NMhPBCSGg==,type:bool] - registry: ENC[AES256_GCM,data:AlZLr2oClQ==,iv:CtSf5UUtY3zcMffTNZAbQ+Ek+hVSj1PySXrh5vAaYgA=,tag:RHXVqg2MikfidEHaU3TAlg==,type:str] - username: ENC[AES256_GCM,data:coGDOM1G1wirMCGXoVEFvA9e3ePwCIfnE8TJmPKTElY=,iv:rtUdjUaTVbDbbHcLzS/Msav5T19i4b6QmdEV+4f/P5g=,tag:02/yRzbHZrfYrmyBkMywMQ==,type:str] - password: ENC[AES256_GCM,data:BLe5W/bWTqRxwWdza9ZoRLFXqrTKB+uxBHZaSv2dF+vIjFBmdxUVmBhCsDLJPxQCEufO6eXyLtTirSxhd703vQ==,iv:mgl062MUzQXTxIRZnTYNdncVo4oeURqeRV/YhSz1UZk=,tag:KDhtJqlaG+DRvh8bk4MGiw==,type:str] + create: ENC[AES256_GCM,data:UOTr7Q==,iv:jv+a/ewhqiECn+D/Cd8fltLPo4rkViGJ3yljmyyMfwk=,tag:jmdNOvQGDFkP/606OKJurA==,type:bool] + registry: ENC[AES256_GCM,data:XigXEkpovA==,iv:QLZUpG0dA+Pxn9ke3i1blt8fEeLgBVZRVoyiJ0DRt6w=,tag:PDe8oLQhj2pApKiKX/qy2g==,type:str] + username: ENC[AES256_GCM,data:ymKSczM8shG8aLIo2DOkJriIUQMJeZRgER+b2JsXF/U=,iv:etNVzAeYbvT/MG2D7Xymzxpc67FDOiqa/e5iZCECu+c=,tag:c+HwHIX4ounbLuFai4XGrg==,type:str] + password: ENC[AES256_GCM,data:ZsKbpJr+axriVq55fa+HJfMPiMEDlzItWQv9hZEe+joT2bEVjzR/vq7u6pYFW3VfzS8uVD3uybW7U9jK2eTbvQ==,iv:wqGouoGX2dtCX4nitbdNzMdc2u8QmVBn4/sQj5EHTt8=,tag:EdrS8h1/mrmUGhLHfSgwRw==,type:str] sops: kms: [] gcp_kms: - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs - created_at: "2024-06-27T14:19:04Z" - enc: CiUA4OM7eBoidZ3F3zbV0vnQg1mYdW4as7N8dZLotnrdmJXMBZ3FEkkAWX/fcXaiubwYqoRquIFm/vnxzZL7ROQTAsNK1jxvEwSF7us3uBlfTntLtFEL9oMgpne3ekofjrCrcxFOMPKZYaV4jCXkvZBO + created_at: "2024-07-03T16:42:56Z" + enc: CiUA4OM7eHkBz+1goUmsQRZhr3+SJKcdJUWw2Vy1hdf9tI8G3npGEkkAWX/fcbmTXXtsIEWqqD/CG1Qx0NQHcWBrQRE2uta2pxCdScfkM+C+dQCUiBylQMKRhhpimRBXWRnPvEkr37qfiD877M1uqB8Y azure_kv: [] hc_vault: [] age: [] - lastmodified: "2024-06-27T14:19:05Z" - mac: ENC[AES256_GCM,data:JALMuth+497Io0zHzikv/309XwkOv5YKQ+ZoEA/jMjdGv0iwXCt20PA5Q+AOu4Fxz/BJG+OS1ICxjW9sKQdCV3qElrBWjbcR4tnAV/dzEuHv8Yv0KrLEQfmjDn9K8wIP/Y2dX4N054lugafAMeKKjnbVUclpZ2h2EYg6a+jKWu8=,iv:7GBqSaLI38TCqQbn9ewC4S7/wDB4zJHsyh2QBto3sxQ=,tag:/S5w7Tew51z1PHr4ojyUig==,type:str] + lastmodified: "2024-07-03T16:42:56Z" + mac: ENC[AES256_GCM,data:LQfy/V9yU/LVJi3uYQ6jUI97sUPFoHXcAAgUE3+imD5tHFlJN1MV8aEVoZ2jbncQD1SgwecrVUiGlkDWxUGb1lbnTxX5YdIdsZh7w664O1smVdcx0wOJAzDl4klf0/YJ92vzPcK+zm/dSvoySIQY+8qMJEu+iF4UYAGML4LELtE=,iv:1NonFH+PWaZiaHL7xAJ9HoYZTijKnTnBrGIZf3Sy/jk=,tag:xUkfbZ7PrVw2qlbBdjWh/Q==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 From 143a7cc789ded5c884544a50b31d7e9bc33d583c Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Wed, 3 Jul 2024 17:48:15 +0100 Subject: [PATCH 3/4] 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 From 3d205e63d794ce50bfda4611f96e334ecca968dc Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Wed, 3 Jul 2024 17:53:13 +0100 Subject: [PATCH 4/4] Apply image rebuild fix to hhmi/binder --- config/clusters/hhmi/binder.values.yaml | 7 ++++-- .../hhmi/enc-binder.secret.values.yaml | 22 +++++++++++-------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/config/clusters/hhmi/binder.values.yaml b/config/clusters/hhmi/binder.values.yaml index 7e6f3049f6..1d37c4035b 100644 --- a/config/clusters/hhmi/binder.values.yaml +++ b/config/clusters/hhmi/binder.values.yaml @@ -99,6 +99,9 @@ binderhub-service: enable_api_only_mode: false banner_message: "" about_message: "" + DockerRegistry: + url: &url https://quay.io + username: &username hhmi-binder+image_builder GitHubRepoProvider: allowed_specs: - "^binder-examples/.*" @@ -119,5 +122,5 @@ binderhub-service: - name: JUPYTERHUB_BASE_URL value: "https://hub.binder.hhmi.2i2c.cloud/" buildPodsRegistryCredentials: - server: https://quay.io - username: hhmi-binder+image_builder + server: *url + username: *username diff --git a/config/clusters/hhmi/enc-binder.secret.values.yaml b/config/clusters/hhmi/enc-binder.secret.values.yaml index 1520516bf5..27ae47105c 100644 --- a/config/clusters/hhmi/enc-binder.secret.values.yaml +++ b/config/clusters/hhmi/enc-binder.secret.values.yaml @@ -1,23 +1,27 @@ jupyterhub: imagePullSecret: - create: ENC[AES256_GCM,data:veoe/w==,iv:yxmfxT/+9JQE05lj1qQrPWK7IQhE17wRPS2e4PoQN2I=,tag:Jaui9rzVaJuja8iF25/obg==,type:bool] - registry: ENC[AES256_GCM,data:5MAFxN7cSg==,iv:UF3ML4yGjVJGc5jmS2R2yMakGYBch+d/5LwE0VULbVs=,tag:B6yC5s+ysX80HmvjDxnohw==,type:str] - username: ENC[AES256_GCM,data:qfEVEMnG5dKUU4RQIxT+JJVuov+wWYv9yw==,iv:SVWg6XGRNNAdW1l5Tox6O6hv2jcfZujETk9iw2j0dP0=,tag:SCEUOPEG0U9Xevaf9iPkJw==,type:str] - password: ENC[AES256_GCM,data:5TGw4Fr1AuiajWQSQ+3eIESbF/igZxQg2YnYyvCmHZUfzk3X3QHjon6B6UJV+1eJ6NkKF0+ULfYX3kV3zMG9ig==,iv:VCrCdK+7WAVIYwNDLaPqJUGWRS6x2ICQKX82Yp93vbE=,tag:PqAPt1wR+x9TCEj9pxtqMA==,type:str] + create: ENC[AES256_GCM,data:jsIYcA==,iv:pBZuJgS/bHmYylK+ngXZ3OoiglFujutZts07wv5zKJw=,tag:x2OZSwdZlQiI4wnjooRwzg==,type:bool] + registry: ENC[AES256_GCM,data:1XGI98occA==,iv:eA0r94W4s0xML5WuUGxBXy2vV4KZ1EtrU3vgoa2Mi+Q=,tag:5FRGmBGlLe69ri73zBMuOg==,type:str] + username: ENC[AES256_GCM,data:tssaeFr8vATSi4UJnRaXGhCNeu2j7NVr1g==,iv:eE9tNL7F+BH3tYz2BVqZES4d16Yg7oIxuwaSkAmvdoM=,tag:HjtLJXvJLDSisWp0cSgReA==,type:str] + password: ENC[AES256_GCM,data:iqObm8uvHJili3XLfiWhB02fbI2NjpOCKnncKQnuKxSonEiRg0vp1fqSrdht1HY58lxbPkKMmkob54tLdOGDfg==,iv:9sjLTbWZ5DQkXvpqsxTKywyD9PSTsHYSIcI2Z20rHik=,tag:y/Mh1gidFwh7EQEQm+nPgQ==,type:str] binderhub-service: buildPodsRegistryCredentials: - password: ENC[AES256_GCM,data:vMpNPcnXuVj0OWe7tE8+jUey3xFOna+Qn3VcWNBFO6LdU57yl5N9bFOR82FEdbLjGQMlu/aHhoF3F2x5OjxobQ==,iv:/ShrZ0PdyCJMbjCVlXRW3W8pWBlQGR9KTJRw2wR3rmI=,tag:xSMrEWHqdVgzJfGK9xnvMg==,type:str] + password: ENC[AES256_GCM,data:DKWXNUzMn+PoJHLozWpB69PdL/u8SKv4foY/VaUORbsf0rW4sT/Gy/2YYRblXeIKUVtfWRZKwZlLbkFi9hBmCg==,iv:P2PL0d4bHosNm4mL4W9j1Nu0BxWpW5wdtpHRLidskH0=,tag:puAcIi+94w5sjQOQA8WzJw==,type:str] + config: + BinderHub: + DockerRegistry: + password: ENC[AES256_GCM,data:MDzC0i/BMW0nFBKenLLYpusb3ZtbI5mmzSeltyyK/oamDELibBo6GShNpT6wQ8fftEcogcXkNr4Euo2KDMZdHA==,iv:6/yPU6zwPixPUGs6z5wWHPvQt0FYVr7GJyrJ8maiJUY=,tag:Bf/xSqrkDhGBujAQxAlpXQ==,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-02T09:38:23Z" - enc: CiUA4OM7eBaPTVhNKBJdH7e9GnLGUvNw3C7W9TgmCpgqYqRk/9mcEkkAWX/fcSEUhej1mrRSje5G7oLWFATeIepFXHUN9Do1/ukucmF59qNHTmoBgImzEUxmkhnRI8zVov5ClSstNoOqUPksYS2ShdKZ + created_at: "2024-07-03T16:49:36Z" + enc: CiUA4OM7eCKQeXRTjvuYf/27jnWpjZ3RpZW1gI1NJA8vSpmd0DGhEkkAWX/fcd17GuTk6ZEF8Wf0NBPvJJ2hRIVX/ArmhsABMKm0leIkTBc/Pc1JF+pxRY//BOnSiiDXFthg5Y4B3lgDRXbh2Htv7ofw azure_kv: [] hc_vault: [] age: [] - lastmodified: "2024-07-02T09:38:23Z" - mac: ENC[AES256_GCM,data:RvkoEcrj5tv0a0z2hYFkjycjQRFx4OBkpq/j2RTU6/g+pg59g/iF5jgK8JBm5sj+/x6zKxT4qbdIk9vIPeZ/jxdjeozjrb6NqAicrl1uzNbr7Zc3ahTKxvlBAdyCy90gj/4h7KdMkn0mr0n58RHsZis1aGPuAexk99QXehdB7PE=,iv:giQOj1KFfGKNGer6wVE9TJqBguIS6xTJwIpPHXSUluU=,tag:LA9VudE/HKMOBBc0IHLdJA==,type:str] + lastmodified: "2024-07-03T16:49:36Z" + mac: ENC[AES256_GCM,data:Y6ld5UeMd2nicBFcNSKVK6ub36BUKe7dMgO7h3JKbMruA/YYNefVvJ05OIlZTm83FE1AE01t1t4lNnLBE+F1TV2C4ovKHJZSbvQTyCiM61t2ZElfphhJ3QJIj0gl/dWa8DoErlNhVtCQyyL4mIPjsuBZmUZih4UdGyPXpuUzlrc=,iv:oaPzwVfYrw18eDlieLZqfTVawbCsakbPqKuIURIyrV0=,tag:WaSXvw/dKwqm2GSHpz0+kA==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1