sync-notebook needs to look for a Deployment kind that is version ind…

…ependent (#2185) Signed-off-by: Abhilash Pallerlamudi <stp.abhi@gmail.com>
kubeflow · Jan 3, 2019 · 6bcede8 · 6bcede8
1 parent 83a408a
commit 6bcede8
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 2 deletions.
diff --git a/kubeflow/common/util.libsonnet b/kubeflow/common/util.libsonnet
@@ -98,6 +98,80 @@
     return:: aux(a, b, 0, 0, []) tailstrict,
   }.return,
 
+  groupByResource(resources):: {
+    local getKey(resource) = {
+      return::
+        resource.kind,
+    }.return,
+    local getValue(resource) = {
+      return::
+        { [resource.metadata.name]+: resource },
+    }.return,
+    return:: util.foldl(getKey, getValue, resources),
+  }.return,
+
+  comparator(a, b):: {
+    return::
+      if a.metadata.name == b.metadata.name then
+        0
+      else
+        if a.metadata.name < b.metadata.name then
+          -1
+        else
+          1,
+  }.return,
+
+  validateResource(resource):: {
+    return::
+      if std.type(resource) == "object" &&
+         std.objectHas(resource, "kind") &&
+         std.objectHas(resource, "apiVersion") &&
+         std.objectHas(resource, "metadata") &&
+         std.objectHas(resource.metadata, "name") then
+        true
+      else
+        false,
+  }.return,
+
+  extractGroups(obj)::
+    if std.type(obj) == "object" then
+      [obj[key] for key in std.objectFields(obj)]
+    else
+      [],
+
+  extractResources(group)::
+    if std.type(group) == "object" then
+      [group[key] for key in std.objectFields(group)]
+    else
+      [],
+
+  curryResources(resources, exists):: {
+    local existingResource(resource) = {
+      local resourceExists(kind, name) = {
+        return::
+          if std.objectHas(resources, kind) &&
+             std.objectHas(resources[kind], name) then
+            true
+          else
+            false,
+      }.return,
+      return::
+        if util.validateResource(resource) then
+          resourceExists(resource.kind, resource.metadata.name)
+        else
+          false,
+    }.return,
+    local missingResource(resource) = {
+      return::
+        existingResource(resource) == false,
+    }.return,
+    return::
+      if exists == true then
+        existingResource
+      else
+        missingResource,
+  }.return,
+
   // Produce a list of manifests. obj must be an array
   list(obj):: k.core.v1.list.new(obj,),
 }
diff --git a/kubeflow/jupyter/notebooks.libsonnet b/kubeflow/jupyter/notebooks.libsonnet
@@ -35,6 +35,7 @@
       },
       data: {
         "sync-notebook.jsonnet": (importstr "sync-notebook.jsonnet"),
+        "util.libsonnet": (importstr "kubeflow/common/util.libsonnet"),
       },
     },
     notebooksConfigMap:: notebooksConfigMap,

diff --git a/kubeflow/jupyter/sync-notebook.jsonnet b/kubeflow/jupyter/sync-notebook.jsonnet
@@ -3,6 +3,7 @@
 // - Service
 // - Pod
 function(request) {
+  local util = import "util.libsonnet",
   local sharedNamespace = request.controller.metadata.annotations.namespace,
   local templateSpec = request.parent.spec.template.spec,
   local podTemplateSpec = {
@@ -115,7 +116,12 @@ function(request) {
       },
     },
   ],
-  children: children,
+  local validatedChildren = util.sort(std.filter(util.validateResource, children), util.comparator),
+  local requestedChildren = std.flattenArrays(std.map(util.extractResources, util.extractGroups(request.children))),
+  local groupedRequestedChildren = util.groupByResource(requestedChildren),
+  local missingChildren = util.sort(std.filter(util.curryResources(groupedRequestedChildren, false), validatedChildren), util.comparator),
+  local desired = requestedChildren + missingChildren,
+  children: desired,
   status: {
     phase: "Active",
     conditions: [{

diff --git a/kubeflow/jupyter/tests/notebooks_test.jsonnet b/kubeflow/jupyter/tests/notebooks_test.jsonnet
@@ -73,6 +73,7 @@ std.assertEqual(
     apiVersion: "v1",
     data: {
       "sync-notebook.jsonnet": (importstr "../sync-notebook.jsonnet"),
+      "util.libsonnet": (importstr "kubeflow/common/util.libsonnet"),
     },
     kind: "ConfigMap",
     metadata: {

diff --git a/kubeflow/jupyter/tests/sync-notebook_test.jsonnet b/kubeflow/jupyter/tests/sync-notebook_test.jsonnet
@@ -18,7 +18,7 @@ local env = {
   namespace: "kubeflow",
 };
 
-local syncNotebook = import "../sync-notebook.jsonnet";
+local syncNotebook = import "sync-notebook.jsonnet";
 
 local notebook = {
   apiVersion: "kubeflow.org/v1alpha1",