From e60fbdb6c6e60e851950c399bde62519f47abead Mon Sep 17 00:00:00 2001 From: Erik Sundell Date: Wed, 31 Jan 2024 13:38:17 +0100 Subject: [PATCH] basehub: default to nfs.enabled / nfs.pv.enabled to false --- config/clusters/2i2c-aws-us/basehub-common.values.yaml | 2 ++ config/clusters/2i2c-aws-us/daskhub-common.values.yaml | 2 ++ config/clusters/2i2c-uk/lis.values.yaml | 1 + config/clusters/2i2c-uk/staging.values.yaml | 1 + config/clusters/2i2c/basehub-common.values.yaml | 1 + config/clusters/2i2c/daskhub-common.values.yaml | 1 + config/clusters/awi-ciroh/common.values.yaml | 1 + config/clusters/catalystproject-africa/common.values.yaml | 2 ++ config/clusters/catalystproject-latam/common.values.yaml | 1 + config/clusters/cloudbank/common.values.yaml | 2 ++ config/clusters/earthscope/common.values.yaml | 2 ++ config/clusters/gridsst/common.values.yaml | 2 ++ config/clusters/hhmi/common.values.yaml | 1 + config/clusters/hhmi/spyglass.values.yaml | 2 ++ config/clusters/jupyter-meets-the-earth/common.values.yaml | 2 ++ config/clusters/leap/common.values.yaml | 1 + config/clusters/linked-earth/common.values.yaml | 1 + config/clusters/meom-ige/common.values.yaml | 2 ++ config/clusters/nasa-cryo/common.values.yaml | 2 ++ config/clusters/nasa-esdis/common.values.yaml | 2 ++ config/clusters/nasa-ghg/common.values.yaml | 2 ++ config/clusters/nasa-veda/common.values.yaml | 2 ++ config/clusters/openscapes/common.values.yaml | 2 ++ config/clusters/pangeo-hubs/common.values.yaml | 1 + config/clusters/qcl/common.values.yaml | 1 + config/clusters/smithsonian/common.values.yaml | 2 ++ config/clusters/ubc-eoas/common.values.yaml | 2 ++ config/clusters/utoronto/common.values.yaml | 1 + config/clusters/victor/common.values.yaml | 2 ++ docs/howto/features/ephemeral.md | 3 ++- helm-charts/basehub/values.yaml | 4 ++-- 31 files changed, 50 insertions(+), 3 deletions(-) diff --git a/config/clusters/2i2c-aws-us/basehub-common.values.yaml b/config/clusters/2i2c-aws-us/basehub-common.values.yaml index 0b8dde05db..acdc2fa1ff 100644 --- a/config/clusters/2i2c-aws-us/basehub-common.values.yaml +++ b/config/clusters/2i2c-aws-us/basehub-common.values.yaml @@ -1,5 +1,7 @@ nfs: + enabled: true pv: + enabled: true # from https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-nfs-mount-settings.html mountOptions: - rsize=1048576 diff --git a/config/clusters/2i2c-aws-us/daskhub-common.values.yaml b/config/clusters/2i2c-aws-us/daskhub-common.values.yaml index 9f3b85edb4..235875165e 100644 --- a/config/clusters/2i2c-aws-us/daskhub-common.values.yaml +++ b/config/clusters/2i2c-aws-us/daskhub-common.values.yaml @@ -1,6 +1,8 @@ basehub: nfs: + enabled: true pv: + enabled: true # from https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-nfs-mount-settings.html mountOptions: - rsize=1048576 diff --git a/config/clusters/2i2c-uk/lis.values.yaml b/config/clusters/2i2c-uk/lis.values.yaml index 1afcfd7eb8..c5c388873f 100644 --- a/config/clusters/2i2c-uk/lis.values.yaml +++ b/config/clusters/2i2c-uk/lis.values.yaml @@ -1,6 +1,7 @@ nfs: enabled: true pv: + enabled: true mountOptions: - soft - noatime diff --git a/config/clusters/2i2c-uk/staging.values.yaml b/config/clusters/2i2c-uk/staging.values.yaml index 0ec5159734..72e4e427d9 100644 --- a/config/clusters/2i2c-uk/staging.values.yaml +++ b/config/clusters/2i2c-uk/staging.values.yaml @@ -1,6 +1,7 @@ nfs: enabled: true pv: + enabled: true mountOptions: - soft - noatime diff --git a/config/clusters/2i2c/basehub-common.values.yaml b/config/clusters/2i2c/basehub-common.values.yaml index f6def81488..58fe4b616b 100644 --- a/config/clusters/2i2c/basehub-common.values.yaml +++ b/config/clusters/2i2c/basehub-common.values.yaml @@ -1,6 +1,7 @@ nfs: enabled: true pv: + enabled: true mountOptions: - soft - noatime diff --git a/config/clusters/2i2c/daskhub-common.values.yaml b/config/clusters/2i2c/daskhub-common.values.yaml index f4c07b56b4..0841fd8668 100644 --- a/config/clusters/2i2c/daskhub-common.values.yaml +++ b/config/clusters/2i2c/daskhub-common.values.yaml @@ -2,6 +2,7 @@ basehub: nfs: enabled: true pv: + enabled: true mountOptions: - soft - noatime diff --git a/config/clusters/awi-ciroh/common.values.yaml b/config/clusters/awi-ciroh/common.values.yaml index 8f0f4f1ec3..793f2e5451 100644 --- a/config/clusters/awi-ciroh/common.values.yaml +++ b/config/clusters/awi-ciroh/common.values.yaml @@ -2,6 +2,7 @@ basehub: nfs: enabled: true pv: + enabled: true mountOptions: - soft - noatime diff --git a/config/clusters/catalystproject-africa/common.values.yaml b/config/clusters/catalystproject-africa/common.values.yaml index d59776bd4a..db89cd7a9c 100644 --- a/config/clusters/catalystproject-africa/common.values.yaml +++ b/config/clusters/catalystproject-africa/common.values.yaml @@ -1,5 +1,7 @@ nfs: + enabled: true pv: + enabled: true # from https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-nfs-mount-settings.html mountOptions: - rsize=1048576 diff --git a/config/clusters/catalystproject-latam/common.values.yaml b/config/clusters/catalystproject-latam/common.values.yaml index a6f86b9b7b..7c5ecd5b38 100644 --- a/config/clusters/catalystproject-latam/common.values.yaml +++ b/config/clusters/catalystproject-latam/common.values.yaml @@ -1,6 +1,7 @@ nfs: enabled: true pv: + enabled: true mountOptions: - soft - noatime diff --git a/config/clusters/cloudbank/common.values.yaml b/config/clusters/cloudbank/common.values.yaml index 6c7e7e8248..ad9d644c60 100644 --- a/config/clusters/cloudbank/common.values.yaml +++ b/config/clusters/cloudbank/common.values.yaml @@ -1,5 +1,7 @@ nfs: + enabled: true pv: + enabled: true mountOptions: - soft - noatime diff --git a/config/clusters/earthscope/common.values.yaml b/config/clusters/earthscope/common.values.yaml index 1772c84346..dc64548693 100644 --- a/config/clusters/earthscope/common.values.yaml +++ b/config/clusters/earthscope/common.values.yaml @@ -1,6 +1,8 @@ basehub: nfs: + enabled: true pv: + enabled: true # from https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-nfs-mount-settings.html mountOptions: - rsize=1048576 diff --git a/config/clusters/gridsst/common.values.yaml b/config/clusters/gridsst/common.values.yaml index 5b2c3eeeff..c5a2d3ac95 100644 --- a/config/clusters/gridsst/common.values.yaml +++ b/config/clusters/gridsst/common.values.yaml @@ -1,9 +1,11 @@ basehub: nfs: + enabled: true # FIXME: Enable after https://github.com/yuvipanda/prometheus-dirsize-exporter/pull/7 is used dirsizeReporter: enabled: false pv: + enabled: true # from https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-nfs-mount-settings.html mountOptions: - rsize=1048576 diff --git a/config/clusters/hhmi/common.values.yaml b/config/clusters/hhmi/common.values.yaml index 30114280fe..4ee16eb025 100644 --- a/config/clusters/hhmi/common.values.yaml +++ b/config/clusters/hhmi/common.values.yaml @@ -4,6 +4,7 @@ basehub: dirsizeReporter: enabled: true pv: + enabled: true mountOptions: - soft - noatime diff --git a/config/clusters/hhmi/spyglass.values.yaml b/config/clusters/hhmi/spyglass.values.yaml index ffc14cec04..96c5d5086b 100644 --- a/config/clusters/hhmi/spyglass.values.yaml +++ b/config/clusters/hhmi/spyglass.values.yaml @@ -1,6 +1,8 @@ nfs: enabled: true dirsizeReporter: + # We don't need to report directory sizes here, as it's already being reported on by + # the 'source' hub enabled: false pv: enabled: true diff --git a/config/clusters/jupyter-meets-the-earth/common.values.yaml b/config/clusters/jupyter-meets-the-earth/common.values.yaml index c5c53073f7..6f25206716 100644 --- a/config/clusters/jupyter-meets-the-earth/common.values.yaml +++ b/config/clusters/jupyter-meets-the-earth/common.values.yaml @@ -1,6 +1,8 @@ basehub: nfs: + enabled: true pv: + enabled: true # from https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-nfs-mount-settings.html mountOptions: - rsize=1048576 diff --git a/config/clusters/leap/common.values.yaml b/config/clusters/leap/common.values.yaml index f2ffeeee04..f46cc462b6 100644 --- a/config/clusters/leap/common.values.yaml +++ b/config/clusters/leap/common.values.yaml @@ -2,6 +2,7 @@ basehub: nfs: enabled: true pv: + enabled: true mountOptions: - soft - noatime diff --git a/config/clusters/linked-earth/common.values.yaml b/config/clusters/linked-earth/common.values.yaml index 43a1012559..7b75154849 100644 --- a/config/clusters/linked-earth/common.values.yaml +++ b/config/clusters/linked-earth/common.values.yaml @@ -2,6 +2,7 @@ basehub: nfs: enabled: true pv: + enabled: true mountOptions: - soft - noatime diff --git a/config/clusters/meom-ige/common.values.yaml b/config/clusters/meom-ige/common.values.yaml index 0658f5c0cf..f1edae137b 100644 --- a/config/clusters/meom-ige/common.values.yaml +++ b/config/clusters/meom-ige/common.values.yaml @@ -1,6 +1,8 @@ basehub: nfs: + enabled: true pv: + enabled: true # from https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-nfs-mount-settings.html mountOptions: - rsize=1048576 diff --git a/config/clusters/nasa-cryo/common.values.yaml b/config/clusters/nasa-cryo/common.values.yaml index b3beab73bb..e39cfb012b 100644 --- a/config/clusters/nasa-cryo/common.values.yaml +++ b/config/clusters/nasa-cryo/common.values.yaml @@ -1,6 +1,8 @@ basehub: nfs: + enabled: true pv: + enabled: true # from https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-nfs-mount-settings.html mountOptions: - rsize=1048576 diff --git a/config/clusters/nasa-esdis/common.values.yaml b/config/clusters/nasa-esdis/common.values.yaml index 28ef1b85af..ace94688fd 100644 --- a/config/clusters/nasa-esdis/common.values.yaml +++ b/config/clusters/nasa-esdis/common.values.yaml @@ -1,5 +1,7 @@ nfs: + enabled: true pv: + enabled: true # from https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-nfs-mount-settings.html mountOptions: - rsize=1048576 diff --git a/config/clusters/nasa-ghg/common.values.yaml b/config/clusters/nasa-ghg/common.values.yaml index dafeaf9633..8204462b52 100644 --- a/config/clusters/nasa-ghg/common.values.yaml +++ b/config/clusters/nasa-ghg/common.values.yaml @@ -1,9 +1,11 @@ basehub: nfs: + enabled: true # FIXME: Enable after https://github.com/yuvipanda/prometheus-dirsize-exporter/pull/7 is used dirsizeReporter: enabled: false pv: + enabled: true # from https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-nfs-mount-settings.html mountOptions: - rsize=1048576 diff --git a/config/clusters/nasa-veda/common.values.yaml b/config/clusters/nasa-veda/common.values.yaml index 9d82aa4e3e..988bb26866 100644 --- a/config/clusters/nasa-veda/common.values.yaml +++ b/config/clusters/nasa-veda/common.values.yaml @@ -1,9 +1,11 @@ basehub: nfs: + enabled: true # FIXME: Enable after https://github.com/yuvipanda/prometheus-dirsize-exporter/pull/7 is used dirsizeReporter: enabled: false pv: + enabled: true # from https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-nfs-mount-settings.html mountOptions: - rsize=1048576 diff --git a/config/clusters/openscapes/common.values.yaml b/config/clusters/openscapes/common.values.yaml index 906249bc63..c7ff19c3ca 100644 --- a/config/clusters/openscapes/common.values.yaml +++ b/config/clusters/openscapes/common.values.yaml @@ -1,6 +1,8 @@ basehub: nfs: + enabled: true pv: + enabled: true # from https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-nfs-mount-settings.html mountOptions: - rsize=1048576 diff --git a/config/clusters/pangeo-hubs/common.values.yaml b/config/clusters/pangeo-hubs/common.values.yaml index 4dcfb502a3..96543bb828 100644 --- a/config/clusters/pangeo-hubs/common.values.yaml +++ b/config/clusters/pangeo-hubs/common.values.yaml @@ -2,6 +2,7 @@ basehub: nfs: enabled: true pv: + enabled: true mountOptions: - soft - noatime diff --git a/config/clusters/qcl/common.values.yaml b/config/clusters/qcl/common.values.yaml index 36f24213c8..502e40ef67 100644 --- a/config/clusters/qcl/common.values.yaml +++ b/config/clusters/qcl/common.values.yaml @@ -1,6 +1,7 @@ nfs: enabled: true pv: + enabled: true mountOptions: - soft - noatime diff --git a/config/clusters/smithsonian/common.values.yaml b/config/clusters/smithsonian/common.values.yaml index 07f200e906..2a240f0056 100644 --- a/config/clusters/smithsonian/common.values.yaml +++ b/config/clusters/smithsonian/common.values.yaml @@ -1,6 +1,8 @@ basehub: nfs: + enabled: true pv: + enabled: true # from https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-nfs-mount-settings.html mountOptions: - rsize=1048576 diff --git a/config/clusters/ubc-eoas/common.values.yaml b/config/clusters/ubc-eoas/common.values.yaml index 65063fe49c..d0b3a5e431 100644 --- a/config/clusters/ubc-eoas/common.values.yaml +++ b/config/clusters/ubc-eoas/common.values.yaml @@ -1,8 +1,10 @@ nfs: + enabled: true # FIXME: Enable after https://github.com/yuvipanda/prometheus-dirsize-exporter/pull/7 is used dirsizeReporter: enabled: false pv: + enabled: true # from https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-nfs-mount-settings.html mountOptions: - rsize=1048576 diff --git a/config/clusters/utoronto/common.values.yaml b/config/clusters/utoronto/common.values.yaml index 95f7ecb0a5..e71beb7a69 100644 --- a/config/clusters/utoronto/common.values.yaml +++ b/config/clusters/utoronto/common.values.yaml @@ -1,6 +1,7 @@ nfs: enabled: true pv: + enabled: true # Recommended options from the Azure Portal UI for mounting the share mountOptions: - vers=4 diff --git a/config/clusters/victor/common.values.yaml b/config/clusters/victor/common.values.yaml index f84eb373c3..e1fee7785f 100644 --- a/config/clusters/victor/common.values.yaml +++ b/config/clusters/victor/common.values.yaml @@ -1,6 +1,8 @@ basehub: nfs: + enabled: true pv: + enabled: true # from https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-nfs-mount-settings.html mountOptions: - rsize=1048576 diff --git a/docs/howto/features/ephemeral.md b/docs/howto/features/ephemeral.md index b2e357d390..2a7bec7fe5 100644 --- a/docs/howto/features/ephemeral.md +++ b/docs/howto/features/ephemeral.md @@ -47,9 +47,10 @@ As users are temporary and can not be accessed again, there is no reason to provide persistent storage. So we turn it all off - particularly the home directories. ```yaml +# nfs functionality explicitly disabled in case a common.values.yaml +# file is used to enable it for all hubs in the cluster nfs: enabled: false - # Required until https://github.com/2i2c-org/infrastructure/issues/3654 is fixed pv: enabled: false diff --git a/helm-charts/basehub/values.yaml b/helm-charts/basehub/values.yaml index f157f0f4c9..61d3a5df01 100644 --- a/helm-charts/basehub/values.yaml +++ b/helm-charts/basehub/values.yaml @@ -64,14 +64,14 @@ staticWebsite: privateKey: "" nfs: - enabled: true + enabled: false dirsizeReporter: enabled: true shareCreator: enabled: true tolerations: [] pv: - enabled: true + enabled: false mountOptions: - soft - noatime