Upgrade images for jupyterhub-ssh, kbatch (#1997)

nebari-dev · Sep 12, 2023 · 2d0c985 · 2d0c985
1 parent 3238856
commit 2d0c985
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/src/_nebari/stages/kubernetes_services/__init__.py b/src/_nebari/stages/kubernetes_services/__init__.py
@@ -252,7 +252,7 @@ class InputSchema(schema.Base):
                 "pandas=1.5.3",
                 {
                     "pip": [
-                        "kbatch==0.4.1",
+                        "kbatch==0.4.2",
                     ],
                 },
             ],

diff --git a/...ri/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub-ssh/sftp.tf b/...ri/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub-ssh/sftp.tf
@@ -90,7 +90,8 @@ resource "kubernetes_deployment" "jupyterhub-sftp" {
         volume {
           name = "secrets"
           secret {
-            secret_name = kubernetes_secret.jupyterhub-sftp.metadata.0.name
+            secret_name  = kubernetes_secret.jupyterhub-sftp.metadata.0.name
+            default_mode = "0600"
           }
         }
 

diff --git a/...ari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub-ssh/ssh.tf b/...ari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub-ssh/ssh.tf
@@ -11,7 +11,14 @@ resource "kubernetes_config_map" "jupyterhub-ssh" {
   }
 
   data = {
-    "values.yaml" = "hubUrl: ${var.jupyterhub_api_url}"
+    "values.yaml" = <<-EOT
+      hubUrl: ${var.jupyterhub_api_url}
+      ssh:
+        config:
+          JupyterHubSSH:
+            debug: true
+            host_key_path: /etc/jupyterhub-ssh/secrets/jupyterhub-ssh.host-key
+    EOT
   }
 }
 

diff --git a/...ages/kubernetes_services/template/modules/kubernetes/services/jupyterhub-ssh/variables.tf b/...ages/kubernetes_services/template/modules/kubernetes/services/jupyterhub-ssh/variables.tf
@@ -29,8 +29,8 @@ variable "jupyterhub-ssh-image" {
     tag  = string
   })
   default = {
-    name = "yuvipanda/jupyterhub-ssh-ssh"
-    tag  = "0.0.1-n026.hf136ec7"
+    name = "quay.io/jupyterhub-ssh/ssh"
+    tag  = "0.0.1-0.dev.git.136.ha610981"
   }
 }
 
@@ -41,8 +41,8 @@ variable "jupyterhub-sftp-image" {
     tag  = string
   })
   default = {
-    name = "yuvipanda/jupyterhub-ssh-sftp"
-    tag  = "0.0.1-n026.hf136ec7"
+    name = "quay.io/jupyterhub-ssh/sftp"
+    tag  = "0.0.1-0.dev.git.142.h402a3d6"
   }
 }
 

diff --git a/...nebari/stages/kubernetes_services/template/modules/kubernetes/services/kbatch/versions.tf b/...nebari/stages/kubernetes_services/template/modules/kubernetes/services/kbatch/versions.tf
@@ -14,5 +14,5 @@ terraform {
 
 locals {
   kbatch_service_account_name = "kbatch-kbatch-proxy"
-  kbatch_version              = "0.4.1"
+  kbatch_version              = "0.4.2"
 }