From 8e76c41ee18ebd97ec2fb6a8629a51c91e12dcab Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Tue, 27 Feb 2024 10:48:22 +0000 Subject: [PATCH 1/5] Remove staging hub config files --- config/clusters/callysto/cluster.yaml | 8 -------- .../callysto/enc-staging.secret.values.yaml | 20 ------------------- config/clusters/callysto/staging.values.yaml | 13 ------------ 3 files changed, 41 deletions(-) delete mode 100644 config/clusters/callysto/enc-staging.secret.values.yaml delete mode 100644 config/clusters/callysto/staging.values.yaml diff --git a/config/clusters/callysto/cluster.yaml b/config/clusters/callysto/cluster.yaml index 642a726781..db6dafbfb6 100644 --- a/config/clusters/callysto/cluster.yaml +++ b/config/clusters/callysto/cluster.yaml @@ -12,14 +12,6 @@ support: - support.values.yaml - enc-support.secret.values.yaml hubs: - - name: staging - display_name: "Callysto Staging" - domain: staging.callysto.2i2c.cloud - helm_chart: basehub - helm_chart_values_files: - - common.values.yaml - - staging.values.yaml - - enc-staging.secret.values.yaml - name: prod display_name: "Callysto Prod" domain: 2i2c.callysto.ca diff --git a/config/clusters/callysto/enc-staging.secret.values.yaml b/config/clusters/callysto/enc-staging.secret.values.yaml deleted file mode 100644 index 6769201b13..0000000000 --- a/config/clusters/callysto/enc-staging.secret.values.yaml +++ /dev/null @@ -1,20 +0,0 @@ -jupyterhub: - hub: - config: - CILogonOAuthenticator: - client_id: ENC[AES256_GCM,data:hUwFQGdeR8v3E8f1QIf0CWS3VIL/CMVjd8n6dZbkIi9PcoKfSEnTBXCgqBVcB0Qq9Fg=,iv:CUPKWHMIeOHJy0QKwQZbKn+tbh6tIAMbC73HMGDGJyk=,tag:ZpYhXNXoANURxlwtoTtyrQ==,type:str] - client_secret: ENC[AES256_GCM,data:M7xNlBrWqmOOt8B/v0HhisBlX3haZWFnQOPoucQdUtq+J0rjE5NdlY3t5XrFBdzBUM1l8Szc1OucJunpLRaMH9Mk7nYsK2dOtS8/JjJq7vASJPLIZ+o=,iv:ycH+HJwoEViPaxXQCOVBQ5uHmyzKCIVLK8VpLIY4r2A=,tag:T9W84ealMLHFIG3zSQl3lw==,type:str] -sops: - kms: [] - gcp_kms: - - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs - created_at: "2022-08-26T07:06:08Z" - enc: CiQA4OM7eOcDPtgayKH1sVxMED3Sdo++ww+ytiPWDa9bTIBiFG0SSQDuy/p8rfPkrcELUB/ZZPtsacL2beuCL4m/qHeavx0xj9jZv/dHsvLNfyoXpBsMYSkKTcW2pzvZbXRR7VAGlJIsx3bA3cK5lCs= - azure_kv: [] - hc_vault: [] - age: [] - lastmodified: "2022-08-26T07:06:09Z" - mac: ENC[AES256_GCM,data:4zjXLg6CaYq3RC/1g7eS05aTDPKAIMnDcAWuHXQUmp/mPM774urSXz/eKc587tEoWlERKgljVMbOmr59hExa0Qt05LizsbMoSEo4V/a/aJcYeas0fbSZ5oJbD7IcBkqb4oYX0CKN8ILXtKC67NooD2etbpN9FNC2am5IE7FmYmE=,iv:RpxlPYb6y2UPWL3IR/5hTmhIWgEcSNWQmZJE18uIncg=,tag:KIGvvpo0S1Lq3v4ohHHXSQ==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.7.3 diff --git a/config/clusters/callysto/staging.values.yaml b/config/clusters/callysto/staging.values.yaml deleted file mode 100644 index 79bc6089fa..0000000000 --- a/config/clusters/callysto/staging.values.yaml +++ /dev/null @@ -1,13 +0,0 @@ -jupyterhub: - ingress: - hosts: [staging.callysto.2i2c.cloud] - tls: - - hosts: [staging.callysto.2i2c.cloud] - secretName: https-auto-tls - hub: - config: - CILogonOAuthenticator: - oauth_callback_url: https://staging.callysto.2i2c.cloud/hub/oauth_callback - custom: - homepage: - gitRepoBranch: "callysto-staging" From b9346a4049794206a5fb9a8689f5af5483219534 Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Tue, 27 Feb 2024 12:57:13 +0000 Subject: [PATCH 2/5] Remove prod hub config files --- config/clusters/callysto/cluster.yaml | 10 +- config/clusters/callysto/common.values.yaml | 100 ------------------ .../callysto/enc-prod.secret.values.yaml | 20 ---- config/clusters/callysto/prod.values.yaml | 13 --- 4 files changed, 1 insertion(+), 142 deletions(-) delete mode 100644 config/clusters/callysto/common.values.yaml delete mode 100644 config/clusters/callysto/enc-prod.secret.values.yaml delete mode 100644 config/clusters/callysto/prod.values.yaml diff --git a/config/clusters/callysto/cluster.yaml b/config/clusters/callysto/cluster.yaml index db6dafbfb6..55acfbc1f8 100644 --- a/config/clusters/callysto/cluster.yaml +++ b/config/clusters/callysto/cluster.yaml @@ -11,12 +11,4 @@ support: helm_chart_values_files: - support.values.yaml - enc-support.secret.values.yaml -hubs: - - name: prod - display_name: "Callysto Prod" - domain: 2i2c.callysto.ca - helm_chart: basehub - helm_chart_values_files: - - common.values.yaml - - prod.values.yaml - - enc-prod.secret.values.yaml +hubs: [] diff --git a/config/clusters/callysto/common.values.yaml b/config/clusters/callysto/common.values.yaml deleted file mode 100644 index 11d3dab4ef..0000000000 --- a/config/clusters/callysto/common.values.yaml +++ /dev/null @@ -1,100 +0,0 @@ -nfs: - enabled: true - pv: - mountOptions: - - soft # We pick soft over hard, so NFS lockups don't lead to hung processes - - noatime - # Google FileStore IP - serverIP: 10.93.235.178 - # Name of Google Filestore share - baseShareName: /homes/ -jupyterhub: - custom: - 2i2c: - # add_staff_user_ids_to_admin_users is disabled because the usernames - # aren't github id or email based, individual 2i2c members have added - # their user to admin_users manually instead. - add_staff_user_ids_to_admin_users: false - # add_staff_user_ids_of_type: "google" - homepage: - templateVars: - org: - name: Callysto - url: https://www.callysto.ca - logo_url: https://www.callysto.ca/wp-content/uploads/2022/08/Callysto-HUB_vertical.png - designed_by: - name: 2i2c - url: https://2i2c.org - operated_by: - name: 2i2c - url: https://2i2c.org - funded_by: - name: Callysto - url: https://www.callysto.ca - singleuser: - extraFiles: - tree.html: - mountPath: /usr/local/share/jupyter/custom_template/tree.html - stringData: | - {% extends "templates/tree.html" %} - {% block header %} - - {% endblock %} - {% block logo %} - CallystoHub - {% endblock %} - notebook.html: - mountPath: /usr/local/share/jupyter/custom_template/notebook.html - stringData: | - {% extends "templates/notebook.html" %} - {% block logo %} - CallystoHub - {% endblock %} - hub: - config: - JupyterHub: - authenticator_class: cilogon - CILogonOAuthenticator: - allowed_idps: - http://google.com/accounts/o8/id: - default: true - username_derivation: - username_claim: "oidc" - allowed_domains_claim: email - allowed_domains: &allowed_domains - - 2i2c.org - - btps.ca - - callysto.ca - - cssd.ab.ca - - cybera.ca - - eics.ab.ca - - eips.ca - - epsb.ca - - fmpsd.ab.ca - - fmcsd.ab.ca - - rvschools.ab.ca - - spschools.org - - wsrd.ca - - ucalgary.ca - - ualberta.ca - - cfis.com - - "*.ca" - http://login.microsoftonline.com/common/oauth2/v2.0/authorize: - username_derivation: - username_claim: "oidc" - allowed_domains_claim: email - allowed_domains: *allowed_domains - # Usernames are based on a unique "oidc" claim and not email, so we need - # to reference these names when declaring admin_users. - admin_users: - - "117859169473992122769" # Georgiana (2i2c) - - "115722756968212778437" # Sarah (2i2c) - - "103849660365364958119" # Erik (2i2c) - - "115240156849150087300" # Ian Allison (PIMS) - - "102749090965437723445" # Byron Chu (Cybera) - - "115909958579864751636" # Michael Jones (Cybera) - - "106951135662332329542" # Elmar Bouwer (Cybera) diff --git a/config/clusters/callysto/enc-prod.secret.values.yaml b/config/clusters/callysto/enc-prod.secret.values.yaml deleted file mode 100644 index 92ac96c58a..0000000000 --- a/config/clusters/callysto/enc-prod.secret.values.yaml +++ /dev/null @@ -1,20 +0,0 @@ -jupyterhub: - hub: - config: - CILogonOAuthenticator: - client_id: ENC[AES256_GCM,data:hDvmVElKOzOit25g/6dwr8cuxtxomTTWGau98geXsCYUImn/ah7jSQVk4ThEuICT99Ur,iv:9mLxAJE/6+BDns4frcx/+b3khNPvmR8fb+1a75gboe4=,tag:hRvx43HTMv6RR/qyFHfFkw==,type:str] - client_secret: ENC[AES256_GCM,data:pfuxypyKp0gLyadQLTW/4Us3eFT2Gq1LFVVR2XuI5OrLSJ/1r/9ZxjyfudzeHVIt0uj+TBMzIm3KZy0iuxUVC37xxWdNT4edqfWKS0DzourtWNjw7hI=,iv:ZEFOAjCiOHcECHhYhZGdEvkzgimIPp6IbnaNcRzJDmQ=,tag:XTKAl/cKyUVMoYI0RhWyyQ==,type:str] -sops: - kms: [] - gcp_kms: - - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs - created_at: "2022-09-01T08:14:40Z" - enc: CiQA4OM7eBuDtViKx8a4ai2VE6WlL5Egd8jfhl9dQyxoKHzxc58SSQDuy/p8FNJmSh+QHjrmZ0CwdBcXPmDDIUWVl+pOvPkeKXf9BUhBlKDXs/UVn6JbXDlxYMOVuWRrtPUTxK4+RqofYCxEXlLFBuE= - azure_kv: [] - hc_vault: [] - age: [] - lastmodified: "2022-09-01T08:14:40Z" - mac: ENC[AES256_GCM,data:hrzSUn7szHDXUdbmwCiNXaz1Yyn2gF/QVToYwaKSD6jZX459viLWcJwcBcGDdhC7EoycpPaEhCf88xsRC7aJaWq/xhHjGgcxC8MxKjyBQYBx5CKFmrYwOhxrlJuVBnM80kgXoi+EHKlzVf/2k2Y6unCqKyjs2cPx/H8R00a7/NQ=,iv:84Ik3Jd7+XSk3ldBMnwlRAPL1bPc0MMwq/QXl7nHXwg=,tag:+fnpq1dgvamKhkWqKeyAdw==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.7.3 diff --git a/config/clusters/callysto/prod.values.yaml b/config/clusters/callysto/prod.values.yaml deleted file mode 100644 index 08edda058e..0000000000 --- a/config/clusters/callysto/prod.values.yaml +++ /dev/null @@ -1,13 +0,0 @@ -jupyterhub: - ingress: - hosts: [2i2c.callysto.ca] - tls: - - hosts: [2i2c.callysto.ca] - secretName: https-auto-tls - hub: - config: - CILogonOAuthenticator: - oauth_callback_url: https://2i2c.callysto.ca/hub/oauth_callback - custom: - homepage: - gitRepoBranch: "callysto-prod" From f222528dcac89a9344b144439a9965d2e2c668e7 Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Tue, 27 Feb 2024 13:28:24 +0000 Subject: [PATCH 3/5] Remove the cluster files --- config/clusters/callysto/cluster.yaml | 14 --------- .../enc-deployer-credentials.secret.json | 30 ------------------- .../callysto/enc-grafana-token.secret.yaml | 15 ---------- .../callysto/enc-support.secret.values.yaml | 22 -------------- config/clusters/callysto/support.values.yaml | 28 ----------------- 5 files changed, 109 deletions(-) delete mode 100644 config/clusters/callysto/cluster.yaml delete mode 100644 config/clusters/callysto/enc-deployer-credentials.secret.json delete mode 100644 config/clusters/callysto/enc-grafana-token.secret.yaml delete mode 100644 config/clusters/callysto/enc-support.secret.values.yaml delete mode 100644 config/clusters/callysto/support.values.yaml diff --git a/config/clusters/callysto/cluster.yaml b/config/clusters/callysto/cluster.yaml deleted file mode 100644 index 55acfbc1f8..0000000000 --- a/config/clusters/callysto/cluster.yaml +++ /dev/null @@ -1,14 +0,0 @@ -name: callysto -provider: gcp # https://console.cloud.google.com/kubernetes/clusters/details/northamerica-northeast1/callysto-cluster/details?project=callysto-202316 -gcp: - key: enc-deployer-credentials.secret.json - project: callysto-202316 - cluster: callysto-cluster - zone: northamerica-northeast1 - billing: - paid_by_us: false -support: - helm_chart_values_files: - - support.values.yaml - - enc-support.secret.values.yaml -hubs: [] diff --git a/config/clusters/callysto/enc-deployer-credentials.secret.json b/config/clusters/callysto/enc-deployer-credentials.secret.json deleted file mode 100644 index e3189cb9b3..0000000000 --- a/config/clusters/callysto/enc-deployer-credentials.secret.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "ENC[AES256_GCM,data:jLxq+8Yw1WQf2LeGKDqJ,iv:mvsyVv2DbvlOWzeus8vfipBjWtK18d7ncgd5xmzC7yU=,tag:bZ+/QPlyd4kELjDqmMZ0gg==,type:str]", - "project_id": "ENC[AES256_GCM,data:/oT3AuZ/PaFUGVyJqvTQ,iv:sHphaqeS4FEBIKvaoi5vh617Z3YN42GMABzYWAsE1Cc=,tag:qR9XPC/pQsSvfv64W7Vq5g==,type:str]", - "private_key_id": "ENC[AES256_GCM,data:1z7ZI2Ca9Is/S6Sd+/i5x5ToKTZlhnimR4AF7i078wG1/T3Rn/z08g==,iv:GWDlub5VKcThxJ4GgSEJftKY/GoT2J+Y9NuJeZyJlko=,tag:NocH+qc9QDpMKSUwoZE9dw==,type:str]", - "private_key": "ENC[AES256_GCM,data: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,iv:QlmlLCJvkXH1fh2V9n+0Ud2bwiCSbNeLe8Sx6Al+t/k=,tag:B2QJN3oF8Sxvc2VfQRQJ5w==,type:str]", - "client_email": "ENC[AES256_GCM,data:7o95KOWmXHMBx5+I7cNLpZPGJ8ALp0C5est9tam8puEn4jGQwMI+LVuL5F8CJ2f72isEmv8p,iv:5nxtrHsqVfmcfKDQAog4i2KChyNVgX8zBnRJfOyubX4=,tag:TFVkcNYsf+/ZkD3qkUkIqw==,type:str]", - "client_id": "ENC[AES256_GCM,data:ViNSS/FEkNzc/DG2luTXtLgAyyS7,iv:k0o8k8J/mlLlvSleltA9oQbbxHGPedd7YCjdwWLUC1I=,tag:5b2wv7dmWXkCA6DKL+fZtg==,type:str]", - "auth_uri": "ENC[AES256_GCM,data:L0DSSF7MsP7Jm/zfRYvc12Ig2rSwi+IUOLCTYuSp5iRjEgD/8qz6cBk=,iv:p+JiUJ1Trswbsq+UYgmGBeYqIt2Qpgmhix3seQMVnuI=,tag:M50xJagDNsWqPgCYac3aiw==,type:str]", - "token_uri": "ENC[AES256_GCM,data:FNgE3aClBnbjhOgcjum5cp8GBx7F6SFsHR0SHfgTT5fUhR8=,iv:CjYp2WJG/wVDZ7U5XnwmLycAidWgoCX9EM5qjHRnbuA=,tag:+2mAUgk9YIK6QNBvYMIIRA==,type:str]", - "auth_provider_x509_cert_url": "ENC[AES256_GCM,data:8eyI6CuYG1KZTUasBazXkwtjqLFMCboArHkLcvPdbY1tpjac1A+SnUon,iv:jdWStvR6KL/YGZToBXlHj+2TVmk9EUEqO9IoF/d12MQ=,tag:dyZFN6hzqQ7yDefOcVvIEw==,type:str]", - "client_x509_cert_url": "ENC[AES256_GCM,data:EWPsqxfyY0RqwE1ptObkSw5uEuanRwPGAHj5ySt2DZ1+WbhQzE/ZhEqFWaBE3ZYgaws8K2SOTo6IJdNrPKpv6MeMKJzyKAvWD2GojbNU+l34fx1BbChw2HBDozCWZRzqP+SkRquAF41yXg==,iv:w1nNA7HMlu+BenWhNKY2Cb5/GStIFDfUTQGGbt/clL4=,tag:cFRPU+oxuOPjFCk6QTNpPw==,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-08-25T10:53:25Z", - "enc": "CiQA4OM7eJb89U2i9YVone8gQ3u7TZuRon9jLWD0rSWwkvGHqo8SSQDuy/p8LqA/v+aDq09ittMSQUdaRLjOptN/Em1+4OkLeSzFx4jeBWJ27qTqv+bhfQqyEBEVfcPJYAiiDqQsw/GmBTjs1BIQboc=" - } - ], - "azure_kv": null, - "hc_vault": null, - "age": null, - "lastmodified": "2022-08-25T11:28:14Z", - "mac": "ENC[AES256_GCM,data:6TUvA+akSeL+Nnuq4MFjRXyv33SlEPj1MtqBej38eBV4aUs3ssqxiLxQiyfRH+61sqtHazZq1o4r9i0YVkhkv37iauApyctQeeh0WFAMXKfmuBf9pQHsYToP9rcAj/fmMrWM35AU4jLNl+ChcJNSy97k59laNYu1FK2u2kq2DVg=,iv:1kf/lWoD8JBJhaB/nOA1tqKNw7BtAinVUughjuVuZz0=,tag:AumEJbN3sQQ3SCGl/SofLQ==,type:str]", - "pgp": null, - "unencrypted_suffix": "_unencrypted", - "version": "3.7.3" - } -} diff --git a/config/clusters/callysto/enc-grafana-token.secret.yaml b/config/clusters/callysto/enc-grafana-token.secret.yaml deleted file mode 100644 index a202eeb7c6..0000000000 --- a/config/clusters/callysto/enc-grafana-token.secret.yaml +++ /dev/null @@ -1,15 +0,0 @@ -grafana_token: ENC[AES256_GCM,data:lpFQ/cYY5blAhNAZ0ANG9AXmoUEjTXcPtvxEQsxvTJwkd+HCq7h+bTnyyS2N62fF059KOVOzDa6WELCT0uwx0p3kgTjN2CvtRY2asBpwxMySxAhrodvMWYYFmFuPRT+sh4M8o+vKpzAn+LQ3,iv:2FEtw1DkowLMeYslLHXCqoaIngfrxyw7fSSsnDLcX3s=,tag:OsxPJraC2PhmwQby2pyRSQ==,type:str] -sops: - kms: [] - gcp_kms: - - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs - created_at: "2022-08-25T19:48:34Z" - enc: CiQA4OM7eNtEJVA9HZFHSJnoWCJFJcqq5SXnuwhx3CsZ5Vifjh8SSQDuy/p8FzcrFbYdXV4CzEhdRN0WnftfQygFe70+TWoh2wslepnl5QQ1fLr0fWxrfORLFmUDdb4wZi67LIhFrBV8gTCYd+QSrpk= - azure_kv: [] - hc_vault: [] - age: [] - lastmodified: "2022-08-25T19:48:35Z" - mac: ENC[AES256_GCM,data:e8TcGvhEWdKQh3kiNk8KxNAqmHctUeecm1WEpErstmuZIqm20Ayd2povxpzWGtXv7OKiBiBVJacbx6VnFv/X2NZAUNIal3mGTgu2XOiCcjaZQrxLSkjBskS/2qSaa874Hd+Q35t0XZ93u3nbQWD1zbyWnY3NThXG0msnVQ3eC3c=,iv:x57QXWh1nNz1WCzOSeyWnGolX7G966XlTi9jqvUQKzE=,tag:kPSD2+tkVAvFd23qMwjLKQ==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.7.3 diff --git a/config/clusters/callysto/enc-support.secret.values.yaml b/config/clusters/callysto/enc-support.secret.values.yaml deleted file mode 100644 index d7f7c68ed1..0000000000 --- a/config/clusters/callysto/enc-support.secret.values.yaml +++ /dev/null @@ -1,22 +0,0 @@ -prometheusIngressAuthSecret: - username: ENC[AES256_GCM,data:PRxijXnlvkmjCkQyK/I+l2wWbaDkaJP94EmX7URKnBwZgokrPVG8azrHDJt5lEGo5PhX6waXTLHVgpK+ocP3Kg==,iv:HOVnan28Mpfg0X8jo284ZVdHUtV1CmgW3fR3hd+Vah8=,tag:vc2rLFUvs/p6JpoaIvQp5Q==,type:str] - password: ENC[AES256_GCM,data:mKNG8ASGy/G0fR3i6iOumvofaecFsT/lgZgKf3EitAz/bjqZ1MS4ofV73TQDdfxPx8/xYXjg1xH37mWd9s19aw==,iv:2AWZ1wnbBY+MFxtfu9SKPykIU6zih+7a+VhvTxWKM3A=,tag:uEH9uCPrIjywqcC53CZZTQ==,type:str] -grafana: - grafana.ini: - auth.github: - client_id: ENC[AES256_GCM,data:KuO3irah/twI6TQucSyppd9oLg8=,iv:D4Z9iipzgb3J9nZ8hv+Jv66R0Mi0iEFbMKambqTalRY=,tag:E9Ml95cTLk8PtwgWjS0TjQ==,type:str] - client_secret: ENC[AES256_GCM,data:Gn6XVtOQlRGw7qS6ctFWUwPDV8dsH87Epx1V6DIDuCylssZBq+W0Yw==,iv:3hF7N7QMzYQL1BAg/zwsofCZ4Wz3ulhLqiJ1BZzqlC8=,tag:dr5ryYXOJ6fr4/G/e+mMRw==,type:str] -sops: - kms: [] - gcp_kms: - - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs - created_at: "2022-08-25T11:12:05Z" - enc: CiQA4OM7eEd2fDWFZwDNAGHxtrOPsIVHXHJuJAAGI3LveTlj5kMSSQDuy/p8fj5K2nUPys2R/te2CsQxDY1yHAMwfYWqx7bFI1Fb6i4GMGbUMvsdd6iiiSIscQnU1CJvKhGRvr4ABt5IeP2MHTTfPhc= - azure_kv: [] - hc_vault: [] - age: [] - lastmodified: "2023-02-08T14:00:05Z" - mac: ENC[AES256_GCM,data:E/VDvnHvE1CjjR4uYo0LS3dNo8uEG3Cp4IEp/WIWPDSAYWfCiMMGQSwXQCmFtZyjhQ+0Ve+nbfzsmXTNfCobzadStzA938uvT3L1i/hGpUne0CBCninyRERd0h8jkzbs2l9kDFMDIQEEkSet0OfRVg3yl0956o06ocQzcdd9jWY=,iv:iq44FBwxVud/1KYkWodQEdrXjHnn0VBnMlAlbfdkIl0=,tag:6n/kYOqwtgExIdLtD7MCiQ==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.7.3 diff --git a/config/clusters/callysto/support.values.yaml b/config/clusters/callysto/support.values.yaml deleted file mode 100644 index 82f9b12ede..0000000000 --- a/config/clusters/callysto/support.values.yaml +++ /dev/null @@ -1,28 +0,0 @@ -prometheusIngressAuthSecret: - enabled: true - -prometheus: - server: - ingress: - enabled: true - hosts: - - prometheus.callysto.2i2c.cloud - tls: - - secretName: prometheus-tls - hosts: - - prometheus.callysto.2i2c.cloud - -grafana: - grafana.ini: - server: - root_url: https://grafana.callysto.2i2c.cloud/ - auth.github: - enabled: true - allowed_organizations: 2i2c-org - ingress: - hosts: - - grafana.callysto.2i2c.cloud - tls: - - secretName: grafana-tls - hosts: - - grafana.callysto.2i2c.cloud From cdc8f5482963b4366297846f0537bf36703e749f Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Tue, 27 Feb 2024 13:30:24 +0000 Subject: [PATCH 4/5] Remove cluster from workflow files --- .github/workflows/deploy-grafana-dashboards.yaml | 1 - .github/workflows/deploy-hubs.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/deploy-grafana-dashboards.yaml b/.github/workflows/deploy-grafana-dashboards.yaml index 208772c51d..d161d8bcf0 100644 --- a/.github/workflows/deploy-grafana-dashboards.yaml +++ b/.github/workflows/deploy-grafana-dashboards.yaml @@ -15,7 +15,6 @@ jobs: - cluster_name: 2i2c-aws-us - cluster_name: 2i2c-uk - cluster_name: awi-ciroh - - cluster_name: callysto - cluster_name: catalystproject-africa - cluster_name: catalystproject-latam - cluster_name: cloudbank diff --git a/.github/workflows/deploy-hubs.yaml b/.github/workflows/deploy-hubs.yaml index c2ae2ff399..e32014b434 100644 --- a/.github/workflows/deploy-hubs.yaml +++ b/.github/workflows/deploy-hubs.yaml @@ -190,7 +190,6 @@ jobs: failure_utoronto: "${{ env.failure_utoronto }}" failure_linked-earth: "${{ env.failure_linked-earth }}" failure_awi-ciroh: "${{ env.failure_awi-ciroh }}" - failure_callysto: "${{ env.failure_callysto }}" failure_nasa-cryo: "${{ env.failure_nasa-cryo }}" failure_gridsst: "${{ env.failure_gridsst }}" failure_victor: "${{ env.failure_victor }}" From fd81abfb19d2768fcecd1411e65f59cc85058aae Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Tue, 27 Feb 2024 13:31:24 +0000 Subject: [PATCH 5/5] Delete the terraform project values file --- terraform/gcp/projects/callysto.tfvars | 39 -------------------------- 1 file changed, 39 deletions(-) delete mode 100644 terraform/gcp/projects/callysto.tfvars diff --git a/terraform/gcp/projects/callysto.tfvars b/terraform/gcp/projects/callysto.tfvars deleted file mode 100644 index 5a90ec389d..0000000000 --- a/terraform/gcp/projects/callysto.tfvars +++ /dev/null @@ -1,39 +0,0 @@ -prefix = "callysto" -project_id = "callysto-202316" - -zone = "northamerica-northeast1-b" -region = "northamerica-northeast1" -regional_cluster = true - -k8s_versions = { - min_master_version : "1.27.4-gke.900", - core_nodes_version : "1.27.4-gke.900", - notebook_nodes_version : "1.27.4-gke.900", -} - -core_node_machine_type = "n2-highmem-2" -enable_network_policy = true - -# Setup a filestore for in-cluster NFS -enable_filestore = true -filestore_capacity_gb = 1024 - -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", - } -} - -user_buckets = {}