leave comment regarding the use of legacy kubernetes api

DataBiosphere · Aug 26, 2024 · 5be87a3 · 5be87a3
1 parent 9e6942f
commit 5be87a3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/...rc/main/scala/org/broadinstitute/dsde/workbench/leonardo/util/KubernetesInterpreter.scala b/...rc/main/scala/org/broadinstitute/dsde/workbench/leonardo/util/KubernetesInterpreter.scala
@@ -98,7 +98,7 @@ class KubernetesInterpreter[F[_]](azureContainerService: AzureContainerService[F
       response <- withLogging(
         call,
         Some(ctx.traceId),
-        s"io.kubernetes.client.apis.CoreV1Api.listNamespacedPod(${namespace.name.value}).pretty(true).execute()"
+        s"io.kubernetes.client.apis.CoreV1Api.listNamespacedPod(${namespace.name.value}, true, null, null, null, null, null, null, null, null)"
       )
 
       listPodStatus: List[PodStatus] = response.getItems.asScala.toList.flatMap(v1Pod =>
@@ -126,7 +126,7 @@ class KubernetesInterpreter[F[_]](azureContainerService: AzureContainerService[F
       _ <- withLogging(
         call,
         Some(ctx.traceId),
-        s"io.kubernetes.client.openapi.apis.CoreV1Api.createNamespace(${namespace.name.value}).pretty(true).execute()"
+        s"io.kubernetes.client.openapi.apis.CoreV1Api.createNamespace(${namespace.name.value}, true, null, null, null)"
       )
     } yield ()
 
@@ -159,7 +159,7 @@ class KubernetesInterpreter[F[_]](azureContainerService: AzureContainerService[F
       _ <- withLogging(
         call,
         Some(ctx.traceId),
-        s"io.kubernetes.client.openapi.apis.CoreV1Api.deleteNamespace(${namespace.name.value}).pretty(true).execute()"
+        s"io.kubernetes.client.openapi.apis.CoreV1Api.deleteNamespace(${namespace.name.value}, true, null, null, null, null, null)"
       )
     } yield ()
 
@@ -187,7 +187,7 @@ class KubernetesInterpreter[F[_]](azureContainerService: AzureContainerService[F
       v1NamespaceList <- withLogging(
         call,
         Some(ctx.traceId),
-        s"io.kubernetes.client.apis.CoreV1Api.listNamespace().pretty(true).allowWatchBookmarks(false).watch(false).execute()",
+        s"io.kubernetes.client.apis.CoreV1Api.listNamespace(true, false, null, null, null, null, null, null, null, null, false)",
         Show.show[Option[V1NamespaceList]](
           _.fold("No namespace found")(x => x.getItems.asScala.toList.map(_.getMetadata.getName).mkString(","))
         )

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -136,6 +136,11 @@ object Dependencies {
   val okHttp =            "com.squareup.okhttp3"  % "okhttp"            % "4.12.0"
 
   val workSpaceManagerV = "0.254.1127-SNAPSHOT"
+
+  // Sticking to the legacy kubernetes java client for now
+  // See the relevant PRs from TCL, the fix suggested in there does not fully cover the leo use cases
+  //  https://github.com/DataBiosphere/terra-common-lib/commit/d9c2eca9510596def6553a63b6fe1eaa0d364163
+  //  https://github.com/DataBiosphere/terra-common-lib/commit/431ad29aeb2275ce3415b22ff4447fc7a34386f7
   val terraCommonLibV = "1.1.4-SNAPSHOT"
   val bpmV = "0.1.548-SNAPSHOT"