FIX: repair container changes to include proper variables

nicklausbrown · Sep 7, 2023 · d30c15e · d30c15e
1 parent 4528e1b
commit d30c15e
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 33 deletions.
diff --git a/charts/jupyter/Chart.yaml b/charts/jupyter/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.3.1
+version: 0.4.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/jupyter/templates/deployment.yaml b/charts/jupyter/templates/deployment.yaml
@@ -28,45 +28,53 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
         - name: {{ .Chart.Name }}
-          securityContext:
-                  {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
-            - name: http
-              containerPort: 8000
+            - name: jupyter
+              containerPort: 8888
               protocol: TCP
           livenessProbe:
             httpGet:
-              path: /
-              port: http
+              path: /api/status
+              port: jupyter
           readinessProbe:
             httpGet:
-              path: /
-              port: http
+              path: /api/status
+              port: jupyter
+          {{- if .Values.command.enabled }}
+          command: {{ .Values.command.value }}
+          args: {{ .Values.command.args }}
+          {{- end }}
+          {{- if .Values.rootUser }}
+          securityContext:
+            allowPrivilegeEscalation: false
+            runAsUser: 0
+          {{- end }}
           resources:
-                  {{- toYaml .Values.resources | nindent 12 }}
-                {{- with .Values.envVariables }}
+            {{- toYaml .Values.resources | nindent 12 }}
+
+          {{- with .Values.envVariables }}
           env:
-                  {{- toYaml . | nindent 12 }}
-                {{- end }}
-                {{- with .Values.volumeMounts }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.volumeMounts }}
           volumeMounts:
-                  {{- toYaml . | nindent 12 }}
-                {{- end }}
-            {{- with .Values.volumes }}
-      volumes:
-            {{- toYaml . | nindent 8 }}
+            {{- toYaml . | nindent 12 }}
           {{- end }}
-          {{- with .Values.nodeSelector }}
+      {{- with .Values.volumes }}
+      volumes:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.nodeSelector }}
       nodeSelector:
-            {{- toYaml . | nindent 8 }}
-          {{- end }}
-          {{- with .Values.affinity }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
       affinity:
-            {{- toYaml . | nindent 8 }}
-          {{- end }}
-          {{- with .Values.tolerations }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
       tolerations:
-            {{- toYaml . | nindent 8 }}
-          {{- end }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/charts/jupyter/values.yaml b/charts/jupyter/values.yaml
@@ -58,7 +58,9 @@ ingress:
 
 resources: {}
 
-extraEnv:
+envVariables:
+  - name: JUPYTER_ENABLE_LAB
+    value: "yes"
   - name: PASSWORD
     value: ""
   - name: NB_USER
@@ -88,5 +90,3 @@ rootUser: true
 volumes: []
 
 volumeMounts: []
-
-envVariables: []
diff --git a/jupyter-ex/Chart.yaml b/jupyter-ex/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.3.0
+version: 0.4.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -25,5 +25,5 @@ appVersion: "1.0.0"
 
 dependencies:
 - name: jupyter
-  version: 0.3.1
+  version: 0.4.0
   repository: https://nicklausbrown.github.io/jupyter-kubernetes/