From 549a2800c0619b62a02c00160a5b01d8dfc0d653 Mon Sep 17 00:00:00 2001 From: Yang Pan Date: Tue, 20 Nov 2018 11:48:18 -0800 Subject: [PATCH 1/3] format libsonnet --- ml-pipeline/ml-pipeline/all.libsonnet | 16 ++-- ml-pipeline/ml-pipeline/argo.libsonnet | 2 +- ml-pipeline/ml-pipeline/minio.libsonnet | 20 ++--- ml-pipeline/ml-pipeline/mysql.libsonnet | 12 +-- ml-pipeline/ml-pipeline/parts.yaml | 88 +++++++++---------- .../ml-pipeline/pipeline-apiserver.libsonnet | 24 ++--- .../pipeline-persistenceagent.libsonnet | 10 +-- .../pipeline-scheduledworkflow.libsonnet | 10 +-- ml-pipeline/ml-pipeline/pipeline-ui.libsonnet | 14 +-- 9 files changed, 98 insertions(+), 98 deletions(-) diff --git a/ml-pipeline/ml-pipeline/all.libsonnet b/ml-pipeline/ml-pipeline/all.libsonnet index 34086c0d6f5..ef717a97e26 100644 --- 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 index f69270ab291..aaa74157bad 100644 --- 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 index 2d6a445fcbe..788d37f6b32 100644 --- 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 -} \ No newline at end of file +} diff --git a/ml-pipeline/ml-pipeline/mysql.libsonnet b/ml-pipeline/ml-pipeline/mysql.libsonnet index e1584c8023d..79a4b624353 100644 --- 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 -} \ No newline at end of file + }, //deploy + }, //parts +} diff --git a/ml-pipeline/ml-pipeline/parts.yaml b/ml-pipeline/ml-pipeline/parts.yaml index 6fbc233fdad..2e82c15c549 100644 --- 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 ", - "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 ", + 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 index c4a4756ace4..3ffe63c5212 100644 --- 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 index 4b4a0b9c4c1..91b92c2d0cc 100644 --- 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 -} \ No newline at end of file +} diff --git a/ml-pipeline/ml-pipeline/pipeline-scheduledworkflow.libsonnet b/ml-pipeline/ml-pipeline/pipeline-scheduledworkflow.libsonnet index 51e77ce8d6f..1a9ea954d8b 100644 --- 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 -} \ No newline at end of file +} diff --git a/ml-pipeline/ml-pipeline/pipeline-ui.libsonnet b/ml-pipeline/ml-pipeline/pipeline-ui.libsonnet index 101191bbaf5..c4b391ce54a 100644 --- 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 } From a57cbf4fafde0056a7c8766e1a8c802d2aeb5452 Mon Sep 17 00:00:00 2001 From: Yang Pan Date: Tue, 20 Nov 2018 11:50:57 -0800 Subject: [PATCH 2/3] update spartakus --- ml-pipeline/ml-pipeline/spartakus.libsonnet | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ml-pipeline/ml-pipeline/spartakus.libsonnet b/ml-pipeline/ml-pipeline/spartakus.libsonnet index 0ad60419edf..45ff1621a8d 100644 --- a/ml-pipeline/ml-pipeline/spartakus.libsonnet +++ b/ml-pipeline/ml-pipeline/spartakus.libsonnet @@ -58,8 +58,8 @@ apiVersion: "apps/v1beta2", kind: "Deployment", metadata: { - "labels": { - "app": "pipeline-spartakus-volunteer", + labels: { + app: "pipeline-spartakus-volunteer", }, name: "pipeline-spartakus-volunteer", namespace: namespace, @@ -73,8 +73,8 @@ replicas: 1, template: { metadata: { - "labels": { - "app": "pipeline-spartakus-volunteer", + labels: { + app: "pipeline-spartakus-volunteer", }, }, spec: { @@ -94,6 +94,6 @@ }, }, }, - }, // deployVolunteer + }, // deployVolunteer }, // parts } From e9f2d49ed9192ae359dc567965e4586713633816 Mon Sep 17 00:00:00 2001 From: Yang Pan Date: Tue, 20 Nov 2018 14:03:50 -0800 Subject: [PATCH 3/3] fix --- ml-pipeline/ml-pipeline/all.libsonnet | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ml-pipeline/ml-pipeline/all.libsonnet b/ml-pipeline/ml-pipeline/all.libsonnet index 8fc4789c0b8..041af25112d 100644 --- a/ml-pipeline/ml-pipeline/all.libsonnet +++ b/ml-pipeline/ml-pipeline/all.libsonnet @@ -20,10 +20,10 @@ local deployArgo = params.deployArgo, local reportUsage = params.reportUsage, local usageId = params.usageId, - reporting:: if (report_usage == true) || (report_usage == "true") then + reporting:: if (reportUsage == true) || (reportUsage == "true") then spartakus.all(namespace, usageId) else [], - argo:: if (deploy_argo == true) || (deploy_argo == "true") then + argo:: if (deployArgo == true) || (deployArgo == "true") then argo.parts(namespace).all else [], all:: minio.parts(namespace).all +