Add enabling flag for examapi, move pv/pvc out of deployment

.prettierignore

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

jupyterhub/templates/examapi/deployment.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.examapi.enabled -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -80,43 +81,4 @@ spec:
       - name: jupyterhub-efs
         persistentVolumeClaim:
          claimName: {{ include "jupyterhub.examapi.fullname" . }}
----
-
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: {{ include "jupyterhub.examapi.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: {{ include "jupyterhub.examapi.fullname" . }}
-spec:
-  accessModes:
-    - ReadWriteMany
-  storageClassName: {{ .Values.examapi.storageClassName }}
-  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 }}

jupyterhub/templates/examapi/ingress.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.examapi.enabled -}}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
@@ -25,3 +26,4 @@ spec:
                 name: {{ include "jupyterhub.examapi.fullname" . }}
                 port:
                   number: 5000
+{{- end }}

jupyterhub/templates/examapi/pv.yaml

@@ -0,0 +1,39 @@
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: {{ include "jupyterhub.examapi.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: {{ include "jupyterhub.examapi.fullname" . }}
+spec:
+  accessModes:
+    - ReadWriteMany
+  storageClassName: {{ .Values.examapi.storageClassName }}
+  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 }}

jupyterhub/templates/examapi/secrets.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.examapi.enabled -}}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -7,6 +8,4 @@ metadata:
 type: Opaque
 data:
   exam-api-key: {{ .Values.examapi.apiKey | b64enc | quote }}
-
-
-
+{{- end }}

jupyterhub/templates/examapi/service.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.examapi.enabled -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -31,3 +32,4 @@ spec:
       {{- with .Values.examapi.service.ports.nodePort }}
       nodePort: {{ . }}
       {{- end }}
+{{- end }}

jupyterhub/values.yaml

@@ -668,6 +668,7 @@ cull:
   maxAge: 0 # --max-age
 
 examapi:
+  enabled: true
   image:
     name: lthub/jupyterhub-api
     tag: sha-bc8937e