to support multiple exam env

ubc · Mar 22, 2024 · df29237 · df29237
1 parent cdaad3b
commit df29237
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/jupyterhub/templates/examapi/deployment.yaml b/jupyterhub/templates/examapi/deployment.yaml
@@ -80,5 +80,5 @@ spec:
       volumes:
       - name: jupyterhub-efs
         persistentVolumeClaim:
-         claimName: efs
+         claimName: {{ .Values.examapi.persistentVolumeClaimName }}
 {{- end }}
diff --git a/jupyterhub/templates/examapi/pv.yaml b/jupyterhub/templates/examapi/pv.yaml
@@ -1,8 +1,9 @@
 ---
+{{- if .Values.examapi.createPersistentVolume }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: {{ include "jupyterhub.efs.fullname" . }}
+  name: {{ .Values.examapi.persistentVolumeName }}
 spec:
   capacity:
     storage: 5Gi
@@ -14,20 +15,22 @@ spec:
   csi:
     driver: efs.csi.aws.com
     volumeHandle: {{ .Values.examapi.efsHandle }}
+{{- end }}
 
 ---
-
+{{- if .Values.examapi.createPersistentVolumeClaim }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: efs
+  name: {{ .Values.examapi.persistentVolumeClaimName }}
 spec:
   accessModes:
     - ReadWriteMany
   storageClassName: {{ .Values.examapi.storageClassName }}
   resources:
     requests:
       storage: 5Gi
+{{- end }}
 
 {{- if .Values.examapi.createStorageClass }}
 ---

diff --git a/jupyterhub/values.yaml b/jupyterhub/values.yaml
@@ -84,7 +84,7 @@ hub:
   extraVolumeMounts: []
   image:
     name: quay.io/jupyterhub/k8s-hub
-    tag: "set-by-chartpress"
+    tag: "3.2.2-0.dev.git.6509.h23fd6095"
     pullPolicy:
     pullSecrets: []
   resources: {}
@@ -305,7 +305,7 @@ proxy:
       allowPrivilegeEscalation: false
     image:
       name: quay.io/jupyterhub/k8s-secret-sync
-      tag: "set-by-chartpress"
+      tag: "3.2.2-0.dev.git.6499.hcea97c31"
       pullPolicy:
       pullSecrets: []
     resources: {}
@@ -345,7 +345,7 @@ singleuser:
   networkTools:
     image:
       name: quay.io/jupyterhub/k8s-network-tools
-      tag: "set-by-chartpress"
+      tag: "3.2.2-0.dev.git.6499.hf14f2f54"
       pullPolicy:
       pullSecrets: []
     resources: {}
@@ -397,7 +397,7 @@ singleuser:
       storageAccessModes: [ReadWriteOnce]
   image:
     name: quay.io/jupyterhub/k8s-singleuser-sample
-    tag: "set-by-chartpress"
+    tag: "3.2.2-0.dev.git.6509.h23fd6095"
     pullPolicy:
     pullSecrets: []
   startTimeout: 300
@@ -606,7 +606,7 @@ prePuller:
     # image and the configuration below relates to the hook-image-awaiter Job
     image:
       name: quay.io/jupyterhub/k8s-image-awaiter
-      tag: "set-by-chartpress"
+      tag: "3.2.2-0.dev.git.6426.h8ee2752d"
       pullPolicy:
       pullSecrets: []
     containerSecurityContext:
@@ -693,6 +693,12 @@ examapi:
   # set to true if the StorageClass doesn't exist
   createStorageClass: false
   storageClassName: exam-api-sc
+  # set to true if the PersistentVolume doesn't exist
+  createPersistentVolume: false
+  persistentVolumeName: efs
+  # set to true if the PersistentVolumeClaim doesn't exist
+  createPersistentVolumeClaim: false
+  persistentVolumeClaimName: efs
   # EFS identifier in the format of "fs-xxxxxxxxxxxx"
   efsHandle:
   service: