diff --git a/.github/workflows/deploy-hubs.yaml b/.github/workflows/deploy-hubs.yaml index f6d5fbfdf6..30a7ce4c1c 100644 --- a/.github/workflows/deploy-hubs.yaml +++ b/.github/workflows/deploy-hubs.yaml @@ -454,7 +454,6 @@ jobs: failure_2i2c_dask-staging: ${{ steps.declare-failure.outputs.failure_2i2c_dask-staging }} failure_2i2c_ucmercedstaging: ${{ steps.declare-failure.outputs.failure_2i2c_ucmercedstaging }} failure_2i2c-aws-us_staging: ${{ steps.declare-failure.outputs.failure_2i2c-aws-us_staging }} - failure_2i2c-aws-us_dask-staging: ${{ steps.declare-failure.outputs.failure_2i2c-aws-us_dask-staging }} failure_2i2c-uk_staging: ${{ steps.declare-failure.outputs.failure_2i2c-uk_staging }} failure_aimatx-2i2c-hub_staging: ${{ steps.declare-failure.outputs.failure_aimatx-2i2c-hub_staging }} failure_awi-ciroh_staging: ${{ steps.declare-failure.outputs.failure_awi-ciroh_staging }} diff --git a/config/clusters/2i2c-aws-us/cluster.yaml b/config/clusters/2i2c-aws-us/cluster.yaml index c2e04217bc..754c70a50f 100644 --- a/config/clusters/2i2c-aws-us/cluster.yaml +++ b/config/clusters/2i2c-aws-us/cluster.yaml @@ -23,14 +23,6 @@ hubs: - basehub-common.values.yaml - staging.values.yaml - enc-staging.secret.values.yaml -- name: dask-staging - display_name: 2i2c AWS dask-staging - domain: dask-staging.aws.2i2c.cloud - helm_chart: daskhub - helm_chart_values_files: - - daskhub-common.values.yaml - - dask-staging.values.yaml - - enc-dask-staging.secret.values.yaml - name: showcase display_name: 2i2c Showcase domain: showcase.2i2c.cloud diff --git a/config/clusters/2i2c-aws-us/dask-staging.values.yaml b/config/clusters/2i2c-aws-us/dask-staging.values.yaml deleted file mode 100644 index db6978cd79..0000000000 --- a/config/clusters/2i2c-aws-us/dask-staging.values.yaml +++ /dev/null @@ -1,63 +0,0 @@ -basehub: - nfs: - pv: - serverIP: 10.100.224.244 - userServiceAccount: - annotations: - eks.amazonaws.com/role-arn: arn:aws:iam::790657130469:role/2i2c-aws-us-dask-staging - jupyterhub-home-nfs: - eks: - volumeId: vol-002bff088152dd5e9 - quotaEnforcer: - config: - QuotaManager: - hard_quota: 10 # in GiB - jupyterhub: - ingress: - hosts: [dask-staging.aws.2i2c.cloud] - tls: - - hosts: [dask-staging.aws.2i2c.cloud] - secretName: https-auto-tls - custom: - 2i2c: - add_staff_user_ids_to_admin_users: true - add_staff_user_ids_of_type: github - homepage: - templateVars: - org: - name: 2i2c Dask Staging - 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 - singleuser: - nodeSelector: - 2i2c/hub-name: dask-staging - image: - name: pangeo/pangeo-notebook - tag: latest - extraEnv: - SCRATCH_BUCKET: s3://2i2c-aws-us-scratch-dask-staging/$(JUPYTERHUB_USER) - hub: - config: - GitHubOAuthenticator: - oauth_callback_url: https://dask-staging.aws.2i2c.cloud/hub/oauth_callback - - dask-gateway: - gateway: - backend: - scheduler: - extraPodConfig: - nodeSelector: - 2i2c/hub-name: dask-staging - worker: - extraPodConfig: - nodeSelector: - 2i2c/hub-name: dask-staging diff --git a/config/clusters/2i2c-aws-us/enc-dask-staging.secret.values.yaml b/config/clusters/2i2c-aws-us/enc-dask-staging.secret.values.yaml deleted file mode 100644 index ef61684ce8..0000000000 --- a/config/clusters/2i2c-aws-us/enc-dask-staging.secret.values.yaml +++ /dev/null @@ -1,21 +0,0 @@ -basehub: - jupyterhub: - hub: - config: - GitHubOAuthenticator: - client_id: ENC[AES256_GCM,data:ZiUCM3p/hY+y/zpQFS+R13pd7wY=,iv:M3N7NmEtE5qngrCwlr2vLxTUaFvbQM+q6uOGsw3Vmbg=,tag:TtN0bMLKmSiSSiPipWCEAw==,type:str] - client_secret: ENC[AES256_GCM,data:46JoY+yo01tG12QsaIlpuZ9hX00YfHHmL+MXKkyl4ncHQjVbj+4hNQ==,iv:T1YQnD2mr2JKhAtSHaPXTTlD8CreiHOxAxG1wfueNME=,tag:s0xmzKuhqUKaWy6pmJzQUw==,type:str] -sops: - kms: [] - gcp_kms: - - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs - created_at: '2023-01-05T15:25:09Z' - enc: CiUA4OM7eN6ULedt07hrYSuCYNviz84p6Myz4gLx0SHi2soZ8b5JEkkA+0T9hZ0nLyBqO0b1X7/wXW+AXp9K52uffuEDJvyCG97WP75nEi2k0QqjCsLQGaIr7QuYzkVkvMWf6bfJeLE8DravcpVoVqUH - azure_kv: [] - hc_vault: [] - age: [] - lastmodified: '2023-01-05T15:25:09Z' - mac: ENC[AES256_GCM,data:4rpy/3DM8UDSnyeB+B2JLWE/xaucbCvwucTv3cU5rItFZaUIlmynLcXpqhOBCoEEfPbAFG+eTo3Kdm8qEETFl4Ssd8yNU9kedgOn8V64LT/hTWaPzmGkzTx3bdjXIjHJwuvLpMItSonItapwSbN4ZOSdRUETylzpxr+zYhJySvw=,iv:PP+vA0UrQmlCXMwVzzWrIT+fF9TvZxad4VXLA16EsUw=,tag:D3qv+InhBs6Najw0E7gIXA==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.7.3 diff --git a/terraform/aws/projects/2i2c-aws-us.tfvars b/terraform/aws/projects/2i2c-aws-us.tfvars index 246d21d17a..2d63968326 100644 --- a/terraform/aws/projects/2i2c-aws-us.tfvars +++ b/terraform/aws/projects/2i2c-aws-us.tfvars @@ -10,10 +10,6 @@ user_buckets = { "delete_after" : 7, "tags" : { "2i2c:hub-name" : "staging" }, }, - "scratch-dask-staging" : { - "delete_after" : 7, - "tags" : { "2i2c:hub-name" : "dask-staging" }, - }, "scratch-showcase" : { "delete_after" : 7, "tags" : { "2i2c:hub-name" : "showcase" }, @@ -28,9 +24,6 @@ hub_cloud_permissions = { "staging" : { bucket_admin_access : ["scratch-staging"], }, - "dask-staging" : { - bucket_admin_access : ["scratch-dask-staging"], - }, "showcase" : { bucket_admin_access : [ "scratch-showcase", @@ -46,12 +39,6 @@ ebs_volumes = { name_suffix = "staging" tags = { "2i2c:hub-name" : "staging" } } - "dask-staging" = { - size = 100 # in GB - type = "gp3" - name_suffix = "dask-staging" - tags = { "2i2c:hub-name" : "dask-staging" } - } "showcase" = { size = 500 # in GB type = "gp3"