From 52a2901d3da1d7ca4cc582ca5410b4f4c233d0f1 Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Thu, 22 Jun 2023 16:34:55 +0300 Subject: [PATCH 01/17] Make binderhub-service optional dep of basehub chart --- helm-charts/basehub/Chart.yaml | 4 ++++ helm-charts/basehub/values.yaml | 3 +++ 2 files changed, 7 insertions(+) diff --git a/helm-charts/basehub/Chart.yaml b/helm-charts/basehub/Chart.yaml index fd4ee58066..f01d8aaf26 100644 --- a/helm-charts/basehub/Chart.yaml +++ b/helm-charts/basehub/Chart.yaml @@ -13,3 +13,7 @@ dependencies: # be found in the Dockerfile's comments. version: 3.0.0-beta.1.git.6208.h7b44299a repository: https://jupyterhub.github.io/helm-chart/ + - name: binderhub-service + version: 0.1.0-0.dev.git.46.hb38d259.tgz + repository: https://2i2c.org/binderhub-service/ + condition: binderhubService.enabled diff --git a/helm-charts/basehub/values.yaml b/helm-charts/basehub/values.yaml index 4766f7b556..654dedeee4 100644 --- a/helm-charts/basehub/values.yaml +++ b/helm-charts/basehub/values.yaml @@ -16,6 +16,9 @@ ingressBasicAuth: dex: enabled: false +binderhubService: + enabled: false + staticWebsite: enabled: false source: From 7ec0ae02e947e3d0fc778293a6dfc4074ed0bd0c Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Thu, 22 Jun 2023 17:16:13 +0300 Subject: [PATCH 02/17] Just the tag is needed --- helm-charts/basehub/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-charts/basehub/Chart.yaml b/helm-charts/basehub/Chart.yaml index f01d8aaf26..b35f63bf10 100644 --- a/helm-charts/basehub/Chart.yaml +++ b/helm-charts/basehub/Chart.yaml @@ -14,6 +14,6 @@ dependencies: version: 3.0.0-beta.1.git.6208.h7b44299a repository: https://jupyterhub.github.io/helm-chart/ - name: binderhub-service - version: 0.1.0-0.dev.git.46.hb38d259.tgz + version: 0.1.0-0.dev.git.46.hb38d259 repository: https://2i2c.org/binderhub-service/ condition: binderhubService.enabled From af252dbe68ae4fd13db5a04254d559dce8433131 Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Thu, 22 Jun 2023 17:17:19 +0300 Subject: [PATCH 03/17] Add binderhub-service to the schema --- config/clusters/2i2c/staging.values.yaml | 7 +++++++ helm-charts/basehub/values.schema.yaml | 14 ++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/config/clusters/2i2c/staging.values.yaml b/config/clusters/2i2c/staging.values.yaml index 633e51985b..2005b0fa39 100644 --- a/config/clusters/2i2c/staging.values.yaml +++ b/config/clusters/2i2c/staging.values.yaml @@ -14,6 +14,13 @@ staticWebsite: githubAuth: enabled: false +binderhubService: + enabled: true + +binderhub-service: + service: + port: 8090 + jupyterhub: ingress: hosts: diff --git a/helm-charts/basehub/values.schema.yaml b/helm-charts/basehub/values.schema.yaml index 69b080225c..b7fecf000d 100644 --- a/helm-charts/basehub/values.schema.yaml +++ b/helm-charts/basehub/values.schema.yaml @@ -19,6 +19,7 @@ required: - dex - staticWebsite - ingressBasicAuth + - binderhubService properties: ingressBasicAuth: type: object @@ -130,6 +131,16 @@ properties: Publicly accessible domain name of the hub. Used to construct URLs. + binderhubService: + type: object + additionalProperties: false + required: + - enabled + properties: + enabled: + type: boolean + description: | + Enable binderhub-service userServiceAccount: type: object additionalProperties: false @@ -207,6 +218,9 @@ properties: global: type: object additionalProperties: true + binderhub-service: + type: object + additionalProperties: true # jupyterhub is a dependent helm chart and we rely _mostly_ on its schema # validation for values passed to it and are not imposing restrictions on # most of them in this helm chart. From 62e693a20e6c58a9249dbfbd5884f99030635bd6 Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Thu, 22 Jun 2023 17:19:35 +0300 Subject: [PATCH 04/17] Rename condition --- config/clusters/2i2c/staging.values.yaml | 2 +- helm-charts/basehub/Chart.yaml | 2 +- helm-charts/basehub/values.schema.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/clusters/2i2c/staging.values.yaml b/config/clusters/2i2c/staging.values.yaml index 2005b0fa39..1f650bed01 100644 --- a/config/clusters/2i2c/staging.values.yaml +++ b/config/clusters/2i2c/staging.values.yaml @@ -14,7 +14,7 @@ staticWebsite: githubAuth: enabled: false -binderhubService: +deployBinderhubService: enabled: true binderhub-service: diff --git a/helm-charts/basehub/Chart.yaml b/helm-charts/basehub/Chart.yaml index b35f63bf10..fa2a88ccd1 100644 --- a/helm-charts/basehub/Chart.yaml +++ b/helm-charts/basehub/Chart.yaml @@ -16,4 +16,4 @@ dependencies: - name: binderhub-service version: 0.1.0-0.dev.git.46.hb38d259 repository: https://2i2c.org/binderhub-service/ - condition: binderhubService.enabled + condition: deployBinderhubService.enabled diff --git a/helm-charts/basehub/values.schema.yaml b/helm-charts/basehub/values.schema.yaml index b7fecf000d..516837d153 100644 --- a/helm-charts/basehub/values.schema.yaml +++ b/helm-charts/basehub/values.schema.yaml @@ -19,7 +19,7 @@ required: - dex - staticWebsite - ingressBasicAuth - - binderhubService + - deployBinderhubService properties: ingressBasicAuth: type: object @@ -131,7 +131,7 @@ properties: Publicly accessible domain name of the hub. Used to construct URLs. - binderhubService: + deployBinderhubService: type: object additionalProperties: false required: From b91ffda95233d33c1defde3638e4ecb44530628b Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Thu, 22 Jun 2023 17:22:36 +0300 Subject: [PATCH 05/17] Rename in one more place --- helm-charts/basehub/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-charts/basehub/values.yaml b/helm-charts/basehub/values.yaml index 654dedeee4..4e257f464e 100644 --- a/helm-charts/basehub/values.yaml +++ b/helm-charts/basehub/values.yaml @@ -16,7 +16,7 @@ ingressBasicAuth: dex: enabled: false -binderhubService: +deployBinderhubService: enabled: false staticWebsite: From ef9b05e2981972cc0a841864bb6c7d18b71bff12 Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Fri, 7 Jul 2023 13:08:39 +0300 Subject: [PATCH 06/17] Use chart's latest version --- config/clusters/2i2c/staging.values.yaml | 1 + helm-charts/basehub/Chart.yaml | 4 ++-- helm-charts/basehub/values.yaml | 3 --- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/config/clusters/2i2c/staging.values.yaml b/config/clusters/2i2c/staging.values.yaml index 1f650bed01..a7665c06d9 100644 --- a/config/clusters/2i2c/staging.values.yaml +++ b/config/clusters/2i2c/staging.values.yaml @@ -18,6 +18,7 @@ deployBinderhubService: enabled: true binderhub-service: + enabled: true service: port: 8090 diff --git a/helm-charts/basehub/Chart.yaml b/helm-charts/basehub/Chart.yaml index fa2a88ccd1..3b0b0a2e63 100644 --- a/helm-charts/basehub/Chart.yaml +++ b/helm-charts/basehub/Chart.yaml @@ -14,6 +14,6 @@ dependencies: version: 3.0.0-beta.1.git.6208.h7b44299a repository: https://jupyterhub.github.io/helm-chart/ - name: binderhub-service - version: 0.1.0-0.dev.git.46.hb38d259 + version: 0.1.0-0.dev.git.65.hec68830 repository: https://2i2c.org/binderhub-service/ - condition: deployBinderhubService.enabled + condition: binderhub-service.enabled diff --git a/helm-charts/basehub/values.yaml b/helm-charts/basehub/values.yaml index 4e257f464e..4766f7b556 100644 --- a/helm-charts/basehub/values.yaml +++ b/helm-charts/basehub/values.yaml @@ -16,9 +16,6 @@ ingressBasicAuth: dex: enabled: false -deployBinderhubService: - enabled: false - staticWebsite: enabled: false source: From a72098797099caa504c079419a14edc81b2e1f65 Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Fri, 7 Jul 2023 13:11:37 +0300 Subject: [PATCH 07/17] Remove redundant flag from schema --- helm-charts/basehub/values.schema.yaml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/helm-charts/basehub/values.schema.yaml b/helm-charts/basehub/values.schema.yaml index 516837d153..5386985485 100644 --- a/helm-charts/basehub/values.schema.yaml +++ b/helm-charts/basehub/values.schema.yaml @@ -19,7 +19,6 @@ required: - dex - staticWebsite - ingressBasicAuth - - deployBinderhubService properties: ingressBasicAuth: type: object @@ -131,16 +130,6 @@ properties: Publicly accessible domain name of the hub. Used to construct URLs. - deployBinderhubService: - type: object - additionalProperties: false - required: - - enabled - properties: - enabled: - type: boolean - description: | - Enable binderhub-service userServiceAccount: type: object additionalProperties: false From e309940a0681493d9cc789287a9c485656b733f5 Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Fri, 7 Jul 2023 13:30:27 +0300 Subject: [PATCH 08/17] Remove old commit from one more place --- config/clusters/2i2c/staging.values.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/config/clusters/2i2c/staging.values.yaml b/config/clusters/2i2c/staging.values.yaml index a7665c06d9..ac5c3ed5bb 100644 --- a/config/clusters/2i2c/staging.values.yaml +++ b/config/clusters/2i2c/staging.values.yaml @@ -14,9 +14,6 @@ staticWebsite: githubAuth: enabled: false -deployBinderhubService: - enabled: true - binderhub-service: enabled: true service: From 778c15e3516c8b052ea9500ffd63921d950fa4fe Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Mon, 10 Jul 2023 13:18:55 +0300 Subject: [PATCH 09/17] Update bindehrub-service chart and try to configure registry --- config/clusters/2i2c/enc-staging.secret.values.yaml | 8 ++++++-- config/clusters/2i2c/staging.values.yaml | 11 +++++++++++ helm-charts/basehub/Chart.yaml | 2 +- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/config/clusters/2i2c/enc-staging.secret.values.yaml b/config/clusters/2i2c/enc-staging.secret.values.yaml index 2655a2f614..3200a8054a 100644 --- a/config/clusters/2i2c/enc-staging.secret.values.yaml +++ b/config/clusters/2i2c/enc-staging.secret.values.yaml @@ -9,6 +9,10 @@ staticWebsite: githubApp: id: ENC[AES256_GCM,data:WpL4Y/Q5,iv:q/Y+T8UAwjIRpVHfjglBYS12Nx0oh8K/r3vm8PdYGL8=,tag:z3AnnYKwc/tbvmfv+dDPnw==,type:int] privateKey: ENC[AES256_GCM,data:3/t4E45bKdGVFYMyvJcIsi28sGEyizvsH+GXxmxlUJr8/2yvVpYcl5t/Cy1Ymht6idPsAGKdVhUWvXrrlAo2kohMo1t2jWUvuHILoNiyw1WmXNP2XKwdX/eMeyAZoBqTZOQ/sBGVE1a/oXZonNiovFs0ASI0th4zSuRqZuiYtshq/RZOnPhBEo76b0yjPORD6WrksmlJeOTYaGkc6sihf8jYmRBxpq4Ne5Ew6HJUZRMo0MBg6vCvQtAjVfo/S7waZVkdI19G1cVMtoYDV2WUz5LkUwk0TTr4PFCq5VfXuNo1/PW7Y08TAOxb6EBDQAEU/lrk7vOqnJrkDCOlv91N2nVLcBkwD6yq2vgG5LCDVK/4ugyicsQau4ZGpYiAP68ZJ+CynvjfNHsoh+W4os5wU5ZsuVuTGGlb+lgo2E9uLQiLCNBJX+NIhLXh08fiCSajFC/rZJJcr0ZrTMB2/sJA/V74oHC68ZlrMqoo/7GjVWNSWSqaEDIXWCulR+LcvExXe5xQ2Lm5YHpl6fRNi1iNygD7NhjfUs7G09xIC14wIl6GJNAnpSG0p+rstPXKQycHX1uF9SU5YvcLf7Lcsbpq/ZTVc8EBeh+g8k5sWmXJEnPHD56CPAsJ9GFb6b3O32ctoAH+F8QAdzYLDASyn5NBrjCQOwjs652X24zB/f9yl5muutXJJoHQ0LQd7rnWE81CpryMEK3XDcMhDW86rJDTrOaRDAYqjKPxKqDrtFRCwMAezVSrg2aiwzBjaBGSPRE7JL+EQFCn3UUDSf60jNtuX0EZMOLJxWxXnTx2bW0pfL53Iwc70Alc3S/yy3EF+LgR0MqHh+AKu5HgnR4W+epWWiI06OcAfvPVWZz0/9w7VWc/rYKXdlzRekez4yx1+YscdxbgCSTpEfe75kJHZMiNZA/mofe/jx8sUH/ZAq9hndEeYIHuHIzZbCWEDZ91Rbg5NP0xyiDFOsZ3LNexw+XsEX+VUBBzKX417LR4vRPMGMj23yAA0I8hWGhm2dLkZ5obHJ2u0HBTuCiIXlThe4/vOHaomJfjooae/aT2zSiWVKwdRyzmDn3cc3VFPreAk/Fs0TMa/JF70rja8g5KlhsTlAns0d3cKJARmvtb1F1AO5yINKBwjPCsB0tuzItIORuaj2MvyHjXEjiPs/ZcM0cRf4tXwsQYv5CS4xt/cKGrOMoTspkUP5esqbdQd4q0K4fSZQdAbTZwFPkQww0bNx1qjGJuBoBTOP1LNc1ZX9XXNLlb/Cfko8GyLX117verli4lnDxShTXEeU7Z+byB4pkxv+fHP5xGqs2tkwoh8nKbRtV34I8NDyh2GWxJzWZhKjNoIIVNbrj7DvsWUVilWht2DYF5nVRGpXa8yj6a9Arjz7Rxa0Wlw2fPnk4r5NwWU1Yv5y39dj4dT4h1nQC4hcW0ueRCgrxUGF2DrAb/y1MtzbLalvUg8XluJTozFmP5j0oupZFHm43I0JetlIFuipI+LhMqSGxEi+pYTssG0yJSAB0w8z9Y9Q6HIE2hPfFzFdTh1dujyzZq3k28007MSRxNRMTYCWmfbilwwSUmVG4SQ49AjW87hLNGDqYLdu+AkTJKnB90h2sNi6vruNiPL+ahZ2XAeOpQyu587HWD33sBfWS/9uKOeUWXKusYA54uprpVU3f7tXkmm+8UlPQ2UWKez5ytuhO2hlkHQMOinVxLC/SnoHnTiDgR9YjDpTOTzcAvoh7l+sO2Dr5xrXvV2gWUDgt2u/Gd6uqwDCaZvwOz15VtlFYzPlSEMo7bIyZ23u54y3qjhr85gcbe9mmkCwNo3/iE6gcjgYNFpfpM3LGucLOlVSJ2z7AV44UHMEcZeKUxgrmRWv9bhRKZy/mKWI0WrH5LmRqk9/ixVsdzZQN+fz2zB6tpEjdqEadz9c2fhNz5X+9J0WhYc/t9me+hwil4nPMipeWE8TQIL4dfSYZcZRcYfqFMKb0GseQEGQnBBcwMr4YzcJHjoyJG99hGhChoDFFl3TLByk5lI9Ygb21aBfB2X8vJdBZh7giKas97STp/PGpC6BWeOX7jh/rUnvLOiwe4nuEntNg6C7naCvGj8WgStIaxLNpoKuqubiB0yAX0xGfbzLbLusEn1ukeQD5sEruoqUTjrnOYQUqPewFmijqFFLHCb3HuacTCfTPVMokxJ9meIs/7j4zhQZq+sll0h0Rfh366+1s+OJByULxaN2Oq9quiaPTe9wQqVQ==,iv:sv02xzuA+rDx+RUmgyfyBZknuID1cDPdWdtdBOBGfm0=,tag:5Vf+gPpKAsWEItTwB2NUiw==,type:str] +binderhub-service: + buildPodsRegistryCredentials: + username: ENC[AES256_GCM,data:FtvSAR6jeDXP,iv:zU3Xe8a/7JkCpOm2mu3zlM7vwBe0Ua9fNr9p2QSCj1s=,tag:ZAmZuYLMR48fngW6jhYk+A==,type:str] + password: ENC[AES256_GCM,data:5t08PPynPlWIjALGnumxfED3OyJ07rrQeCX6bF6VQHBhydF8ZAn6En5oqcQrm9R9QU4B5faUQlEX363N5Y2LB2U1+LEeC6STgCEYeevgRWaiW/qeQt/EA0ExFsiMpzcbBRWLur7pexoZtfjkqUsWsVKLWHk1aUgRB76dx6nCRxegWYbmgxtMR+Kt0ztCoOQpBersMsdw5VxG1F7gxqO0mrLJQdOntNPM3deIFMHQXOvo7LUpHGgfWDNyJjpCe/oOCGjJxs7bhqHyoDXzNQOTRG5T2ge8X5GnkGDjmW3nQHAg1CpCWKp+e0bnGJnKmQj34EaGTGl2sgDut3BAtgnAK8j4sZxj2ISlGWJL8qRSqEY1/zxom8VXttZGa+p7wiPglZeP8HlM1yZK9FUyIBWxxCAUslRAWksmK0Le5su9clg42x7j79SRBaOj/bSegtwYW/guouXHVoW8Jy92Z9O5savmpv1nYb6G3wa1VPZJvYhK7plCd5f+bU3NcJBBswG+229n8U96Ak0vQPtRjb9zqyhveveE+nuqDfsbT6GV0lOoXmBeOYlEw8VHJxdGfcL2U746J1WvYOfwAT9i2DWhXpYrWjoJsEzxDb1KqfGNCZJ1gn05m7NZDLzzNhi6bOwEkn0VAnCl3VHum1pjQmOZhX6XNagS0A2U/mswDXy9BN+3VrFmc4O6YNOByVjg+Tl9OckuEGaiwL3SUhb47hWX3UGdYncwb/mc7a1TeacxzfBmd9KxtjGElxJ7Avi8+OpNxCjDO8qFw8kLuAtOgLkDrPeKMvh37O3pXSBeKvzbFXTrlcSf9a9DmDV9PhAtdSE35gmPvJuSxbi5n+m/74OznmLbEVA749NBI6EgQiUr7OnnqMARScvEC7m8ZKjS3s/et2hfOyKGxthzH7zWDIxM2WoZeNn9xOEHmvF3qyYhVZH2jo5qZsPrXK7/WlJUODKrp5CtoaqYrR4KgSy4kTiqZWzMnKWHhPPLhjePPEsPb81Dlb04hmoEnnZWScuwTGMdbyE+OTa/SCMgQt7a3ze98ItmGsuc90LOxrnqWt6fLY9rYDTTi38P9bVd/cIUyDIlgumwrGySP0AxS8jFIMTJmX/xg31J9Gw1QVuRb0CStNmDsElmhrro4Z6jZb4Egqfi76DFgKQr3uNETnaGbpw06c42OKwfpD2woWbDWkrBarndZ2YiWpRuWSIr/yBXvKEVLv+cIxaiiLg+qEA0hK2lavcsl22NqPLlz9OesuC2d/bLqY04d4NwVxSyc8VI1D8365m8rTUGCjqdo2BjvZ91By1pVLWMS3a+pHiCOCHNpDUuG28IpS3Fm0DqKEosXukX1DydbEorqZpXlGL2avDOJiYbWyYujQ/V0PrTUWKCz4wARF/f9PGTUNOEZTVRGQ3puFxmgHtuy7eYled+Vl3ZPJoOSmJ4pV3qpDhbxGYMgefsuiG3/gdyXX+rvSwUd5Tvmmp2q93bEXAB+bo4v8vapBslY01gP/5TKa9dQDhlywRr/BD74epLGvBmwELEdLICtdnunNaNeBJFyC/noscWtYICWozEvG7nA1HJborl+DhCSID3CxouNZ8UfRf0tlN2Tfvm5g4LvFWfvSv6AFqR+dlhvCl1B9zFDPm+n8M53RbEC+/ilpHlfBPBalJuhEkPqVJjLOlxsUZBkjbOjscuKPUIPoSqKwQ6UpL0vBxrbFiSa03T1R0ZSu5okq75g7EvgKYEftchghBeiI84xe71hf6T2E+4BcgtMBaXIuz1V5X5r4r6mVS9ivllz3s+FnDkt0B3hBTjrMfyCfZMRoR0RoVhrqOClZSKzSHuraUFB5glsyKh8VMNMq7hNCPIJxH1UW1ZOGkvjOhPSxLYMh/7RmeCed37ibNQKugg0nNowFGPafxXarAdKWcwb46eR7pQyhy9LZr68dQy2sYgRJMoISFI37QT7vKTuLHp84gamWL4Lr5OT7gS0oiqV1nbeVjuULHuCO9e0TgQf9v+COIOAVkN5ieGCcAMhQRH4zybfCU5Y1eg4E4Zq6/1Dn5EUfIZmjvHI3fx4Cl3oSxtGPAcpvtuotEcScWU5YVAapOxvUVf5K3VdS4X62WdxhgWz4gF6EaOniWcamYjSNm54QIPWjjHpftGYNzm8atqzRm2wWtZ4hkbDByoBOXf6td6MwXlZWsdI+R72hNTYv/o1wegzcDNtzIXWnaC459dTNPFHAWlCfvy1mv0+6pnaQ4q797IqFz/ioL5syDF7naC7HiIQJ2G/ZoF6Nx550H6rKI2XxU78btl6sqjQZ9iCyW8J/mF1hn/qIVDQC7mQLwrxtgBJXta3m8SuZ16VaZMKkWVplMP6lXEH0XcHLQPs3zxDl6VjYdtO8vItcxr6XSriT7SEiqushDlYZMDbSxL94LYVB5HBGgx8OC0gNu0LZU4aKankDikhpRbu8kpY8RVs1pnqOTNN3bZytfvxa8c4kMwxOx7noZRr6YaZa1mrat9+6/1zTDc1MC4lRehu8xc+aQnrDFULWqGTOllGtu/6HkKIBFWOGLKp0IiZcKkhYoREGw5KmuG1CMcQkvH/etwtv9hW0sk3uOsmCEJL0FpKPUuNMuOyWQ02gQSAgnrwTK8FrCD1w0iPHLNa8+JHtHJYkV3Q5BsOAg5coCvFDK3sB9V6D6gAS3L0h8VO8Suj1J2Pfy4iLFsPgXaO3mi07U72ZWKLGt5W7c+iScGs6+gMu73FQpDz3UQhBnTVeaniDmBUffiuIwdwZ5VYRRYiV3ekUM6xnhpMTwm8oh1rQNOlUTJlMCDp41Wi5tXf97uy8OImYLWssVqRNUKK91S/PduoSxbly6n1zlnDsusJcPYdz0RLNBbilxHDVnBaqOfUhEI/RsYCSOPFpTa+aUjWb1rYYppu7BfFyQG9yD29T33R6S4k1o/ldSBjiakSVZSWNa6Udk1R7x2TbSiFSxBLGQ1twR9961AXhJ6Yb2fjp6XlXDj6rW3Qt2eykaKvcPkOU59BWdWCH8HTWRDuSO1Neia7MkGrLPwM5DWqGgKGCUsNPi8VjtKdHhtscxzGQYj2YFOvnQNLx/x3uvQAN7sWaSvrU8Y53FSoWXTBxr0jxc1UuJ3Cto8povzkOtWfdIIU0PU8sjMey1H4nOC4IPUdJgP7gMl2s3zTsg8rYQFIy20LpKnIvGSgUvkKfMK,iv:9/VDqszgroPCEUoEAQlLOcFlDRFgj0dMCr+wxLo6cn8=,tag:ppqm2DR249g1yM5y80I7dg==,type:str] sops: kms: [] gcp_kms: @@ -18,8 +22,8 @@ sops: azure_kv: [] hc_vault: [] age: [] - lastmodified: "2023-03-09T10:59:06Z" - mac: ENC[AES256_GCM,data:RLYpW3qeNkUfreFfwbW3an7k/weE2p/Fu1DXBGd0/GgEyPsy9jQj34w66fT5DFWJFcIpSEvAty3hzB8S4Y0NEATooahD5T6cvvi3GD/d9b+V1pXjeFNpigQ+SRkwUghfajy2LcAVdXTDeorR0V8zlSj8lLUuu51PSeB0UkC5L00=,iv:7blbojnWaAE46D6JgZiXpLEbXWHeup8o7Sh1pehedOs=,tag:ZFXAd9Rw61Bgybla23g1yg==,type:str] + lastmodified: "2023-07-10T08:55:22Z" + mac: ENC[AES256_GCM,data:/E7Ch8KFKDJHF/+sYsYgOxn3M7HMXXrfP/dw/7rp427CffseOw1hG9UirSvFGu6Fkwzbs++OKHixPN0Kumb9jGh/59HJHYwctpNtEfkyBbNDYtSgiaRqnu/3slXh5BGY3zJVjUiyJ92ORP+vTAFgu9qdv4rp/Iz5EXlYorRpUwk=,iv:EjRvVSycWbLMWCRrsTQneGpvl0skWcazggaDMQHOLws=,tag:R8oeBEeAhusM/s2SARrvOg==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.7.3 diff --git a/config/clusters/2i2c/staging.values.yaml b/config/clusters/2i2c/staging.values.yaml index ac5c3ed5bb..306ab465ee 100644 --- a/config/clusters/2i2c/staging.values.yaml +++ b/config/clusters/2i2c/staging.values.yaml @@ -18,6 +18,17 @@ binderhub-service: enabled: true service: port: 8090 + config: + DockerRegistry: + token_url: https://us-central1-docker.pkg.dev/v2/token?service= + BinderHub: + use_registry: true + image_prefix: us-central1-docker.pkg.dev/two-eye-two-see/binder-staging-registry/binderhub-service- + KubernetesBuildExecutor: + node_selector: + hub.jupyter.org/node-purpose: user + buildPodsRegistryCredentials: + server: https://us-central1-docker.pkg.dev jupyterhub: ingress: diff --git a/helm-charts/basehub/Chart.yaml b/helm-charts/basehub/Chart.yaml index 3b0b0a2e63..6f70db5ea9 100644 --- a/helm-charts/basehub/Chart.yaml +++ b/helm-charts/basehub/Chart.yaml @@ -14,6 +14,6 @@ dependencies: version: 3.0.0-beta.1.git.6208.h7b44299a repository: https://jupyterhub.github.io/helm-chart/ - name: binderhub-service - version: 0.1.0-0.dev.git.65.hec68830 + version: 0.1.0-0.dev.git.71.hc17753c repository: https://2i2c.org/binderhub-service/ condition: binderhub-service.enabled From bdf2be28eb6fa75ee119292c316ea422745f3525 Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Tue, 11 Jul 2023 18:35:37 +0300 Subject: [PATCH 10/17] Update chart and force-fix namespace issue --- config/clusters/2i2c/enc-staging.secret.values.yaml | 5 ++--- config/clusters/2i2c/staging.values.yaml | 13 +++++++------ helm-charts/basehub/Chart.yaml | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/config/clusters/2i2c/enc-staging.secret.values.yaml b/config/clusters/2i2c/enc-staging.secret.values.yaml index 3200a8054a..5ef8acb778 100644 --- a/config/clusters/2i2c/enc-staging.secret.values.yaml +++ b/config/clusters/2i2c/enc-staging.secret.values.yaml @@ -11,7 +11,6 @@ staticWebsite: privateKey: ENC[AES256_GCM,data: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,iv:sv02xzuA+rDx+RUmgyfyBZknuID1cDPdWdtdBOBGfm0=,tag:5Vf+gPpKAsWEItTwB2NUiw==,type:str] binderhub-service: buildPodsRegistryCredentials: - username: ENC[AES256_GCM,data:FtvSAR6jeDXP,iv:zU3Xe8a/7JkCpOm2mu3zlM7vwBe0Ua9fNr9p2QSCj1s=,tag:ZAmZuYLMR48fngW6jhYk+A==,type:str] password: ENC[AES256_GCM,data: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,iv:9/VDqszgroPCEUoEAQlLOcFlDRFgj0dMCr+wxLo6cn8=,tag:ppqm2DR249g1yM5y80I7dg==,type:str] sops: kms: [] @@ -22,8 +21,8 @@ sops: azure_kv: [] hc_vault: [] age: [] - lastmodified: "2023-07-10T08:55:22Z" - mac: ENC[AES256_GCM,data:/E7Ch8KFKDJHF/+sYsYgOxn3M7HMXXrfP/dw/7rp427CffseOw1hG9UirSvFGu6Fkwzbs++OKHixPN0Kumb9jGh/59HJHYwctpNtEfkyBbNDYtSgiaRqnu/3slXh5BGY3zJVjUiyJ92ORP+vTAFgu9qdv4rp/Iz5EXlYorRpUwk=,iv:EjRvVSycWbLMWCRrsTQneGpvl0skWcazggaDMQHOLws=,tag:R8oeBEeAhusM/s2SARrvOg==,type:str] + lastmodified: "2023-07-11T12:22:30Z" + mac: ENC[AES256_GCM,data:bWGmFNt8B4W+a8MxAngb0EmC2zFJr8SD+Qr2kqB7n7CI5HtIUefzX588AmiUg0It1nFLn79MnDOE/6gkAUyBCLOPOLp2vrr3YoWWMeM1x3l8G15wnzJ/AI/rvQ9cXreahunIVZYuqtsdhVc3vOPwYbWsTBHz+mbGaj4B4ODE5p4=,iv:0FJx7hHwv4g2xUwR7cu93GzY7uboaGOqUI3ObBanIMo=,tag:SVnB/tUnz/cazMGiaUWAKA==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.7.3 diff --git a/config/clusters/2i2c/staging.values.yaml b/config/clusters/2i2c/staging.values.yaml index 306ab465ee..f6e07af83d 100644 --- a/config/clusters/2i2c/staging.values.yaml +++ b/config/clusters/2i2c/staging.values.yaml @@ -19,16 +19,17 @@ binderhub-service: service: port: 8090 config: - DockerRegistry: - token_url: https://us-central1-docker.pkg.dev/v2/token?service= BinderHub: use_registry: true + # Re-uses the registry created for the `binderhub-staging` hub + # and pushes images under a different prefix image_prefix: us-central1-docker.pkg.dev/two-eye-two-see/binder-staging-registry/binderhub-service- - KubernetesBuildExecutor: - node_selector: - hub.jupyter.org/node-purpose: user buildPodsRegistryCredentials: - server: https://us-central1-docker.pkg.dev + server: "https://us-central1-docker.pkg.dev" + username: "_json_key" + extraConfig: + binderhub_service_01_custom_namespace: | + c.BinderHub.build_namespace = "staging" jupyterhub: ingress: diff --git a/helm-charts/basehub/Chart.yaml b/helm-charts/basehub/Chart.yaml index 6f70db5ea9..63815f0480 100644 --- a/helm-charts/basehub/Chart.yaml +++ b/helm-charts/basehub/Chart.yaml @@ -14,6 +14,6 @@ dependencies: version: 3.0.0-beta.1.git.6208.h7b44299a repository: https://jupyterhub.github.io/helm-chart/ - name: binderhub-service - version: 0.1.0-0.dev.git.71.hc17753c + version: 0.1.0-0.dev.git.74.h8fd0278 repository: https://2i2c.org/binderhub-service/ condition: binderhub-service.enabled From 464f3e05427ce1f369c6559ec05092565da83323 Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Fri, 14 Jul 2023 11:27:19 +0300 Subject: [PATCH 11/17] Put the dockerapi and the builder pods on user nodes --- config/clusters/2i2c/staging.values.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/clusters/2i2c/staging.values.yaml b/config/clusters/2i2c/staging.values.yaml index f6e07af83d..41d7ee0a88 100644 --- a/config/clusters/2i2c/staging.values.yaml +++ b/config/clusters/2i2c/staging.values.yaml @@ -18,12 +18,18 @@ binderhub-service: enabled: true service: port: 8090 + dockerApi: + nodeSelector: + hub.jupyter.org/node-purpose: user config: BinderHub: use_registry: true # Re-uses the registry created for the `binderhub-staging` hub # and pushes images under a different prefix image_prefix: us-central1-docker.pkg.dev/two-eye-two-see/binder-staging-registry/binderhub-service- + KubernetesBuildExecutor: + node_selector: + hub.jupyter.org/node-purpose: user buildPodsRegistryCredentials: server: "https://us-central1-docker.pkg.dev" username: "_json_key" From c95a6aa22010d75e4adc5eb08320ac856daf69f4 Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Fri, 14 Jul 2023 14:21:08 +0300 Subject: [PATCH 12/17] Set tolerations for the docker api pods --- config/clusters/2i2c/staging.values.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/config/clusters/2i2c/staging.values.yaml b/config/clusters/2i2c/staging.values.yaml index 41d7ee0a88..fb8307e9b5 100644 --- a/config/clusters/2i2c/staging.values.yaml +++ b/config/clusters/2i2c/staging.values.yaml @@ -15,12 +15,23 @@ staticWebsite: enabled: false binderhub-service: + nodeSelector: + hub.jupyter.org/node-purpose: core enabled: true service: port: 8090 dockerApi: nodeSelector: hub.jupyter.org/node-purpose: user + tolerations: + # Tolerate tainted jupyterhub user nodes + - key: hub.jupyter.org_dedicated + value: user + effect: NoSchedule + - key: hub.jupyter.org/dedicated + value: user + effect: NoSchedule + config: BinderHub: use_registry: true From 2caff9e0551e0077b548915b9f09da78d7b97dd2 Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Fri, 14 Jul 2023 15:22:05 +0300 Subject: [PATCH 13/17] Update chart and remove hack --- config/clusters/2i2c/staging.values.yaml | 6 +----- helm-charts/basehub/Chart.yaml | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/config/clusters/2i2c/staging.values.yaml b/config/clusters/2i2c/staging.values.yaml index fb8307e9b5..96ea79431b 100644 --- a/config/clusters/2i2c/staging.values.yaml +++ b/config/clusters/2i2c/staging.values.yaml @@ -31,12 +31,11 @@ binderhub-service: - key: hub.jupyter.org/dedicated value: user effect: NoSchedule - config: BinderHub: use_registry: true # Re-uses the registry created for the `binderhub-staging` hub - # and pushes images under a different prefix + # but pushes images under a different prefix image_prefix: us-central1-docker.pkg.dev/two-eye-two-see/binder-staging-registry/binderhub-service- KubernetesBuildExecutor: node_selector: @@ -44,9 +43,6 @@ binderhub-service: buildPodsRegistryCredentials: server: "https://us-central1-docker.pkg.dev" username: "_json_key" - extraConfig: - binderhub_service_01_custom_namespace: | - c.BinderHub.build_namespace = "staging" jupyterhub: ingress: diff --git a/helm-charts/basehub/Chart.yaml b/helm-charts/basehub/Chart.yaml index 63815f0480..ff28172b3e 100644 --- a/helm-charts/basehub/Chart.yaml +++ b/helm-charts/basehub/Chart.yaml @@ -14,6 +14,6 @@ dependencies: version: 3.0.0-beta.1.git.6208.h7b44299a repository: https://jupyterhub.github.io/helm-chart/ - name: binderhub-service - version: 0.1.0-0.dev.git.74.h8fd0278 + version: 0.1.0-0.dev.git.80.h358d32f repository: https://2i2c.org/binderhub-service/ condition: binderhub-service.enabled From 516035fba7686ada4023f28e95f163b710311847 Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Fri, 14 Jul 2023 17:17:18 +0300 Subject: [PATCH 14/17] Add some comments --- config/clusters/2i2c/staging.values.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config/clusters/2i2c/staging.values.yaml b/config/clusters/2i2c/staging.values.yaml index 96ea79431b..047ee96adf 100644 --- a/config/clusters/2i2c/staging.values.yaml +++ b/config/clusters/2i2c/staging.values.yaml @@ -20,6 +20,11 @@ binderhub-service: enabled: true service: port: 8090 + # The DaemonSet at https://github.com/2i2c-org/binderhub-service/blob/main/binderhub-service/templates/docker-api/daemonset.yaml + # will start a docker-api pod on a user node. + # It starts the [dockerd](https://docs.docker.com/engine/reference/commandline/dockerd/) daemon, + # that will be accessible via a unix socket, mounted by the build. + # The docker-api pod must run on the same node as the builder pods. dockerApi: nodeSelector: hub.jupyter.org/node-purpose: user @@ -39,7 +44,9 @@ binderhub-service: image_prefix: us-central1-docker.pkg.dev/two-eye-two-see/binder-staging-registry/binderhub-service- KubernetesBuildExecutor: node_selector: + # Schedule builder pods to run on user nodes only hub.jupyter.org/node-purpose: user + # The password to the registry is stored encrypted in the hub's encrypted config file buildPodsRegistryCredentials: server: "https://us-central1-docker.pkg.dev" username: "_json_key" From 4e04925c89adbab827a77a598f419371da2c3c87 Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Mon, 17 Jul 2023 12:12:15 +0300 Subject: [PATCH 15/17] Rm binderhub-service config from the staging hub --- .../2i2c/enc-staging.secret.values.yaml | 7 +--- config/clusters/2i2c/staging.values.yaml | 37 ------------------- 2 files changed, 2 insertions(+), 42 deletions(-) diff --git a/config/clusters/2i2c/enc-staging.secret.values.yaml b/config/clusters/2i2c/enc-staging.secret.values.yaml index 5ef8acb778..b8176f7b1a 100644 --- a/config/clusters/2i2c/enc-staging.secret.values.yaml +++ b/config/clusters/2i2c/enc-staging.secret.values.yaml @@ -9,9 +9,6 @@ staticWebsite: githubApp: id: ENC[AES256_GCM,data:WpL4Y/Q5,iv:q/Y+T8UAwjIRpVHfjglBYS12Nx0oh8K/r3vm8PdYGL8=,tag:z3AnnYKwc/tbvmfv+dDPnw==,type:int] privateKey: ENC[AES256_GCM,data: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,iv:sv02xzuA+rDx+RUmgyfyBZknuID1cDPdWdtdBOBGfm0=,tag:5Vf+gPpKAsWEItTwB2NUiw==,type:str] -binderhub-service: - buildPodsRegistryCredentials: - password: ENC[AES256_GCM,data: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,iv:9/VDqszgroPCEUoEAQlLOcFlDRFgj0dMCr+wxLo6cn8=,tag:ppqm2DR249g1yM5y80I7dg==,type:str] sops: kms: [] gcp_kms: @@ -21,8 +18,8 @@ sops: azure_kv: [] hc_vault: [] age: [] - lastmodified: "2023-07-11T12:22:30Z" - mac: ENC[AES256_GCM,data:bWGmFNt8B4W+a8MxAngb0EmC2zFJr8SD+Qr2kqB7n7CI5HtIUefzX588AmiUg0It1nFLn79MnDOE/6gkAUyBCLOPOLp2vrr3YoWWMeM1x3l8G15wnzJ/AI/rvQ9cXreahunIVZYuqtsdhVc3vOPwYbWsTBHz+mbGaj4B4ODE5p4=,iv:0FJx7hHwv4g2xUwR7cu93GzY7uboaGOqUI3ObBanIMo=,tag:SVnB/tUnz/cazMGiaUWAKA==,type:str] + lastmodified: "2023-07-17T08:46:09Z" + mac: ENC[AES256_GCM,data:3eQh2pOL/wS69S1nijx2lZrcUlG9nxvbQ5KpCrbPDx0yLfjBkAbg4FR82oeho2CwGHi5nky6X4VrxOIZAPgqgOntJ1QzARr1i9QgYh/klTQfEaLpa7ytciaUyXYebQBgGp1seIjug3U4k3aloGcQu4AbBLQRjCe8F2BMOahWTlU=,iv:NV8ao8uAd/c+ab799C4IzN4m1UoJzh7SPuFq78O+crs=,tag:JAJVl3KRDUgB2e0ynBaqlg==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.7.3 diff --git a/config/clusters/2i2c/staging.values.yaml b/config/clusters/2i2c/staging.values.yaml index 047ee96adf..633e51985b 100644 --- a/config/clusters/2i2c/staging.values.yaml +++ b/config/clusters/2i2c/staging.values.yaml @@ -14,43 +14,6 @@ staticWebsite: githubAuth: enabled: false -binderhub-service: - nodeSelector: - hub.jupyter.org/node-purpose: core - enabled: true - service: - port: 8090 - # The DaemonSet at https://github.com/2i2c-org/binderhub-service/blob/main/binderhub-service/templates/docker-api/daemonset.yaml - # will start a docker-api pod on a user node. - # It starts the [dockerd](https://docs.docker.com/engine/reference/commandline/dockerd/) daemon, - # that will be accessible via a unix socket, mounted by the build. - # The docker-api pod must run on the same node as the builder pods. - dockerApi: - nodeSelector: - hub.jupyter.org/node-purpose: user - tolerations: - # Tolerate tainted jupyterhub user nodes - - key: hub.jupyter.org_dedicated - value: user - effect: NoSchedule - - key: hub.jupyter.org/dedicated - value: user - effect: NoSchedule - config: - BinderHub: - use_registry: true - # Re-uses the registry created for the `binderhub-staging` hub - # but pushes images under a different prefix - image_prefix: us-central1-docker.pkg.dev/two-eye-two-see/binder-staging-registry/binderhub-service- - KubernetesBuildExecutor: - node_selector: - # Schedule builder pods to run on user nodes only - hub.jupyter.org/node-purpose: user - # The password to the registry is stored encrypted in the hub's encrypted config file - buildPodsRegistryCredentials: - server: "https://us-central1-docker.pkg.dev" - username: "_json_key" - jupyterhub: ingress: hosts: From d282f201b9bc6e97cec6fe00af3a7fca18b7e79d Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Mon, 17 Jul 2023 12:12:51 +0300 Subject: [PATCH 16/17] Add imagebuilding-demo hub --- config/clusters/2i2c/cluster.yaml | 8 ++ .../enc-imagebuilding-demo.secret.values.yaml | 23 ++++++ .../2i2c/imagebuilding-demo.values.yaml | 74 +++++++++++++++++++ 3 files changed, 105 insertions(+) create mode 100644 config/clusters/2i2c/enc-imagebuilding-demo.secret.values.yaml create mode 100644 config/clusters/2i2c/imagebuilding-demo.values.yaml diff --git a/config/clusters/2i2c/cluster.yaml b/config/clusters/2i2c/cluster.yaml index 86499a1476..6fb64d02ba 100644 --- a/config/clusters/2i2c/cluster.yaml +++ b/config/clusters/2i2c/cluster.yaml @@ -51,6 +51,14 @@ hubs: helm_chart_values_files: - binder-staging.values.yaml - enc-binder-staging.secret.values.yaml + - name: imagebuilding-demo + display_name: "2i2c image building demo" + domain: imagebuilding-demo.2i2c.cloud.2i2c.cloud + helm_chart: basehub + helm_chart_values_files: + - basehub-common.values.yaml + - imagebuilding-demo.values.yaml + - enc-imagebuilding-demo.secret.values.yaml - name: demo display_name: "2i2c demo" domain: demo.2i2c.cloud diff --git a/config/clusters/2i2c/enc-imagebuilding-demo.secret.values.yaml b/config/clusters/2i2c/enc-imagebuilding-demo.secret.values.yaml new file mode 100644 index 0000000000..8a7d4cf838 --- /dev/null +++ b/config/clusters/2i2c/enc-imagebuilding-demo.secret.values.yaml @@ -0,0 +1,23 @@ +binderhub-service: + buildPodsRegistryCredentials: + password: ENC[AES256_GCM,data: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,iv:0+34W6adUVI8wBO4oWTYX1LpFBrV6mxz+zh4FTUdzQw=,tag:CnErqoj/esIP3b4OKfoj0g==,type:str] +jupyterhub: + hub: + config: + CILogonOAuthenticator: + client_id: ENC[AES256_GCM,data:v3yiJA0ir2lC1qf/1ih5iLLdfiBSg1B+XEREYcrHwF0j+Srx7LV/3AKsWEHKnFB3hOw=,iv:oEcT6PsStTBiYO+GLREnLRTCR7eLeaHdqHWWRRrbc0E=,tag:hx9TAfhzKMqgexWhNd8H5g==,type:str] + client_secret: ENC[AES256_GCM,data:+U2J6N0R05DfCwhcest0oBRXv1356e9jeGQTR57Pum24MaE4xFLSt5uQsT7bOAXKF/s8lV1vrDomoPBGuhZ+3t/iCFlS/9KYsDCBLbjDBR/MZFWWWEk=,iv:tZqmBcBhe84BQrNaTEnYTMt9lG4KDU/OJlKYMHqxEf4=,tag:I3X3K+OH1JjKpSFwITvUHw==,type:str] +sops: + kms: [] + gcp_kms: + - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs + created_at: "2023-07-17T08:45:20Z" + enc: CiUA4OM7eMiDjL9h2JVoUk0z51mi94Tov+v2PxCEx9zTshKYF1HlEkkAyiwFHGf++4gB28i3Fcz+7sjHshU7Jd9nogf3dtzpYqZ5AqreK8ONJ3gQTl1WVOjMiDEUrHhWSydPJuO0FR180PtVqAzkQfkz + azure_kv: [] + hc_vault: [] + age: [] + lastmodified: "2023-07-17T08:45:20Z" + mac: ENC[AES256_GCM,data:m0mqujIYiJfZLUKy9/jmXpIn6sypJkZ/GgJNWMeEqaecUUUvtnMNsCzzWxojWd/cMkQJCGEoTbswI18sA2j/J0jewdnziTvPfQqvf52nHwSDfRdiqWKneX+TAJxagSxfK2FTurRGRIGqgv4jqT0ATO3CqNhyMSWifBeGW7q9QXY=,iv:jJd+1AxYIBz1GkuzaPd7SzACh+iXFLzcEPe3eEEnNVA=,tag:DPoo2i8YmEUQZ4Q2Y7BF+g==,type:str] + pgp: [] + unencrypted_suffix: _unencrypted + version: 3.7.3 diff --git a/config/clusters/2i2c/imagebuilding-demo.values.yaml b/config/clusters/2i2c/imagebuilding-demo.values.yaml new file mode 100644 index 0000000000..a62f793da4 --- /dev/null +++ b/config/clusters/2i2c/imagebuilding-demo.values.yaml @@ -0,0 +1,74 @@ +jupyterhub: + ingress: + hosts: + - imagebuilding-demo.2i2c.cloud + tls: + - secretName: https-auto-tls + hosts: + - imagebuilding-demo.2i2c.cloud + custom: + 2i2c: + add_staff_user_ids_to_admin_users: true + add_staff_user_ids_of_type: "google" + homepage: + templateVars: + org: + name: demo image building with binderhub-service + url: https://2i2c.org + logo_url: https://2i2c.org/media/logo.png + designed_by: + name: 2i2c + url: https://2i2c.org + operated_by: + name: 2i2c + url: https://2i2c.org + funded_by: + name: 2i2c + url: https://2i2c.org + hub: + config: + JupyterHub: + authenticator_class: cilogon + CILogonOAuthenticator: + oauth_callback_url: "https://imagebuilding-demo.2i2c.cloud/hub/oauth_callback" + username_claim: "email" + # Only show the option to login with Google + shown_idps: + - http://google.com/accounts/o8/id + +binderhub-service: + nodeSelector: + hub.jupyter.org/node-purpose: core + enabled: true + service: + port: 8090 + # The DaemonSet at https://github.com/2i2c-org/binderhub-service/blob/main/binderhub-service/templates/docker-api/daemonset.yaml + # will start a docker-api pod on a user node. + # It starts the [dockerd](https://docs.docker.com/engine/reference/commandline/dockerd/) daemon, + # that will be accessible via a unix socket, mounted by the build. + # The docker-api pod must run on the same node as the builder pods. + dockerApi: + nodeSelector: + hub.jupyter.org/node-purpose: user + tolerations: + # Tolerate tainted jupyterhub user nodes + - key: hub.jupyter.org_dedicated + value: user + effect: NoSchedule + - key: hub.jupyter.org/dedicated + value: user + effect: NoSchedule + config: + BinderHub: + use_registry: true + # Re-uses the registry created for the `binderhub-staging` hub + # but pushes images under a different prefix + image_prefix: us-central1-docker.pkg.dev/two-eye-two-see/binder-staging-registry/binderhub-service- + KubernetesBuildExecutor: + node_selector: + # Schedule builder pods to run on user nodes only + hub.jupyter.org/node-purpose: user + # The password to the registry is stored encrypted in the hub's encrypted config file + buildPodsRegistryCredentials: + server: "https://us-central1-docker.pkg.dev" + username: "_json_key" From 2ee6528a295808ac125ac297f88e999e27127130 Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Mon, 17 Jul 2023 12:24:54 +0300 Subject: [PATCH 17/17] Make sure binderhub-service is dissabled by default --- helm-charts/basehub/values.schema.yaml | 8 ++++++++ helm-charts/basehub/values.yaml | 3 +++ 2 files changed, 11 insertions(+) diff --git a/helm-charts/basehub/values.schema.yaml b/helm-charts/basehub/values.schema.yaml index 5386985485..09da26900d 100644 --- a/helm-charts/basehub/values.schema.yaml +++ b/helm-charts/basehub/values.schema.yaml @@ -210,6 +210,14 @@ properties: binderhub-service: type: object additionalProperties: true + required: + - enabled + properties: + enabled: + type: boolean + # https://github.com/2i2c-org/binderhub-service + description: | + Enable image building with binderhub-service # jupyterhub is a dependent helm chart and we rely _mostly_ on its schema # validation for values passed to it and are not imposing restrictions on # most of them in this helm chart. diff --git a/helm-charts/basehub/values.yaml b/helm-charts/basehub/values.yaml index 4766f7b556..164020984a 100644 --- a/helm-charts/basehub/values.yaml +++ b/helm-charts/basehub/values.yaml @@ -5,6 +5,9 @@ userServiceAccount: enabled: true annotations: {} +binderhub-service: + enabled: false + ingressBasicAuth: enabled: false # Primarily here for validation to 'work',