Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Overrides.json now managed by qhub configmaps instead of inside docker image #1173

Merged
merged 1 commit into from
Mar 22, 2022
Merged

Overrides.json now managed by qhub configmaps instead of inside docker image #1173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/test-provider.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
with:
python-version: 3.8
- name: Set up Cloud SDK
uses: google-github-actions/setup-gcloud@master
uses: google-github-actions/setup-gcloud@v0
if: ${{ matrix.provider == 'gcp' }}
with:
project_id: ${{ secrets.GCP_PROJECT_ID }}
Expand Down
63 changes: 0 additions & 63 deletions qhub/template/image/jupyterlab/overrides.json
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions qhub/template/image/jupyterlab/postBuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ set -x
# install classic notebook extensions
jupyter nbextension enable --py widgetsnbextension --sys-prefix

# ====== setup jupyterlab configuration overrides ======
mkdir -p /opt/conda/share/jupyter/lab/settings
cp /opt/jupyterlab/overrides.json /opt/conda/share/jupyter/lab/settings

# if DEFAULT_ENV is unset ${DEFAULT_ENV+x} expands to nothing otherwise
# it substitutes the string x. This allows us to check if the variable
# is set without triggering an unbound variable error
Expand Down
12 changes: 12 additions & 0 deletions ...mplate/stages/07-kubernetes-services/modules/kubernetes/services/jupyterhub/configmaps.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,15 @@ resource "kubernetes_config_map" "etc-skel" {
".bash_logout" = file("${path.module}/files/skel/.bash_logout")
}
}


resource "kubernetes_config_map" "jupyterlab-settings" {
metadata {
name = "jupyterlab-settings"
namespace = var.namespace
}

data = {
"overrides.json" = file("${path.module}/files/jupyterlab/overrides.json")
}
}
3 changes: 3 additions & 0 deletions ...ubernetes-services/modules/kubernetes/services/jupyterhub/files/jupyterlab/overrides.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{

}
6 changes: 6 additions & 0 deletions qhub/template/stages/07-kubernetes-services/modules/kubernetes/services/jupyterhub/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ resource "helm_release" "jupyterhub" {
namespace = kubernetes_config_map.etc-jupyter.metadata.0.namespace
kind = "configmap"
}

"/opt/conda/envs/default/share/jupyter/lab/settings" = {
name = kubernetes_config_map.jupyterlab-settings.metadata.0.name
namespace = kubernetes_config_map.jupyterlab-settings.metadata.0.namespace
kind = "configmap"
}
}
)
environments = var.conda-store-environments
Expand Down