Adjust PV/PVC for course cluster

.prettierignore

@@ -1 +1 @@
-jupyterhub/templates/**
+jupyterhub/templates/

jupyterhub/templates/examapi/deployment.yaml

@@ -80,5 +80,5 @@ spec:
       volumes:
       - name: jupyterhub-efs
         persistentVolumeClaim:
-         claimName: efs
+         claimName: home
 {{- end }}

jupyterhub/templates/examapi/pv.yaml

@@ -1,39 +1,40 @@
----
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: {{ include "jupyterhub.efs.fullname" . }}
-spec:
-  capacity:
-    storage: 5Gi
-  volumeMode: Filesystem
-  accessModes:
-    - ReadWriteMany
-  persistentVolumeReclaimPolicy: Retain
-  storageClassName: {{ .Values.examapi.storageClassName }}
-  csi:
-    driver: efs.csi.aws.com
-    volumeHandle: {{ .Values.examapi.efsHandle }}
+{{/*---*/}}
+{{/*apiVersion: v1*/}}
+{{/*kind: PersistentVolume*/}}
+{{/*metadata:*/}}
+{{/*  name: {{ include "jupyterhub.efs.fullname" . }}*/}}
+{{/*spec:*/}}
+{{/*  capacity:*/}}
+{{/*    storage: 5Gi*/}}
+{{/*  volumeMode: Filesystem*/}}
+{{/*  accessModes:*/}}
+{{/*    - ReadWriteMany*/}}
+{{/*  persistentVolumeReclaimPolicy: Retain*/}}
+{{/*  storageClassName: {{ .Values.examapi.storageClassName }}*/}}
+{{/*  csi:*/}}
+{{/*    driver: efs.csi.aws.com*/}}
+{{/*    volumeHandle: {{ .Values.examapi.efsHandle }}*/}}
 
 ---
 
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: efs
+  name: home
 spec:
   accessModes:
     - ReadWriteMany
-  storageClassName: {{ .Values.examapi.storageClassName }}
+  storageClassName: ""
+  volumeName: home
   resources:
     requests:
       storage: 5Gi
 
-{{- if .Values.examapi.createStorageClass }}
----
-kind: StorageClass
-apiVersion: storage.k8s.io/v1
-metadata:
-  name: {{ .Values.examapi.storageClassName }}
-provisioner: efs.csi.aws.com
-{{- end }}
+{{/*{{- if .Values.examapi.createStorageClass }}*/}}
+{{/*---*/}}
+{{/*kind: StorageClass*/}}
+{{/*apiVersion: storage.k8s.io/v1*/}}
+{{/*metadata:*/}}
+{{/*  name: {{ .Values.examapi.storageClassName }}*/}}
+{{/*provisioner: efs.csi.aws.com*/}}
+{{/*{{- end }}*/}}

jupyterhub/values.yaml

@@ -691,10 +691,12 @@ examapi:
   dataInternal: # /mnt/efs/example-internal
   apiKey:
   # set to true if the StorageClass doesn't exist
-  createStorageClass: false
-  storageClassName: exam-api-sc
+  #  createStorageClass: false
+  #  storageClassName: exam-api-sc
   # EFS identifier in the format of "fs-xxxxxxxxxxxx"
-  efsHandle:
+  #  efsHandle:
+  # persistent volume claim name, should use the same value as singleuser.storage.static.pvcName
+  pvcName:
   service:
     type: NodePort
     annotations: {}