Skip to content

Commit

Permalink
Merge pull request 2i2c-org#3666 from consideRatio/pr/transition-defa…
Browse files Browse the repository at this point in the history
…ult-nfs

basehub: default to nfs.enabled / nfs.pv.enabled to false
  • Loading branch information
consideRatio authored Mar 26, 2024
2 parents c8ef1f7 + 605e9f6 commit f2dbd3f
Show file tree
Hide file tree
Showing 32 changed files with 54 additions and 8 deletions.
2 changes: 2 additions & 0 deletions config/clusters/2i2c-aws-us/basehub-common.values.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion config/clusters/2i2c-aws-us/cosmicds.values.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
nfs:
# No persistent storage for cosmicds
# nfs functionality explicitly disabled in case a common.values.yaml
# file is used to enable it for all hubs in the cluster
enabled: false
pv:
enabled: false
Expand Down
2 changes: 2 additions & 0 deletions config/clusters/2i2c-aws-us/daskhub-common.values.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions config/clusters/2i2c-uk/lis.values.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
nfs:
enabled: true
pv:
enabled: true
mountOptions:
- soft
- noatime
Expand Down
1 change: 1 addition & 0 deletions config/clusters/2i2c-uk/staging.values.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
nfs:
enabled: true
pv:
enabled: true
mountOptions:
- soft
- noatime
Expand Down
1 change: 1 addition & 0 deletions config/clusters/2i2c/basehub-common.values.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
nfs:
enabled: true
pv:
enabled: true
mountOptions:
- soft
- noatime
Expand Down
1 change: 1 addition & 0 deletions config/clusters/2i2c/daskhub-common.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ basehub:
nfs:
enabled: true
pv:
enabled: true
mountOptions:
- soft
- noatime
Expand Down
1 change: 1 addition & 0 deletions config/clusters/awi-ciroh/common.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ basehub:
nfs:
enabled: true
pv:
enabled: true
mountOptions:
- soft
- noatime
Expand Down
2 changes: 2 additions & 0 deletions config/clusters/catalystproject-africa/common.values.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions config/clusters/catalystproject-latam/common.values.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
nfs:
enabled: true
pv:
enabled: true
mountOptions:
- soft
- noatime
Expand Down
2 changes: 2 additions & 0 deletions config/clusters/cloudbank/common.values.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
nfs:
enabled: true
pv:
enabled: true
mountOptions:
- soft
- noatime
Expand Down
2 changes: 2 additions & 0 deletions config/clusters/earthscope/common.values.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions config/clusters/gridsst/common.values.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 1 addition & 2 deletions config/clusters/hhmi/common.values.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
basehub:
nfs:
enabled: true
dirsizeReporter:
enabled: true
pv:
enabled: true
mountOptions:
- soft
- noatime
Expand Down
2 changes: 2 additions & 0 deletions config/clusters/hhmi/spyglass.values.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# nfs functionality enabled for this ephemeral hub to mount
# a shared folder from another hub in the cluster
nfs:
enabled: true
dirsizeReporter:
Expand Down
2 changes: 2 additions & 0 deletions config/clusters/jupyter-meets-the-earth/common.values.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions config/clusters/leap/common.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ basehub:
nfs:
enabled: true
pv:
enabled: true
mountOptions:
- soft
- noatime
Expand Down
1 change: 1 addition & 0 deletions config/clusters/linked-earth/common.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ basehub:
nfs:
enabled: true
pv:
enabled: true
mountOptions:
- soft
- noatime
Expand Down
2 changes: 2 additions & 0 deletions config/clusters/meom-ige/common.values.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions config/clusters/nasa-cryo/common.values.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions config/clusters/nasa-esdis/common.values.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions config/clusters/nasa-ghg/common.values.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions config/clusters/nasa-veda/common.values.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions config/clusters/openscapes/common.values.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions config/clusters/pangeo-hubs/common.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ basehub:
nfs:
enabled: true
pv:
enabled: true
mountOptions:
- soft
- noatime
Expand Down
1 change: 1 addition & 0 deletions config/clusters/qcl/common.values.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
nfs:
enabled: true
pv:
enabled: true
mountOptions:
- soft
- noatime
Expand Down
2 changes: 2 additions & 0 deletions config/clusters/smithsonian/common.values.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions config/clusters/ubc-eoas/common.values.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions config/clusters/utoronto/common.values.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
nfs:
enabled: true
pv:
enabled: true
# Recommended options from the Azure Portal UI for mounting the share
mountOptions:
- vers=4
Expand Down
2 changes: 2 additions & 0 deletions config/clusters/victor/common.values.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 4 additions & 3 deletions docs/howto/features/ephemeral.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -79,11 +80,11 @@ ephemeral hub's users.
pointing to, with the following config:

```yaml
# nfs functionality enabled for this ephemeral hub to mount
# a shared folder from another hub in the cluster
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
Expand Down
4 changes: 2 additions & 2 deletions helm-charts/basehub/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f2dbd3f

Please sign in to comment.