Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 0 additions & 36 deletions config/clusters/2i2c-aws-us/jupyterbook-pub.yaml

This file was deleted.

39 changes: 39 additions & 0 deletions config/clusters/2i2c-aws-us/staging.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,42 @@ jupyterhub:
singleuser:
extraEnv:
SCRATCH_BUCKET: s3://2i2c-aws-us-scratch-staging/$(JUPYTERHUB_USER)

jupyterbook-pub-service:
enabled: true

# Run the core service on the core nodes
nodeSelector: &nodeSelector
hub.jupyter.org/node-purpose: core

config:
JupyterBookPubApp:
base_url: /services/jupyterbook-pub/
site_subheading: |
Instantly render pre-built JupyterBook AST!
KubernetesExecutor:
resources:
requests:
memory: 128Mi
limits:
memory: 500Mi
node_selector: *nodeSelector

extraBuildConfig:
name: builder_config.json
json:
JupyterBook2Builder:
allow_source_builds: false

volumeClaim:
enabled: false

volume:
hostPath:
path: /var/cache/jupyterbook-pub/
type: DirectoryOrCreate

auth:
enabled: true
# hub_api_token: <set via deploy>
hub_api_url: https://staging.aws.2i2c.cloud/hub/api/
38 changes: 38 additions & 0 deletions config/clusters/projectpythia-binder/binderhub.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -178,3 +178,41 @@ binderhub-service:
buildPodsRegistryCredentials:
server: *url
username: *username

jupyterbook-pub-service:
enabled: true
# See https://agoose77.github.io/jupyterbook-pub-service/
# Run the core service on the core nodes
nodeSelector: &nodeSelector
capi.stackhpc.com/node-group: core

config:
JupyterBookPubApp:
base_url: /services/jupyterbook-pub/
KubernetesExecutor:
# Current JS2 certs are not X509 valid
disable_strict_ssl_verification: true
resources:
requests:
memory: 128Mi
limits:
memory: 500Mi
node_selector: *nodeSelector

extraBuildConfig:
name: builder_config.json
json:
JupyterBook2Builder:
allow_source_builds: false
volumeClaim:
enabled: false

volume:
hostPath:
path: /var/cache/jupyterbook-pub/
type: DirectoryOrCreate

auth:
enabled: false
# hub_api_token: <a token>
# hub_api_url: https://hub.projectpythia.org/hub/api/
35 changes: 0 additions & 35 deletions config/clusters/projectpythia-binder/jupyterbook-pub.yaml

This file was deleted.

4 changes: 4 additions & 0 deletions helm-charts/basehub/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,7 @@ dependencies:
version: 1.1.1-0.dev.git.133.hd9f9ccc
repository: https://2i2c.org/jupyterhub-groups-exporter
condition: jupyterhub-groups-exporter.enabled
- name: jupyterbook-pub-service
version: 0.1.0-0.dev.git.65.h60d7c7f
repository: https://agoose77.github.io/jupyterbook-pub-service
condition: jupyterbook-pub-service.enabled
13 changes: 13 additions & 0 deletions helm-charts/basehub/values.schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,19 @@ properties:
sendLogsOfLaunchEventsTo2i2c:
type: boolean

# jupyterbook-pub-service is a dependency chart with its own schema, but we impose
# some additional restrictions below via this chart's schema.
jupyterbook-pub-service:
type: object
additionalProperties: true
required:
- enabled
properties:
enabled:
type: boolean
# https://github.com/agoose77/jupyterbook-pub-service
description: |
Enable book building with jupyterbook-pub-service
# jupyterhub is a dependent helm chart and we rely _mostly_ on its schema
# validation for values passed to it and are not imposing restrictions on
# most of them in this helm chart.
Expand Down
2 changes: 2 additions & 0 deletions helm-charts/basehub/values.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
jupyterbook-pub-service:
enabled: false
binderhub-service:
enabled: false
ingress:
Expand Down
Loading