Merge 82ed544 into 0125fd0

kubeflow · Nov 20, 2018 · f480696 · f480696
2 parents 0125fd0 + 82ed544
commit f480696
Show file tree

Hide file tree

Showing 10 changed files with 103 additions and 103 deletions.
diff --git a/ml-pipeline/ml-pipeline/all.libsonnet b/ml-pipeline/ml-pipeline/all.libsonnet
@@ -21,17 +21,17 @@
     local report_usage = params.report_usage,
     local usage_id = params.usage_id,
     reporting:: if (report_usage == true) || (report_usage == "true") then
-                  spartakus.all(namespace,usage_id)
-                else [],
+      spartakus.all(namespace, usage_id)
+    else [],
     argo:: if (deploy_argo == true) || (deploy_argo == "true") then
-             argo.parts(namespace).all
-           else [],
+      argo.parts(namespace).all
+    else [],
     all:: minio.parts(namespace).all +
           mysql.parts(namespace).all +
-          pipeline_apiserver.all(namespace,api_image) +
-          pipeline_scheduledworkflow.all(namespace,scheduledworkflow_image) +
-          pipeline_persistenceagent.all(namespace,persistenceagent_image) +
-          pipeline_ui.all(namespace,ui_image) +
+          pipeline_apiserver.all(namespace, api_image) +
+          pipeline_scheduledworkflow.all(namespace, scheduledworkflow_image) +
+          pipeline_persistenceagent.all(namespace, persistenceagent_image) +
+          pipeline_ui.all(namespace, ui_image) +
           $.parts(_env, _params).argo +
           $.parts(_env, _params).reporting,
   },

diff --git a/ml-pipeline/ml-pipeline/argo.libsonnet b/ml-pipeline/ml-pipeline/argo.libsonnet
@@ -225,7 +225,7 @@
       //  \n   name: mlpipeline-minio-artifact\n   key: secretkey"
       //},
       data: {
-        config: "executorImage: argoproj/argoexec:v2.2.0"
+        config: "executorImage: argoproj/argoexec:v2.2.0",
       },
       kind: "ConfigMap",
       metadata: {

diff --git a/ml-pipeline/ml-pipeline/minio.libsonnet b/ml-pipeline/ml-pipeline/minio.libsonnet
@@ -24,7 +24,7 @@
           },
         },
       },
-    }, //pvc
+    },  //pvc
 
     service: {
       apiVersion: "v1",
@@ -46,9 +46,9 @@
         },
       },
       status: {
-        loadBalancer: {}
+        loadBalancer: {},
       },
-    }, //service
+    },  //service
 
     deploy: {
       apiVersion: "apps/v1beta1",
@@ -59,7 +59,7 @@
       },
       spec: {
         strategy: {
-          type: "Recreate"
+          type: "Recreate",
         },
         template: {
           metadata: {
@@ -82,7 +82,7 @@
                 volumeMounts: [
                   {
                     name: "data",
-                    mountPath: "/data"
+                    mountPath: "/data",
                   },
                 ],
                 image: "minio/minio:RELEASE.2018-02-09T22-40-05Z",
@@ -110,7 +110,7 @@
           },
         },
       },
-    }, // deploy
+    },  // deploy
 
     // The motivation behind the minio secret creation is that argo workflows depend on this secret to
     // store the artifact in minio.
@@ -123,9 +123,9 @@
       },
       type: "Opaque",
       data: {
-        "accesskey": std.base64("minio"),
-        "secretkey": std.base64("minio123"),
+        accesskey: std.base64("minio"),
+        secretkey: std.base64("minio123"),
       },
-    }, // secret
+    },  // secret
   },  // parts
-}
+}
diff --git a/ml-pipeline/ml-pipeline/mysql.libsonnet b/ml-pipeline/ml-pipeline/mysql.libsonnet
@@ -23,7 +23,7 @@
           },
         },
       },
-    }, //pvc
+    },  //pvc
 
     service: {
       apiVersion: "v1",
@@ -43,9 +43,9 @@
         },
       },
       status: {
-        loadBalancer: {}
+        loadBalancer: {},
       },
-    }, //service
+    },  //service
 
     deploy: {
       apiVersion: "apps/v1beta2",
@@ -105,6 +105,6 @@
           },
         },
       },
-    }, //deploy
-  }, //parts
-}
+    },  //deploy
+  },  //parts
+}
diff --git a/ml-pipeline/ml-pipeline/parts.yaml b/ml-pipeline/ml-pipeline/parts.yaml
@@ -1,47 +1,47 @@
-# Copyright 2018 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+// Copyright 2018 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 {
-   "name": "ml-pipeline",
-   "apiVersion": "0.0.1",
-   "kind": "ksonnet.io/parts",
-   "description": "Prototypes for running ML pipeline.\n",
-   "author": "kubeflow-team <kubeflow-discuss@googlegroups.com>",
-   "contributors": [
-      {
-         "name": "Kubeflow Team",
-         "email": "kubeflow-discuss@googlegroups.com"
-      }
-   ],
-   "repository": {
-      "type": "git",
-      "url": "https://github.com/kubeflow/pipelines"
-   },
-   "bugs": {
-      "url": "https://github.com/kubeflow/pipelines/issues"
-   },
-   "keywords": [
-      "ml-pipeline"
-   ],
-   "quickStart": {
-      "prototype": "io.ksonnet.pkg.ml-pipeline",
-      "componentName": "ml-pipeline",
-      "flags": {
-         "name": "ml-pipeline",
-         "namespace": "default"
-      },
-      "comment": "Deploy ML pipeline"
-   },
-   "license": "Apache 2.0"
+  name: "ml-pipeline",
+  apiVersion: "0.0.1",
+  kind: "ksonnet.io/parts",
+  description: "Prototypes for running ML pipeline.\n",
+  author: "kubeflow-team <kubeflow-discuss@googlegroups.com>",
+  contributors: [
+    {
+      name: "Kubeflow Team",
+      email: "kubeflow-discuss@googlegroups.com",
+    },
+  ],
+  repository: {
+    type: "git",
+    url: "https://github.com/kubeflow/pipelines",
+  },
+  bugs: {
+    url: "https://github.com/kubeflow/pipelines/issues",
+  },
+  keywords: [
+    "ml-pipeline",
+  ],
+  quickStart: {
+    prototype: "io.ksonnet.pkg.ml-pipeline",
+    componentName: "ml-pipeline",
+    flags: {
+      name: "ml-pipeline",
+      namespace: "default",
+    },
+    comment: "Deploy ML pipeline",
+  },
+  license: "Apache 2.0",
 }
diff --git a/ml-pipeline/ml-pipeline/pipeline-apiserver.libsonnet b/ml-pipeline/ml-pipeline/pipeline-apiserver.libsonnet
@@ -121,16 +121,16 @@
         },
       },
       status: {
-        loadBalancer: {}
+        loadBalancer: {},
       },
-    }, //service
+    },  //service
 
     deploy(image): {
       apiVersion: "apps/v1beta2",
       kind: "Deployment",
       metadata: {
-        "labels": {
-          "app": "ml-pipeline",
+        labels: {
+          app: "ml-pipeline",
         },
         name: "ml-pipeline",
         namespace: namespace,
@@ -152,14 +152,14 @@
               {
                 name: "ml-pipeline-api-server",
                 image: image,
-                imagePullPolicy: 'Always',
+                imagePullPolicy: "Always",
                 ports: [
-                    {
-                      containerPort: 8888,
-                    },
-                    {
-                      containerPort: 8887,
-                    },
+                  {
+                    containerPort: 8888,
+                  },
+                  {
+                    containerPort: 8887,
+                  },
                 ],
                 env: [
                   {
@@ -177,7 +177,7 @@
           },
         },
       },
-    }, // deploy
+    },  // deploy
 
     pipelineRunnerServiceAccount: {
       apiVersion: "v1",

diff --git a/ml-pipeline/ml-pipeline/pipeline-persistenceagent.libsonnet b/ml-pipeline/ml-pipeline/pipeline-persistenceagent.libsonnet
@@ -84,8 +84,8 @@
       apiVersion: "apps/v1beta2",
       kind: "Deployment",
       metadata: {
-        "labels": {
-          "app": "ml-pipeline-persistenceagent",
+        labels: {
+          app: "ml-pipeline-persistenceagent",
         },
         name: "ml-pipeline-persistenceagent",
         namespace: namespace,
@@ -107,7 +107,7 @@
               {
                 name: "ml-pipeline-persistenceagent",
                 image: image,
-                imagePullPolicy: 'Always',
+                imagePullPolicy: "Always",
                 env: [
                   {
                     name: "POD_NAMESPACE",
@@ -124,6 +124,6 @@
           },
         },
       },
-    }, // deploy
+    },  // deploy
   },  // parts
-}
+}
diff --git a/ml-pipeline/ml-pipeline/pipeline-scheduledworkflow.libsonnet b/ml-pipeline/ml-pipeline/pipeline-scheduledworkflow.libsonnet
@@ -93,8 +93,8 @@
       apiVersion: "apps/v1beta2",
       kind: "Deployment",
       metadata: {
-        "labels": {
-          "app": "ml-pipeline-scheduledworkflow",
+        labels: {
+          app: "ml-pipeline-scheduledworkflow",
         },
         name: "ml-pipeline-scheduledworkflow",
         namespace: namespace,
@@ -116,7 +116,7 @@
               {
                 name: "ml-pipeline-scheduledworkflow",
                 image: image,
-                imagePullPolicy: 'Always',
+                imagePullPolicy: "Always",
                 env: [
                   {
                     name: "POD_NAMESPACE",
@@ -133,7 +133,7 @@
           },
         },
       },
-    }, // deploy
+    },  // deploy
     crd: {
       apiVersion: "apiextensions.k8s.io/v1beta1",
       kind: "CustomResourceDefinition",
@@ -156,4 +156,4 @@
       },
     },  // crd
   },  // parts
-}
+}
diff --git a/ml-pipeline/ml-pipeline/pipeline-ui.libsonnet b/ml-pipeline/ml-pipeline/pipeline-ui.libsonnet
@@ -53,9 +53,9 @@
         },
       },
       status: {
-        loadBalancer: {}
+        loadBalancer: {},
       },
-    }, //serviceUi
+    },  //serviceUi
 
     tensorboardData: {
       apiVersion: "v1",
@@ -93,9 +93,9 @@
         },
       },
       status: {
-        loadBalancer: {}
+        loadBalancer: {},
       },
-    }, //tensorboardData
+    },  //tensorboardData
 
     roleBinding:: {
       apiVersion: "rbac.authorization.k8s.io/v1beta1",
@@ -151,8 +151,8 @@
       apiVersion: "apps/v1beta2",
       kind: "Deployment",
       metadata: {
-        "labels": {
-          "app": "ml-pipeline-ui",
+        labels: {
+          app: "ml-pipeline-ui",
         },
         name: "ml-pipeline-ui",
         namespace: namespace,
@@ -184,6 +184,6 @@
           },
         },
       },
-    }, // deployUi
+    },  // deployUi
   },  // parts
 }