Merge pull request #23 from consideRatio/pr/healthcheck-and-misc

Add startupProbe, set BinderHub.require_build_only=true, and fix details
2i2c-org · Apr 27, 2023 · edb35c4 · edb35c4
2 parents 5140e84 + 8b6f8fc
commit edb35c4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/binderhub-service/templates/deployment.yaml b/binderhub-service/templates/deployment.yaml
@@ -33,7 +33,7 @@ spec:
           {{- end }}
           ports:
             - name: http
-              containerPort: {{ .Values.service.port }}
+              containerPort: {{ .Values.config.BinderHub.port }}
           volumeMounts:
             - name: secret
               mountPath: /etc/binderhub/mounted-secret/
@@ -42,6 +42,12 @@ spec:
             {{- .Values.resources | toYaml | nindent 12 }}
           securityContext:
             {{- .Values.securityContext | toYaml | nindent 12 }}
+          startupProbe:
+            periodSeconds: 1
+            failureThreshold: 60
+            httpGet:
+              path: {{ .Values.config.BinderHub.base_url }}/versions
+              port: http
       {{- with .Values.image.pullSecrets }}
       imagePullSecrets:
         {{- . | toYaml | nindent 8 }}

diff --git a/binderhub-service/templates/docker-api/daemonset.yaml b/binderhub-service/templates/docker-api/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
             - dockerd
             - --data-root=/var/lib/docker-api
             - --exec-root=/var/run/docker-api
-            - --host=unix://var/run/docker-api/docker-api.sock
+            - --host=unix:///var/run/docker-api/docker-api.sock
           volumeMounts:
             - name: data
               mountPath: /var/lib/docker-api

diff --git a/binderhub-service/values.yaml b/binderhub-service/values.yaml
@@ -18,11 +18,21 @@ global: {}
 # config.X.y sets c.X.y where X is a class and y is a configurable traitlet on
 # the class.
 #
+# Some config must be set here, and not via extraConfig, as its referenced by
+# the chart's template directly.
+#
+# - BinderHub.base_url (readinessProbe)
+# - BinderHub.port (containerPort)
+#
 config:
   BinderHub:
     base_url: /
+    port: 8585
     use_registry: true
+    require_build_only: true
   KubernetesBuildExecutor:
+    # docker_host must not be updated, assumptions about it are hardcoded in
+    # docker-api/daemonset.yaml
     docker_host: /var/run/docker-api/docker-api.sock
 extraConfig: {}