From 3308e0fe57ef636712fc3f5500f7d0dd78a20c00 Mon Sep 17 00:00:00 2001 From: iameskild Date: Mon, 11 Sep 2023 12:31:10 -0600 Subject: [PATCH 1/4] Upgrade images for jupyterhub-ssh, kbatch --- src/_nebari/stages/kubernetes_services/__init__.py | 2 +- .../modules/kubernetes/services/jupyterhub-ssh/variables.tf | 4 ++-- .../template/modules/kubernetes/services/kbatch/versions.tf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/_nebari/stages/kubernetes_services/__init__.py b/src/_nebari/stages/kubernetes_services/__init__.py index 60366786f..9eb36228a 100644 --- 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/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub-ssh/variables.tf b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub-ssh/variables.tf index fade64045..bfa10d0dd 100644 --- a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub-ssh/variables.tf +++ b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub-ssh/variables.tf @@ -30,7 +30,7 @@ variable "jupyterhub-ssh-image" { }) default = { name = "yuvipanda/jupyterhub-ssh-ssh" - tag = "0.0.1-n026.hf136ec7" + tag = "0.0.1-0.dev.git.136.ha610981" } } @@ -42,7 +42,7 @@ variable "jupyterhub-sftp-image" { }) default = { name = "yuvipanda/jupyterhub-ssh-sftp" - tag = "0.0.1-n026.hf136ec7" + tag = "0.0.1-0.dev.git.142.h402a3d6" } } diff --git a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/kbatch/versions.tf b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/kbatch/versions.tf index 4ab68fcd6..268d9c72d 100644 --- a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/kbatch/versions.tf +++ b/src/_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" } From e563913c15888bfebdc5d5e3b57ecfcc104459cd Mon Sep 17 00:00:00 2001 From: iameskild Date: Mon, 11 Sep 2023 16:09:22 -0600 Subject: [PATCH 2/4] Update jupyterhub-ssh image location --- .../modules/kubernetes/services/jupyterhub-ssh/variables.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub-ssh/variables.tf b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub-ssh/variables.tf index bfa10d0dd..430eb1488 100644 --- a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub-ssh/variables.tf +++ b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub-ssh/variables.tf @@ -29,7 +29,7 @@ variable "jupyterhub-ssh-image" { tag = string }) default = { - name = "yuvipanda/jupyterhub-ssh-ssh" + name = "quay.io/jupyterhub-ssh/ssh" tag = "0.0.1-0.dev.git.136.ha610981" } } @@ -41,7 +41,7 @@ variable "jupyterhub-sftp-image" { tag = string }) default = { - name = "yuvipanda/jupyterhub-ssh-sftp" + name = "quay.io/jupyterhub-ssh/sftp" tag = "0.0.1-0.dev.git.142.h402a3d6" } } From 762b65347308bb298d24ad702a54174def5a0886 Mon Sep 17 00:00:00 2001 From: iameskild Date: Mon, 11 Sep 2023 16:49:10 -0600 Subject: [PATCH 3/4] Update sftp image tag --- .../modules/kubernetes/services/jupyterhub-ssh/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub-ssh/variables.tf b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub-ssh/variables.tf index 430eb1488..2d7abddcf 100644 --- a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub-ssh/variables.tf +++ b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub-ssh/variables.tf @@ -42,7 +42,7 @@ variable "jupyterhub-sftp-image" { }) default = { name = "quay.io/jupyterhub-ssh/sftp" - tag = "0.0.1-0.dev.git.142.h402a3d6" + tag = "0.0.1-0.dev.git.136.ha610981" } } From 006c588e0e43e4746199db7c490607135e099742 Mon Sep 17 00:00:00 2001 From: iameskild Date: Mon, 11 Sep 2023 22:17:16 -0600 Subject: [PATCH 4/4] Get jupyterhub-ssh working --- .../modules/kubernetes/services/jupyterhub-ssh/sftp.tf | 3 ++- .../modules/kubernetes/services/jupyterhub-ssh/ssh.tf | 9 ++++++++- .../kubernetes/services/jupyterhub-ssh/variables.tf | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub-ssh/sftp.tf b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub-ssh/sftp.tf index 174b6f209..87f70f9a5 100644 --- a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub-ssh/sftp.tf +++ b/src/_nebari/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/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub-ssh/ssh.tf b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub-ssh/ssh.tf index 4d8f55259..800654953 100644 --- a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub-ssh/ssh.tf +++ b/src/_nebari/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/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub-ssh/variables.tf b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub-ssh/variables.tf index 2d7abddcf..430eb1488 100644 --- a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub-ssh/variables.tf +++ b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub-ssh/variables.tf @@ -42,7 +42,7 @@ variable "jupyterhub-sftp-image" { }) default = { name = "quay.io/jupyterhub-ssh/sftp" - tag = "0.0.1-0.dev.git.136.ha610981" + tag = "0.0.1-0.dev.git.142.h402a3d6" } }