Reviewer feedback: switch description of Spark operator to something …

…meaningful, use sparkVersion param instead of hard coded v2.3.1-v1alpha1, and fix hardcoded namespace.
kubeflow · Oct 10, 2018 · 5be2c65 · 5be2c65
1 parent c259542
commit 5be2c65
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/kubeflow/spark/all.libsonnet b/kubeflow/spark/all.libsonnet
@@ -26,6 +26,7 @@
     local namespace = if std.objectHas(params, "namespace") then params.namespace else env.namespace,
     local mainClass = if params.mainClass == "null" then "" else params.mainClass,
     local jobArguments = if params.jobArguments == "null" then [] else std.split(params.jobArguments, ","),
+    local sparkVersion = params.sparkVersion,
 
     jobServiceAccount:: {
       apiVersion: "v1",
@@ -79,7 +80,7 @@
         {
           kind: "ServiceAccount",
           name: name + "-spark",
-          namespace: "default",
+          namespace: namespace,
         },
       ],
       roleRef: {
@@ -221,15 +222,15 @@
         namespace: namespace,
         labels: {
           "app.kubernetes.io/name": name + "-sparkoperator",
-          "app.kubernetes.io/version": "v2.3.1-v1alpha1",
+          "app.kubernetes.io/version": sparkVersion,
         },
       },
       spec: {
         replicas: 1,
         selector: {
           matchLabels: {
             "app.kubernetes.io/name": name + "-sparkoperator",
-            "app.kubernetes.io/version": "v2.3.1-v1alpha1",
+            "app.kubernetes.io/version": sparkVersion,
           },
         },
         strategy: {
@@ -244,7 +245,7 @@
             },
             labels: {
               "app.kubernetes.io/name": name + "-sparkoperator",
-              "app.kubernetes.io/version": "v2.3.1-v1alpha1",
+              "app.kubernetes.io/version": sparkVersion,
             },
             initializers: {
               pending: [
@@ -307,7 +308,7 @@
           cores: params.driverCores,
           memory: params.driverMemory,
           labels: {
-            version: params.sparkVersion,
+            version: sparkVersion,
           },
           // Fix this
           serviceAccount: params.name + "-spark",

diff --git a/kubeflow/spark/parts.yaml b/kubeflow/spark/parts.yaml
@@ -2,7 +2,7 @@
    "name": "spark",
    "apiVersion": "0.0.1",
    "kind": "ksonnet.io/parts",
-   "description": "An empty package used as a stub for new packages.\n",
+   "description": "Holden's awesome Spark Job prototype\n"
    "author": "kubeflow-team <kubeflow-discuss@googlegroups.com>",
    "contributors": [
      {