From 93d680d7a3aaca6de00c075d32070aa43714c7ff Mon Sep 17 00:00:00 2001
From: Tanawat Panmongkol <40226657+tanawatpan@users.noreply.github.com>
Date: Tue, 30 May 2023 08:49:33 +0000
Subject: [PATCH] change from IPython.lib to notebook.auth

---
 docker/jupyter.tf       |  2 +-
 docker/main.tf          |  3 ++-
 kubernetes/jupyter.tf   | 24 +++++-------------------
 kubernetes/variables.tf |  6 ++++++
 4 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/docker/jupyter.tf b/docker/jupyter.tf
index addc04c..f112e39 100644
--- a/docker/jupyter.tf
+++ b/docker/jupyter.tf
@@ -50,7 +50,7 @@ resource "local_file" "jupyter_entrypoint" {
 
 		source /home/$HADOOP_USER/config.sh
 
-		HASHED_PASSWORD=$(python3 -c "from IPython.lib import passwd; print(passwd('$JUPYTER_PASSWORD'))")
+		HASHED_PASSWORD=$(python3 -c "from notebook.auth import passwd; print(passwd('$JUPYTER_PASSWORD'))")
 
 		function config_jupyter {
 			# Config Jupyter Lab
diff --git a/docker/main.tf b/docker/main.tf
index e5a898d..b876cbc 100644
--- a/docker/main.tf
+++ b/docker/main.tf
@@ -59,7 +59,8 @@ locals {
         "findspark",
         "pymongo",
         "tensorflow==2.12.*",
-        "transformers"
+        "transformers",
+        "notebook"
       ]
     }
   }
diff --git a/kubernetes/jupyter.tf b/kubernetes/jupyter.tf
index 7e173e5..68a1c83 100644
--- a/kubernetes/jupyter.tf
+++ b/kubernetes/jupyter.tf
@@ -33,25 +33,6 @@ resource "kubectl_manifest" "nvidia_driver_installer" {
   wait_for_rollout = true
 }
 
-resource "kubernetes_persistent_volume_claim" "jupyter_notebooks" {
-  wait_until_bound = false
-
-  metadata {
-    name      = "jupyter-notebooks"
-    namespace = kubernetes_namespace.hadoop.metadata.0.name
-  }
-
-  spec {
-    storage_class_name = "standard-rwo"
-    access_modes       = ["ReadWriteOnce"]
-    resources {
-      requests = {
-        storage = "1Gi"
-      }
-    }
-  }
-}
-
 resource "kubernetes_stateful_set_v1" "jupyter" {
   metadata {
     name      = "jupyter"
@@ -103,6 +84,11 @@ resource "kubernetes_stateful_set_v1" "jupyter" {
           name  = "jupyter"
           image = "${local.jupyter.image_name}:${local.jupyter.version}"
 
+          env {
+            name  = "JUPYTER_PASSWORD"
+            value = var.jupyter_password
+          }
+
           env {
             name  = "SPARK_DRIVER_MEMORY"
             value = "4g"
diff --git a/kubernetes/variables.tf b/kubernetes/variables.tf
index 1effa5e..db55fef 100644
--- a/kubernetes/variables.tf
+++ b/kubernetes/variables.tf
@@ -65,3 +65,9 @@ variable "hive_metastore_mysql_password" {
   sensitive   = true
   description = "Hive Metastore Mysql Password"
 }
+
+variable "jupyter_password" {
+  type        = string
+  sensitive   = true
+  description = "Jupyter password"
+}