Overrides.json now managed by qhub (#1173)

nebari-dev · Mar 22, 2022 · 43cf683 · 43cf683
1 parent d4cc037
commit 43cf683
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 68 deletions.
diff --git a/.github/workflows/test-provider.yaml b/.github/workflows/test-provider.yaml
@@ -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 }}

diff --git a/qhub/template/image/jupyterlab/overrides.json b/qhub/template/image/jupyterlab/overrides.json
diff --git a/qhub/template/image/jupyterlab/postBuild b/qhub/template/image/jupyterlab/postBuild
@@ -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

diff --git a/...mplate/stages/07-kubernetes-services/modules/kubernetes/services/jupyterhub/configmaps.tf b/...mplate/stages/07-kubernetes-services/modules/kubernetes/services/jupyterhub/configmaps.tf
@@ -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")
+  }
+}
diff --git a/...ubernetes-services/modules/kubernetes/services/jupyterhub/files/jupyterlab/overrides.json b/...ubernetes-services/modules/kubernetes/services/jupyterhub/files/jupyterlab/overrides.json
@@ -0,0 +1,3 @@
+{
+
+}
diff --git a/qhub/template/stages/07-kubernetes-services/modules/kubernetes/services/jupyterhub/main.tf b/qhub/template/stages/07-kubernetes-services/modules/kubernetes/services/jupyterhub/main.tf
@@ -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