Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

formating jsonnet registry #333

Merged
merged 5 commits into from
Nov 20, 2018
Merged

formating jsonnet registry #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
549a280
format libsonnet
IronPan Nov 20, 2018
a57cbf4
update spartakus
IronPan Nov 20, 2018
82ed544
Merge branch 'master' of https://github.com/kubeflow/pipelines into y…
IronPan Nov 20, 2018
e1e69f5
update
IronPan Nov 20, 2018
e9f2d49
fix
IronPan Nov 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ml-pipeline/deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ fi
( cd ${APP_DIR} && ks param set ml-pipeline uiImage ${UI_IMAGE} )
( cd ${APP_DIR} && ks param set ml-pipeline deployArgo ${DEPLOY_ARGO} )
( cd ${APP_DIR} && ks param set ml-pipeline reportUsage ${REPORT_USAGE} )
( cd ${APP_DIR} && ks param set ml-pipeline usage_id $(uuidgen) )
( cd ${APP_DIR} && ks param set ml-pipeline usageId $(uuidgen) )

# Get current active service account and create a user-gcp-sa secret with the service key
if [ "$PLATFORM" = "gcp" ]; then
Expand Down
18 changes: 9 additions & 9 deletions ml-pipeline/ml-pipeline/all.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@
local uiImage = params.uiImage,
local deployArgo = params.deployArgo,
local reportUsage = params.reportUsage,
local usage_id = params.usage_id,
local usageId = params.usageId,
reporting:: if (reportUsage == true) || (reportUsage == "true") then
spartakus.all(namespace,usage_id)
else [],
spartakus.all(namespace, usageId)
else [],
argo:: if (deployArgo == true) || (deployArgo == "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,apiImage) +
pipeline_scheduledworkflow.all(namespace,scheduledWorkflowImage) +
pipeline_persistenceagent.all(namespace,persistenceAgentImage) +
pipeline_ui.all(namespace,uiImage) +
pipeline_apiserver.all(namespace, apiImage) +
pipeline_scheduledworkflow.all(namespace, scheduledWorkflowImage) +
pipeline_persistenceagent.all(namespace, persistenceAgentImage) +
pipeline_ui.all(namespace, uiImage) +
$.parts(_env, _params).argo +
$.parts(_env, _params).reporting,
},
Expand Down
2 changes: 1 addition & 1 deletion ml-pipeline/ml-pipeline/argo.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
20 changes: 10 additions & 10 deletions ml-pipeline/ml-pipeline/minio.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
},
},
}, //pvc
}, //pvc

service: {
apiVersion: "v1",
Expand All @@ -46,9 +46,9 @@
},
},
status: {
loadBalancer: {}
loadBalancer: {},
},
}, //service
}, //service

deploy: {
apiVersion: "apps/v1beta1",
Expand All @@ -59,7 +59,7 @@
},
spec: {
strategy: {
type: "Recreate"
type: "Recreate",
},
template: {
metadata: {
Expand All @@ -82,7 +82,7 @@
volumeMounts: [
{
name: "data",
mountPath: "/data"
mountPath: "/data",
},
],
image: "minio/minio:RELEASE.2018-02-09T22-40-05Z",
Expand Down Expand Up @@ -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.
Expand All @@ -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
}
}
12 changes: 6 additions & 6 deletions ml-pipeline/ml-pipeline/mysql.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
},
},
},
}, //pvc
}, //pvc

service: {
apiVersion: "v1",
Expand All @@ -43,9 +43,9 @@
},
},
status: {
loadBalancer: {}
loadBalancer: {},
},
}, //service
}, //service

deploy: {
apiVersion: "apps/v1beta2",
Expand Down Expand Up @@ -105,6 +105,6 @@
},
},
},
}, //deploy
}, //parts
}
}, //deploy
}, //parts
}
88 changes: 44 additions & 44 deletions ml-pipeline/ml-pipeline/parts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
}
24 changes: 12 additions & 12 deletions ml-pipeline/ml-pipeline/pipeline-apiserver.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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: [
{
Expand All @@ -177,7 +177,7 @@
},
},
},
}, // deploy
}, // deploy

pipelineRunnerServiceAccount: {
apiVersion: "v1",
Expand Down
10 changes: 5 additions & 5 deletions ml-pipeline/ml-pipeline/pipeline-persistenceagent.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -107,7 +107,7 @@
{
name: "ml-pipeline-persistenceagent",
image: image,
imagePullPolicy: 'Always',
imagePullPolicy: "Always",
env: [
{
name: "POD_NAMESPACE",
Expand All @@ -124,6 +124,6 @@
},
},
},
}, // deploy
}, // deploy
}, // parts
}
}
10 changes: 5 additions & 5 deletions ml-pipeline/ml-pipeline/pipeline-scheduledworkflow.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -116,7 +116,7 @@
{
name: "ml-pipeline-scheduledworkflow",
image: image,
imagePullPolicy: 'Always',
imagePullPolicy: "Always",
env: [
{
name: "POD_NAMESPACE",
Expand All @@ -133,7 +133,7 @@
},
},
},
}, // deploy
}, // deploy
crd: {
apiVersion: "apiextensions.k8s.io/v1beta1",
kind: "CustomResourceDefinition",
Expand All @@ -156,4 +156,4 @@
},
}, // crd
}, // parts
}
}
14 changes: 7 additions & 7 deletions ml-pipeline/ml-pipeline/pipeline-ui.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@
},
},
status: {
loadBalancer: {}
loadBalancer: {},
},
}, //serviceUi
}, //serviceUi

tensorboardData: {
apiVersion: "v1",
Expand Down Expand Up @@ -93,9 +93,9 @@
},
},
status: {
loadBalancer: {}
loadBalancer: {},
},
}, //tensorboardData
}, //tensorboardData

roleBinding:: {
apiVersion: "rbac.authorization.k8s.io/v1beta1",
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -184,6 +184,6 @@
},
},
},
}, // deployUi
}, // deployUi
}, // parts
}
Loading