diff --git a/config/clusters/2i2c/agu-binder.values.yaml b/config/clusters/2i2c/agu-binder.values.yaml deleted file mode 100644 index d2b9e9a143..0000000000 --- a/config/clusters/2i2c/agu-binder.values.yaml +++ /dev/null @@ -1,128 +0,0 @@ -binderhub: - dind: - # This has to be separate for each binderhub we run on the same cluster - hostSocketDir: /var/run/agu-binder/dind - hostLibDir: /var/lib/agu-binder/dind - ingress: - hosts: - - agu-binder.2i2c.cloud - tls: - - secretName: https-auto-tls - hosts: - - agu-binder.2i2c.cloud - registry: - url: https://us-central1-docker.pkg.dev - config: - DockerRegistry: - token_url: https://us-central1-docker.pkg.dev/v2/token?service= - BinderHub: - # The URL set as jupyterhub.ingress.hosts[0] in this config - auth_enabled: true - hub_url: https://hub.agu-binder.2i2c.cloud - image_prefix: us-central1-docker.pkg.dev/two-eye-two-see/agu-binder-registry/ - template_path: /etc/binderhub/custom/templates - extra_static_path: /etc/binderhub/custom/static - extra_static_url_prefix: /extra_static/ - about_message: | -

agu-binder.2i2c.cloud is operated by the 2i2c team for AGU 2023.

- initContainers: - - name: git-clone-templates - image: alpine/git - args: - - clone - - --single-branch - - --branch=master - - --depth=1 - - -- - - https://github.com/2i2c-org/agu-binder-custom-templates - - /etc/binderhub/custom - securityContext: - runAsUser: 0 - volumeMounts: - - name: custom-templates - mountPath: /etc/binderhub/custom - extraVolumes: - - name: custom-templates - emptyDir: {} - extraVolumeMounts: - - name: custom-templates - mountPath: /etc/binderhub/custom - jupyterhub: - ingress: - enabled: true - hosts: - - hub.agu-binder.2i2c.cloud - tls: - - secretName: https-auto-tls-hub-binder - hosts: - - hub.agu-binder.2i2c.cloud - hub: - redirectToServer: false - services: - binder: - oauth_client_id: service-binderhub - oauth_no_confirm: true - oauth_redirect_uri: "https://agu-binder.2i2c.cloud/oauth_callback" - loadRoles: - user: - scopes: - - self - - "access:services" - extraConfig: - 01-orcid: | - def setup_orcid_username(authenticator, handler, authentication): - """ - Fish ORCID username from inside cilogon_user when used with ORCID - - There is no clear way to get just the ORCID id from CILogon, so we - have to do this. https://github.com/jupyterhub/oauthenticator/issues/712 - is the upstream report, we can get rid of this once that gets fixed. - """ - idp = authentication['auth_state']['cilogon_user']['idp'] - if idp == 'http://orcid.org/oauth/authorize': - # Only modify usernames if orcid is used - # oidc is of the form https://orcid.org/ - authentication['name'] = authentication['auth_state']['cilogon_user']['oidc'].split('/')[-1] - return authentication - - c.Authenticator.post_auth_hook = setup_orcid_username - - config: - BinderSpawner: - auth_enabled: true - JupyterHub: - authenticator_class: cilogon - CILogonOAuthenticator: - oauth_callback_url: "https://hub.agu-binder.2i2c.cloud/hub/oauth_callback" - allowed_idps: - http://google.com/accounts/o8/id: - username_derivation: - username_claim: "email" - http://orcid.org/oauth/authorize: - username_derivation: - username_claim: "given_name" - allow_all: true - http://github.com/login/oauth/authorize: - username_derivation: - username_claim: "preferred_username" - allow_all: true - Authenticator: - admin_users: - - choldgraf@2i2c.org - - colliand@2i2c.org - - damianavila@2i2c.org - - erik@2i2c.org - - georgianaelena@2i2c.org - - jmunroe@2i2c.org - - sgibson@2i2c.org - - yuvipanda@2i2c.org - singleuser: - nodeSelector: - 2i2c.org/community: agu-binder - extraTolerations: - - key: "2i2c.org/community" - operator: "Equal" - value: "agu-binder" - effect: "NoSchedule" - # to make notebook servers aware of hub - cmd: jupyterhub-singleuser diff --git a/config/clusters/2i2c/cluster.yaml b/config/clusters/2i2c/cluster.yaml index 9ba7478c07..28ff83d847 100644 --- a/config/clusters/2i2c/cluster.yaml +++ b/config/clusters/2i2c/cluster.yaml @@ -40,13 +40,6 @@ hubs: helm_chart_values_files: - binder-staging.values.yaml - enc-binder-staging.secret.values.yaml - - name: agu-binder - display_name: "2i2c AGU Demo Binder" - domain: agu-binder.2i2c.cloud - helm_chart: binderhub - helm_chart_values_files: - - agu-binder.values.yaml - - enc-agu-binder.secret.values.yaml - name: imagebuilding-demo display_name: "2i2c image building demo" domain: imagebuilding-demo.2i2c.cloud diff --git a/config/clusters/2i2c/enc-agu-binder.secret.values.yaml b/config/clusters/2i2c/enc-agu-binder.secret.values.yaml deleted file mode 100644 index 023edea190..0000000000 --- a/config/clusters/2i2c/enc-agu-binder.secret.values.yaml +++ /dev/null @@ -1,24 +0,0 @@ -binderhub: - registry: - username: ENC[AES256_GCM,data:J8Do9728Flzx,iv:xc9O7QLsxCj1ihu+Sax2wNEBgT4rxt3gYhVhRkeVcgg=,tag:pG/ISFKpRJWGKFA49Qd11g==,type:str] - password: ENC[AES256_GCM,data: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,iv:rLpuwMEoJryf3Xh+MksFRhr3ekbCXyOm7kTsVFYuhUI=,tag:Qz/6pJh6WOPzbbz6yQ/CjA==,type:str] - jupyterhub: - hub: - config: - CILogonOAuthenticator: - client_id: ENC[AES256_GCM,data:IB5AfR1TPYSoAbIPR2Uunb/nlqxZRHyR8NwhHDiJiYTMtKDrmPTB/7aEbvZVxK4DQq+E,iv:oODyyF9jfZwQF/4v1wNNsXFDK9cAWUYlhNw/EESWeDA=,tag:kuh1jICGg6TOPK9wVkYWtw==,type:str] - client_secret: ENC[AES256_GCM,data:grQBxNNENGKMe7Jm/bhrQFKgCmWUsvA16Kg0cDHHF7eVIaaMYNclNIsoZkEcTay/EVZfvjPgstG+t2j85kmAmVSz/PHQRFG5pOB5Lud9GWY28/ANCg4=,iv:duVks5blb7Yu1nvZk0eowndbNXNN87NKQMEEn89rOL0=,tag:5eL3ZWAMaj5535nfrX6MQA==,type:str] -sops: - kms: [] - gcp_kms: - - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs - created_at: "2023-12-06T23:25:45Z" - enc: CiUA4OM7eKXCQVwUHjh2yd/0/ogofhfHGPqvEvLmN24jAnxJFywOEkgAjTWv+niyZUOfBHbu09dctaM4bVQNHckAweQtdeuew5OY3Ienk1ivzRb7o37En5OvirSQn/4Xk/GsZ+R+ZzjKFM/2d1aTbKo= - azure_kv: [] - hc_vault: [] - age: [] - lastmodified: "2023-12-06T23:34:23Z" - mac: ENC[AES256_GCM,data:hGrhZGDCvpmACopyQsEBLt6gH/fzYwKIMcEL0DrJW9nBk1n1YBOD4TRRP6vnUwiTLbmGzIRPmjn5JeXmMgmogr/436JHifoexWmBTE+8iXoIRHHfBATjW1L/ivFk740Bp7bI1ZEkLbsKscssUiczM6GI5B7kbtNRf0BVxSHhkDU=,iv:axEVH1i9qb2YzDiuSw0V1+/p0b9W6uLvKF7tm8grZ0U=,tag:6bHKRcsI9bN2AuGeLeZR1g==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.7.3 diff --git a/config/clusters/2i2c/enc-neurohackademy.secret.values.yaml b/config/clusters/2i2c/enc-neurohackademy.secret.values.yaml deleted file mode 100644 index d423533381..0000000000 --- a/config/clusters/2i2c/enc-neurohackademy.secret.values.yaml +++ /dev/null @@ -1,25 +0,0 @@ -jupyterhub: - hub: - config: - CILogonOAuthenticator: - client_id: ENC[AES256_GCM,data:/V5zuwdVRd5ylEW1eB/kxskMkShJHCx7AefXpropYmD4fi8wvLux+VO+kpP6WnsQw+w5,iv:5j08+QLAFMf4Vt8r3i9lgGrX0syPv2Wr8yRbaEaakAM=,tag:1RH78JX6PkORH/aY8xu2/A==,type:str] - client_secret: ENC[AES256_GCM,data:QhunpQzs0wdrzHRAV66sF/yj+uvLBsNgS+xrZ+t31tXthqJyl/NK3w20h9xbMTVWZjwHpEJPDRvdXD52nHi/beNlEGSKVno3pLYgBmg0+mGlhQoVmlY=,iv:2xrJb182QTRSCldR9KxSvZADgfWA79WvdMDmKw75GsU=,tag:S7wKAdcLTqPmtIiTH+xY/g==,type:str] - singleuser: - extraFiles: - github-app-private-key.pem: - mountPath: ENC[AES256_GCM,data:Ov0lkLLSgJtZvjA2lnMrWmYbNemh13Pu0qSdkQOnahNkV0zsSvc=,iv:hvSLVxXAxXB44qP3kh6dX8hyUnlO5iDvjv5OOyay1u0=,tag:/QBW7Yq+jeSvqOAX4+OuPQ==,type:str] - stringData: ENC[AES256_GCM,data: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,iv:sc4DVogQTcMdwXZZIZZMsBB9uvAWhd+Q+DvwzIk6p4M=,tag:lkCRCcsYHO7yln81w43EJA==,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-21T17:00:19Z" - enc: CiUA4OM7ePhQoduO2OVXLQZHWj5P2rxIIdvc+PDheYWgpiNqKbGXEkkAyiwFHHdw83axVZbD2yP0xoQX9PhnIJx0n9uyp6gmGLvBv1v6SMaXe9h/W998wg7WdAL60ht+x0+zJBMRHhbW/6ZrOan29G6D - azure_kv: [] - hc_vault: [] - age: [] - lastmodified: "2023-07-21T17:00:19Z" - mac: ENC[AES256_GCM,data:BPdzh5EbcRD+yObsVXm0JwPqgJrEEIY3ZJCLy0KBGtY2WRMNdX9d6+vQ3YIlXDgBBMHi9x9eSMsH0cof0nsoOwrEnjV1jK/4I8eHQqIu+2aV3y8VrXTP0A2vZylN6bZKbfmjl7IzrtyikED4DXnakVKf2hR42XowPd+cnb56zBA=,iv:bqFW+rPT1ZxJ/x4wEfbte4nKp7yiRWSI6CXuiHkGYug=,tag:tJWPIeWVbN0SCpjwAPaNIA==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.7.3 diff --git a/terraform/gcp/projects/pilot-hubs.tfvars b/terraform/gcp/projects/pilot-hubs.tfvars index 0ec2091301..6565c11ea6 100644 --- a/terraform/gcp/projects/pilot-hubs.tfvars +++ b/terraform/gcp/projects/pilot-hubs.tfvars @@ -54,25 +54,7 @@ notebook_nodes = { resource_labels : { "community" : "temple" }, - }, - "agu-binder" : { - min : 0, - max : 100, - machine_type : "n2-highmem-8", - node_version : "1.26.4-gke.1400", - disk_type : "pd-ssd", - labels : { - "2i2c.org/community" : "agu-binder" - }, - taints : [{ - key : "2i2c.org/community", - value : "agu-binder", - effect : "NO_SCHEDULE" - }], - resource_labels : { - "community" : "agu-binder" - }, - }, + } } # Setup a single node pool for dask workers.