diff --git a/.github/workflows/deploy-grafana-dashboards.yaml b/.github/workflows/deploy-grafana-dashboards.yaml index 4b9549616..49e775145 100644 --- a/.github/workflows/deploy-grafana-dashboards.yaml +++ b/.github/workflows/deploy-grafana-dashboards.yaml @@ -31,7 +31,6 @@ jobs: - cluster_name: jupyter-meets-the-earth - cluster_name: kitware - cluster_name: leap - - cluster_name: linked-earth - cluster_name: nasa-cryo - cluster_name: nasa-esdis - cluster_name: nasa-veda diff --git a/.github/workflows/deploy-hubs.yaml b/.github/workflows/deploy-hubs.yaml index 77edd1960..d79bb7d46 100644 --- a/.github/workflows/deploy-hubs.yaml +++ b/.github/workflows/deploy-hubs.yaml @@ -241,7 +241,6 @@ jobs: failure_jupyter-meets-the-earth: "${{ env.failure_jupyter-meets-the-earth }}" failure_kitware: "${{ env.failure_kitware }}" failure_leap: "${{ env.failure_leap }}" - failure_linked-earth: "${{ env.failure_linked-earth }}" failure_nasa-cryo: "${{ env.failure_nasa-cryo }}" failure_nasa-esdis: "${{ env.failure_nasa-esdis }}" failure_nasa-ghg: "${{ env.failure_nasa-ghg }}" diff --git a/config/clusters/linked-earth/cluster.yaml b/config/clusters/linked-earth/cluster.yaml deleted file mode 100644 index 926b7b54a..000000000 --- a/config/clusters/linked-earth/cluster.yaml +++ /dev/null @@ -1,41 +0,0 @@ -name: linked-earth -provider: gcp # https://console.cloud.google.com/kubernetes/clusters/details/us-central1/linked-earth-cluster/nodes?project=linked-earth-hubs -gcp: - key: enc-deployer-credentials.secret.json - project: linked-earth-hubs - cluster: linked-earth-cluster - # The zone is actually us-central1-c but the deployer throws the below error unless - # we set this to us-central1. Possibly because it is a regional cluster. - # - # Could not find [linked-earth-cluster] in [us-central1-c]. - # Did you mean [linked-earth-cluster] in [us-central1]? - zone: us-central1 - billing: - paid_by_us: false -support: - helm_chart_values_files: - - support.values.yaml - - enc-support.secret.values.yaml -hubs: - - name: staging - display_name: "LinkedEarth (staging)" - domain: staging.linkedearth.2i2c.cloud - helm_chart: daskhub - helm_chart_values_files: - # The order in which you list files here is the order the will be passed - # to the helm upgrade command in, and that has meaning. Please check - # that you intend for these files to be applied in this order. - - common.values.yaml - - staging.values.yaml - - enc-staging.secret.values.yaml - - name: prod - display_name: "LinkedEarth (prod)" - domain: linkedearth.2i2c.cloud - helm_chart: daskhub - helm_chart_values_files: - # The order in which you list files here is the order the will be passed - # to the helm upgrade command in, and that has meaning. Please check - # that you intend for these files to be applied in this order. - - common.values.yaml - - prod.values.yaml - - enc-prod.secret.values.yaml diff --git a/config/clusters/linked-earth/common.values.yaml b/config/clusters/linked-earth/common.values.yaml deleted file mode 100644 index a0d403f63..000000000 --- a/config/clusters/linked-earth/common.values.yaml +++ /dev/null @@ -1,180 +0,0 @@ -basehub: - nfs: - enabled: true - pv: - enabled: true - mountOptions: - - soft - - noatime - # Google FileStore IP - serverIP: 10.155.150.2 - # Name of Google Filestore share - baseShareName: /homes/ - dask-gateway: - enabled: true - gateway: - backend: - scheduler: - cores: - request: 0.8 - limit: 1 - memory: - request: 1G - limit: 2G - jupyterhub: - custom: - daskhubSetup: - enabled: true - 2i2c: - add_staff_user_ids_to_admin_users: true - add_staff_user_ids_of_type: "github" - homepage: - templateVars: - org: - name: LinkedEarth - url: https://linked.earth/ - logo_url: https://linked.earth/_images/LinkedEarth_small.png - designed_by: - name: 2i2c - url: https://2i2c.org - operated_by: - name: 2i2c - url: https://2i2c.org - funded_by: - name: "" - url: "" - hub: - config: - JupyterHub: - authenticator_class: github - GitHubOAuthenticator: - allowed_organizations: - - LinkedEarth - scope: - - read:org - Authenticator: - admin_users: - - khider - singleuser: - cloudMetadata: - blockWithIptables: false - image: - # User image repo: https://quay.io/repository/linkedearth/pyleoclim - name: quay.io/linkedearth/pyleoclim - tag: "latest" - - profileList: - # NOTE: About node sharing - # - # CPU/Memory requests/limits are actively considered still. This - # profile list is setup to involve node sharing as considered in - # https://github.com/2i2c-org/infrastructure/issues/2121. - # - # - Memory requests are different from the description, based on: - # what's found to remain allocate in k8s, subtracting 1GiB - # overhead for misc system pods, and transitioning from GB in - # description to GiB in mem_guarantee. - # - CPU requests are lower than the description, with a factor of - # 10%. - # - - display_name: "Small: up to 4 CPU / 32 GB RAM" - description: &profile_list_description "Start a container with at least a chosen share of capacity on a node of this type" - slug: small - profile_options: - requests: - # NOTE: Node share choices are in active development, see comment - # next to profileList: above. - display_name: Node share - choices: - mem_1: - default: true - display_name: ~1 GB, ~0.125 CPU - kubespawner_override: - mem_guarantee: 0.836G - cpu_guarantee: 0.013 - mem_2: - display_name: ~2 GB, ~0.25 CPU - kubespawner_override: - mem_guarantee: 1.671G - cpu_guarantee: 0.025 - mem_4: - display_name: ~4 GB, ~0.5 CPU - kubespawner_override: - mem_guarantee: 3.342G - cpu_guarantee: 0.05 - mem_8: - display_name: ~8 GB, ~1.0 CPU - kubespawner_override: - mem_guarantee: 6.684G - cpu_guarantee: 0.1 - mem_16: - display_name: ~16 GB, ~2.0 CPU - kubespawner_override: - mem_guarantee: 13.369G - cpu_guarantee: 0.2 - mem_32: - display_name: ~32 GB, ~4.0 CPU - kubespawner_override: - mem_guarantee: 26.738G - cpu_guarantee: 0.4 - kubespawner_override: - cpu_limit: null - mem_limit: null - node_selector: - node.kubernetes.io/instance-type: n2-highmem-4 - - display_name: "Medium: up to 16 CPU / 128 GB RAM" - description: *profile_list_description - slug: medium - default: true - profile_options: - requests: - # NOTE: Node share choices are in active development, see comment - # next to profileList: above. - display_name: Node share - choices: - mem_1: - display_name: ~1 GB, ~0.125 CPU - kubespawner_override: - mem_guarantee: 0.903G - cpu_guarantee: 0.013 - mem_2: - display_name: ~2 GB, ~0.25 CPU - kubespawner_override: - mem_guarantee: 1.805G - cpu_guarantee: 0.025 - mem_4: - default: true - display_name: ~4 GB, ~0.5 CPU - kubespawner_override: - mem_guarantee: 3.611G - cpu_guarantee: 0.05 - mem_8: - display_name: ~8 GB, ~1.0 CPU - kubespawner_override: - mem_guarantee: 7.222G - cpu_guarantee: 0.1 - mem_16: - display_name: ~16 GB, ~2.0 CPU - kubespawner_override: - mem_guarantee: 14.444G - cpu_guarantee: 0.2 - mem_32: - display_name: ~32 GB, ~4.0 CPU - kubespawner_override: - mem_guarantee: 28.887G - cpu_guarantee: 0.4 - mem_64: - display_name: ~64 GB, ~8.0 CPU - kubespawner_override: - mem_guarantee: 57.775G - cpu_guarantee: 0.8 - mem_128: - display_name: ~128 GB, ~16.0 CPU - kubespawner_override: - mem_guarantee: 115.549G - cpu_guarantee: 1.6 - kubespawner_override: - cpu_limit: null - mem_limit: null - node_selector: - node.kubernetes.io/instance-type: n2-highmem-16 diff --git a/config/clusters/linked-earth/enc-deployer-credentials.secret.json b/config/clusters/linked-earth/enc-deployer-credentials.secret.json deleted file mode 100644 index 32c362b54..000000000 --- a/config/clusters/linked-earth/enc-deployer-credentials.secret.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "ENC[AES256_GCM,data:fM0dwSxqktu5+IA7KeqZ,iv:fDYiQqkxPGPvmQKyOUEhWJW+vFcjlY3emefpyk3M3QE=,tag:qDCXPNCRAozRIwIyC66L5A==,type:str]", - "project_id": "ENC[AES256_GCM,data:JR/L1UjoIvBLQ/g0LVg3g5g=,iv:msQGhkpH8yEP8kXefPzeaInt/23A6Lgtzm6gjZLpCkg=,tag:4Y4jJzOA3Q0qPZiI3lmNhQ==,type:str]", - "private_key_id": "ENC[AES256_GCM,data:8i0hxHAauFdkN66wUFn0tN9VTiL+CBWrV3uFA67LiqkLKQuqgo6GrQ==,iv:66PABUZZ5RU7aTeHWPQaR7/zFqjIqpv1jpJ3scGRLEw=,tag:hkFkeg4Dj4SUFqps+WhO6w==,type:str]", - "private_key": "ENC[AES256_GCM,data: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,iv:Md91bAoEotqTNDArSVzrymDQmQSqO0ynA+Pilb3OyV4=,tag:WLRAxDs/pftgwpvMvEd0/g==,type:str]", - "client_email": "ENC[AES256_GCM,data:ChUy0OJBTwPUo5WXCQuCwJRkVMO+FzjQxbQBUuwRGdjikBaU6ibCNmu0tWgmUMBzYesMJIjy9lcf09cH,iv:op50EhgPCAEKkMUi2/LtwP4AB4b0F6XJJNjcVq2Waho=,tag:DdH1fygIAQiQFKGFJvJwTg==,type:str]", - "client_id": "ENC[AES256_GCM,data:bgHZ1Ss0f4DeYvs8eAzUHvOLyh39,iv:0eqih2wSPZrFRD3EfuGgJ5uvOkA6i6nJNagtpgslpE4=,tag:AlvnhxJm3Ox7xDvjAwmlwQ==,type:str]", - "auth_uri": "ENC[AES256_GCM,data:nNN7esDcKJtSYDUeRRNJ3Xg0OpkUJ8gfU+31FkEbllM+JGCAEk0hsAg=,iv:YzGU/k5mnIPN49+z2tuDSAbTjn3CLrb80hSNmWevYeQ=,tag:XY52RpRo5SHAThS0sfPmLw==,type:str]", - "token_uri": "ENC[AES256_GCM,data:KUqHhXzTHFGbAzLwmwgh673IvmKQkNt0D/kSasKNrJ1HIgQ=,iv:I2WSXIgw13YQEk5RUhsHJ9zvNKWkSFHn0etr5LxJo0Y=,tag:S8aSO26mEGcXTS4PJ3DrPg==,type:str]", - "auth_provider_x509_cert_url": "ENC[AES256_GCM,data:j+KPIo+6u3Hva8xNdK9Hqn+1ZXJlUVxuRRY/zlPEthpQrTclErc4LZ9S,iv:XZ83hymnUj3spKbbzbuUDfq+LdvKRNI1esFGT4rlsi0=,tag:K41x2U3zWmauwm6lJLi2yQ==,type:str]", - "client_x509_cert_url": "ENC[AES256_GCM,data:urAvHXWedRqAc+n2041hLtKS8/yR1CVF+/9u+ch3ndsvtQpNZ+xMvasiGPzHJohyCwU/UNdelTgeF9bfboayGKADIRw14YriVzyn8DjiHG4IIRA4eIT9kxqufTTVLoTDqPtbecI7v/zpVoiMOkneUg==,iv:mI70rJZPy5wsVejDKGq+sSGiwQR5o9JmOf3nh+mGjfE=,tag:UqsBuAIQuUwhpp0r20PIrg==,type:str]", - "sops": { - "kms": null, - "gcp_kms": [ - { - "resource_id": "projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs", - "created_at": "2022-06-29T11:11:48Z", - "enc": "CiQA4OM7eEYqqU+txMLGlkMXtP/myZN7Q0VAF9X8oq37ROy8iNYSSQBq6cPrcPYNLeGDh9hF0Le3bvsqQOmEb3maA3H9LUdRhlIdFcbLXMd0rK+E8jmuS1N48Z8Yktiir4gUvICjgDk5u95+NRMwniQ=" - } - ], - "azure_kv": null, - "hc_vault": null, - "age": null, - "lastmodified": "2022-06-29T11:11:48Z", - "mac": "ENC[AES256_GCM,data:DloQSbBAqUyUvnczgVIVE7w1TcN8DvzzWnjNpD5XoyR00uQ8y2K2k54N/vRZE2AQEsAqFEGNQMHZo0F7ORz+4ksakf+At3GRQzkmZIZlOOeSK3qWbVhFZz/djM4p+eEkeArDxFIPmM//hnRNC383jIPezzcOSUq/NX4o1gg7jpU=,iv:e6VpOmZ/fWQpcCqoiOwBbtr5eVd9P8fXMxtmmLeo+CI=,tag:71xC+U9GoIUWPXGsVq7uKQ==,type:str]", - "pgp": null, - "unencrypted_suffix": "_unencrypted", - "version": "3.7.3" - } -} \ No newline at end of file diff --git a/config/clusters/linked-earth/enc-grafana-token.secret.yaml b/config/clusters/linked-earth/enc-grafana-token.secret.yaml deleted file mode 100644 index 5414c9040..000000000 --- a/config/clusters/linked-earth/enc-grafana-token.secret.yaml +++ /dev/null @@ -1,15 +0,0 @@ -grafana_token: ENC[AES256_GCM,data:On1aAZfn2PfbSP93kdAPX8mz0s1U0C1CJ8xr5xzwGw0F/FNs6Hp449s6h/t29CxUzyL0AMeE93Ec8vn/Vjb5ed23hP8s5mYoLerODA3qFoykr/3LYDRK3RbERvoxwwv+2H0Zzvd6vrY=,iv:/jcoZCOijJ0Oex9Hx1vlPnj/wE101KKQARPGaGBcLUg=,tag:KNbiHueFXQffRDV+tlBZpA==,type:str] -sops: - kms: [] - gcp_kms: - - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs - created_at: "2022-06-30T08:39:17Z" - enc: CiQA4OM7eKTATdfFQh9hIxdgpRHr7g8F5VRyZW2Wxe8HZDt6Lc8SSQBq6cPrYkoSvN8ogr4Ftr7FIIIGEbvgtazMmHD418Cr/xhIn/MFWUkEGfb8Ug6BqgxlC1z9KfJae3ofJSxCF83STeXrAIkJWao= - azure_kv: [] - hc_vault: [] - age: [] - lastmodified: "2022-06-30T08:39:17Z" - mac: ENC[AES256_GCM,data:Bk77RJ5zB5Mvoe87f+ELn+YGndAtr5b7MclZBFh/NaUE0noGgkULtl5kw6C5exWXbgT2Nh0pXbWDYnFbrW/gsOZ41q/fqnLkThwKMR6AAacgm8dQbdrxTdIC3X1i88CTTpQpCrD9Hek3XuDrEo6yKUR3sb1b+h9p9EtQZYsDskI=,iv:YqNewf6euiHrjfbGC+DlufDmL9EMUymkWZGnlTpX1mM=,tag:TR5vn0wLJnVulZXHXNLXeA==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.7.3 diff --git a/config/clusters/linked-earth/enc-prod.secret.values.yaml b/config/clusters/linked-earth/enc-prod.secret.values.yaml deleted file mode 100644 index 36864bac4..000000000 --- a/config/clusters/linked-earth/enc-prod.secret.values.yaml +++ /dev/null @@ -1,21 +0,0 @@ -basehub: - jupyterhub: - hub: - config: - GitHubOAuthenticator: - client_id: ENC[AES256_GCM,data:P5G2FAhGdLmCj5CABYszgOqedTg=,iv:G9qULQ64WAWclqWmatMvoQwT44EZ8VFOzDeQGg15JQo=,tag:5zIWk09ZUI0BVdFYXhz2DQ==,type:str] - client_secret: ENC[AES256_GCM,data:cVHZq76q9oilVL6nw/db8m69Hhl6qnzCeCRwCb/0pPnFmXv0MP/hGg==,iv:cGLGvgVVoU0sp5YtG2bJpDdh5i+aNH+av+TIq18anHk=,tag:bHx+ABwo4nrkymv7tbmBPw==,type:str] -sops: - kms: [] - gcp_kms: - - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs - created_at: "2022-07-01T08:59:02Z" - enc: CiQA4OM7eG5CdSfVBYBYhxap4xOj8vZQHEnJjc8YAJHD+mFMdrsSSQBq6cPrHRLDKcxYpfa3BCYwIQCPD3evOR2FkHHHZ3+8aU6GtWQDW4iJjeoMoSql0aznnSUwUWd1bBG28jX4yismXvF1h1hxC/c= - azure_kv: [] - hc_vault: [] - age: [] - lastmodified: "2022-07-01T08:59:03Z" - mac: ENC[AES256_GCM,data:p4JrRnq3doEb720hblhjEiJ3r9Fe875Ug3B71JpF8NwtdRrAWd5OvacV8C57TnhD9EWsHgRMYZBSsiVGqlRUb6p6sc1HGkBenzAK+1Pe/KNrAUwQPpMXxLjlYs7IdY6tq+Mo4mUE+HZOL8OeWbvTLZSaePrl+KjFI/+2kk0lfk0=,iv:JaHL6vo7JvQiUnHqegqqP9g5hHtaEjVyNavj88OykM4=,tag:d6uL3Vw6ySgd5anfVNN6wA==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.7.3 diff --git a/config/clusters/linked-earth/enc-staging.secret.values.yaml b/config/clusters/linked-earth/enc-staging.secret.values.yaml deleted file mode 100644 index 90460291c..000000000 --- a/config/clusters/linked-earth/enc-staging.secret.values.yaml +++ /dev/null @@ -1,21 +0,0 @@ -basehub: - jupyterhub: - hub: - config: - GitHubOAuthenticator: - client_id: ENC[AES256_GCM,data:oKOnvy8IknMMDD4o31BWn5FKAbM=,iv:tB0qcPYHmDZXUM8KgXHHgucc/GupVhjQfcPU7RY7XM0=,tag:1UHxFs2d6VDb5uVKXyVYKg==,type:str] - client_secret: ENC[AES256_GCM,data:jArz/7TQZlarhxWajHNzptgujsBSsap8BBLhTloUcgl82e4YR7Hakw==,iv:/V2WR42z/gYMb9nmdI99ki79VOIbnoErIM6ToRdCx64=,tag:OQ94h1u4WnTNmfrMrpkSMA==,type:str] -sops: - kms: [] - gcp_kms: - - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs - created_at: "2022-07-01T09:10:39Z" - enc: CiQA4OM7eGc7wu7hIMZvHlPQkKiAqTm909DNdTj8suH0Zhgvx6oSSQBq6cPrtRjwPFGkqXtBFHv2SHKWmwNSGypFcd9wFbdqIWk5qTq6eE4ry6SalPb7TebHTKuqGjlMY921QpTU9x/mUq8LZb63QKY= - azure_kv: [] - hc_vault: [] - age: [] - lastmodified: "2022-07-01T09:10:40Z" - mac: ENC[AES256_GCM,data:JsadQ8TZBpQBmEiVL9yzYIuTh/r+Gifkrit8ic+gce5ie19JWyfFtULZMB0XH8V+KGnP6fMdIrIS26/9mEEnUYCDfOq3eUb6Tn7OXQZc8aWiTd0IGKRNEjCWbMVKCpMcF2xFPpYGl0DyArT1GqEh58Mk3ZvL7MhmH9WBvMVsFeQ=,iv:Q+dD4fu7Zk//nkOR+DGklTXBt/0TWsKesR4cx0W2+sM=,tag:XC568fUyy3TBsRIMLhk33A==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.7.3 diff --git a/config/clusters/linked-earth/enc-support.secret.values.yaml b/config/clusters/linked-earth/enc-support.secret.values.yaml deleted file mode 100644 index d91ca628e..000000000 --- a/config/clusters/linked-earth/enc-support.secret.values.yaml +++ /dev/null @@ -1,22 +0,0 @@ -prometheusIngressAuthSecret: - username: ENC[AES256_GCM,data:KvJa9NuUXutQ4ZkCP56KbfyD+Si+TMTb6iplc1i3FJ9u9q6qfB5gtL6g52CzNwttegicb7fuD//Fn9IhdfiyBg==,iv:Zbt/i1rHXTNMVXrrqTbLqjE2sdMG5zzIOHgJrHIVH+I=,tag:IwhOr90toCsjbjWsQbpQzw==,type:str] - password: ENC[AES256_GCM,data:58zXLP3t6nSj7vwE1teMkZNbC3N9BhVDuJ70nZ838ZjJpgUkfnOU7pS/QyAvae4QIzqloCpNosev4gANmj+ylw==,iv:PJA1/2OEEY0OrQaUVRBffIKSzNTY/j8vTtN/SXFAnG4=,tag:oP7nz0PFC0VhLPK2WmWm7Q==,type:str] -grafana: - grafana.ini: - auth.github: - client_id: ENC[AES256_GCM,data:sHHDZo9zySW+qgpXlELt7vSEe/A=,iv:65Hf1AuTTT/NceeTZjhxG97RWDpe+eKle5MJwwLrJFI=,tag:gIw51rQambcqfeUV1UWnxQ==,type:str] - client_secret: ENC[AES256_GCM,data:QFLasNiwqX3dVnLWwViQHwM6MMhdNspOMxY+hV+TuF9dlaQLwDEqng==,iv:r/aLpr+2+LA9GCyayOe2+yDWk6ZoajSZKzUc2A9kMmo=,tag:hAlGz1RDWyJ34HeLbpkNZw==,type:str] -sops: - kms: [] - gcp_kms: - - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs - created_at: "2022-06-28T10:36:14Z" - enc: CiQA4OM7eCB2dHLde+svelxPR8yBrzX5oPkt0kzYJOuzvShDlUkSSQBq6cPr3M/p4TFL8GJQJbscc6uXiyOm1/O1i594hYjA2/1G2gR1doBcgPWC2jiQ5oETheXRB4q1oTa7uC3nA3foNbZ5zZ/zJyQ= - azure_kv: [] - hc_vault: [] - age: [] - lastmodified: "2023-02-08T14:03:38Z" - mac: ENC[AES256_GCM,data:zcYg/gNHre+kftU9sk0aAkaaPmaCxG/SWiv9Rbq8V/LIThxMRf5trD42EFwssFkvavWnxAc3+6pNKdZgGvuz5C2r8woBhfN+HChjpKNn48SygchOcWs+Hv2yG7ygAHZRe08RkabQDVYMDVL6Sagem+NaHM5se3qFIJ9xB/HPR4I=,iv:aZDX15aKvYtW3z96baS7QY4QVYJxAI5Q8WhRipK4kYA=,tag:26mnsGGgpLlr/xH+B5a2yA==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.7.2 diff --git a/config/clusters/linked-earth/prod.values.yaml b/config/clusters/linked-earth/prod.values.yaml deleted file mode 100644 index c6f753a9a..000000000 --- a/config/clusters/linked-earth/prod.values.yaml +++ /dev/null @@ -1,18 +0,0 @@ -basehub: - userServiceAccount: - annotations: - iam.gke.io/gcp-service-account: linked-earth-prod@linked-earth-hubs.iam.gserviceaccount.com - jupyterhub: - ingress: - hosts: [linkedearth.2i2c.cloud] - tls: - - hosts: [linkedearth.2i2c.cloud] - secretName: https-auto-tls - singleuser: - extraEnv: - SCRATCH_BUCKET: gs://linked-earth-scratch/$(JUPYTERHUB_USER) - PANGEO_SCRATCH: gs://linked-earth-scratch/$(JUPYTERHUB_USER) - hub: - config: - GitHubOAuthenticator: - oauth_callback_url: "https://linkedearth.2i2c.cloud/hub/oauth_callback" diff --git a/config/clusters/linked-earth/staging.values.yaml b/config/clusters/linked-earth/staging.values.yaml deleted file mode 100644 index b705e29fd..000000000 --- a/config/clusters/linked-earth/staging.values.yaml +++ /dev/null @@ -1,18 +0,0 @@ -basehub: - userServiceAccount: - annotations: - iam.gke.io/gcp-service-account: linked-earth-staging@linked-earth-hubs.iam.gserviceaccount.com - jupyterhub: - ingress: - hosts: [staging.linkedearth.2i2c.cloud] - tls: - - hosts: [staging.linkedearth.2i2c.cloud] - secretName: https-auto-tls - singleuser: - extraEnv: - SCRATCH_BUCKET: gs://linked-earth-scratch-staging/$(JUPYTERHUB_USER) - PANGEO_SCRATCH: gs://linked-earth-scratch-staging/$(JUPYTERHUB_USER) - hub: - config: - GitHubOAuthenticator: - oauth_callback_url: "https://staging.linkedearth.2i2c.cloud/hub/oauth_callback" diff --git a/config/clusters/linked-earth/support.values.yaml b/config/clusters/linked-earth/support.values.yaml deleted file mode 100644 index 649bbf0d9..000000000 --- a/config/clusters/linked-earth/support.values.yaml +++ /dev/null @@ -1,28 +0,0 @@ -prometheusIngressAuthSecret: - enabled: true - -prometheus: - server: - ingress: - enabled: true - hosts: - - prometheus.linkedearth.2i2c.cloud - tls: - - secretName: prometheus-tls - hosts: - - prometheus.linkedearth.2i2c.cloud - -grafana: - grafana.ini: - server: - root_url: https://grafana.linkedearth.2i2c.cloud/ - auth.github: - enabled: true - allowed_organizations: 2i2c-org LinkedEarth - ingress: - hosts: - - grafana.linkedearth.2i2c.cloud - tls: - - secretName: grafana-tls - hosts: - - grafana.linkedearth.2i2c.cloud diff --git a/terraform/gcp/projects/linked-earth.tfvars b/terraform/gcp/projects/linked-earth.tfvars deleted file mode 100644 index d647638ff..000000000 --- a/terraform/gcp/projects/linked-earth.tfvars +++ /dev/null @@ -1,75 +0,0 @@ -prefix = "linked-earth" -project_id = "linked-earth-hubs" - -zone = "us-central1-c" -region = "us-central1" - -# Cloud costs for this project are not passed through by 2i2c -budget_alert_enabled = false -billing_account_id = "" - -k8s_versions = { - min_master_version : "1.29.1-gke.1589018", - core_nodes_version : "1.29.1-gke.1589018", - notebook_nodes_version : "1.29.1-gke.1589018", - dask_nodes_version : "1.29.1-gke.1589018", -} - -core_node_machine_type = "n2-highmem-4" -enable_network_policy = true - -user_buckets = { - "scratch-staging" : { - "delete_after" : 7 - }, - "scratch" : { - "delete_after" : 7 - } -} - -# Setup notebook node pools -notebook_nodes = { - "n2-highmem-4" : { - min : 0, - max : 100, - machine_type : "n2-highmem-4", - }, - "n2-highmem-16" : { - min : 0, - max : 100, - machine_type : "n2-highmem-16", - }, - "n2-highmem-64" : { - min : 0, - max : 100, - machine_type : "n2-highmem-64", - } -} - -# Setup a single node pool for dask workers. -# -# A not yet fully established policy is being developed about using a single -# node pool, see https://github.com/2i2c-org/infrastructure/issues/2687. -# -dask_nodes = { - "n2-highmem-16" : { - min : 0, - max : 100, - machine_type : "n2-highmem-16", - } -} - -hub_cloud_permissions = { - "staging" : { - allow_access_to_external_requester_pays_buckets : false, - bucket_admin_access : ["scratch-staging"], - hub_namespace : "staging" - }, - "prod" : { - allow_access_to_external_requester_pays_buckets : false, - bucket_admin_access : ["scratch"], - hub_namespace : "prod" - } -} - -container_repos = []