Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Irods csi driver add #6

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Irods csi driver add #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fe9b899
Merge pull request #1 from CyVerse-Ansible/master
ryan-schneider Nov 1, 2022
f924bbd
Incomplete version of jh per user storage
Nov 23, 2022
84459d1
added irods csi driver pv and pvc when needed
May 31, 2023
b65d92d
Merge pull request #3 from CyVerse-Ansible/master
ryan-schneider Jun 9, 2023
f0c1e6f
removed test files before sending to main branch
Jun 9, 2023
7047649
fixed README after adding irods csi driver stuff
Jun 9, 2023
2ac8ed2
removed test vars from defaults
Jun 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ Role Variables
* JH_SHARED_STORAGE_PVC_NAME, set to the persistent volume claim name
* JH_SHARED_STORAGE_MOUNT_DIR, set to the mount directory within container, default = /home/jovyan/shared

* IRODS_CSI_DRIVER_ENABLE, set to true if enabling a second pv/pvc for the irods csi driver
* IRODS_CSI_DRIVER_PV_NAME, set to the persistent volume name for the irods csi driver
* IRODS_CSI_DRIVER_PVC_NAME, set to the persistent volume claim name for the irods csi driver
* IRODS_CSI_DRIVER_MOUNT_DIR, set to the mount directory within container for the irods csi driver

* JH_RESOURCES_REQUEST_CPU, if set this is the cpu setting for the hub container, 0m - 1000m
* JH_RESOURCES_REQUEST_MEMORY, if set this is the memory setting for the hub container, 200Mi - 4Gi

Expand Down
17 changes: 15 additions & 2 deletions templates/config.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,16 +85,29 @@ singleuser:
{% if JH_SINGLEUSER_CPU_LIMIT is defined %}
limit: {{ JH_SINGLEUSER_CPU_LIMIT }}
{% endif %}
{% if JH_SHARED_STORAGE_ENABLE is defined and JH_SHARED_STORAGE_ENABLE|bool %}
{% if (JH_SHARED_STORAGE_ENABLE is defined and JH_SHARED_STORAGE_ENABLE|bool) or (IRODS_CSI_DRIVER_ENABLE is defined and IRODS_CSI_DRIVER_ENABLE|bool) %}
storage:
extraVolumes:
{% if JH_SHARED_STORAGE_ENABLE is defined and JH_SHARED_STORAGE_ENABLE|bool %}
- name: "{{ JH_SHARED_STORAGE_PV_NAME }}"
persistentVolumeClaim:
claimName: "{{ JH_SHARED_STORAGE_PVC_NAME }}"
{% endif %}
{% if IRODS_CSI_DRIVER_ENABLE is defined and IRODS_CSI_DRIVER_ENABLE|bool %}
- name: "{{ IRODS_CSI_DRIVER_PV_NAME }}"
persistentVolumeClaim:
claimName: "{{ IRODS_CSI_DRIVER_PVC_NAME }}"
{% endif %}
extraVolumeMounts:
{% if JH_SHARED_STORAGE_ENABLE is defined and JH_SHARED_STORAGE_ENABLE|bool %}
- name: "{{ JH_SHARED_STORAGE_PV_NAME }}"
mountPath: {{ JH_SHARED_STORAGE_MOUNT_DIR }}
{% endif %}
{% if IRODS_CSI_DRIVER_ENABLE is defined and IRODS_CSI_DRIVER_ENABLE|bool %}
- name: "{{ IRODS_CSI_DRIVER_PV_NAME }}"
mountPath: {{ IRODS_CSI_DRIVER_MOUNT_DIR }}
{% endif %}
{% endif %}
{% if JH_SINGLEUSER_GPU_ENABLE is defined and JH_SINGLEUSER_GPU_ENABLE|bool %}
profileList:
- display_name: "GPU Server"
Expand Down Expand Up @@ -136,4 +149,4 @@ ingress:

prePuller:
hook:
enabled: {{ JH_PREPULL_IMAGES }}
enabled: {{ JH_PREPULL_IMAGES }}