rename

.cloudbuild.yaml

@@ -59,7 +59,7 @@ steps:
          '--build-arg', 'SCHEDULED_WORKFLOW_IMAGE=gcr.io/$PROJECT_ID/scheduledworkflow:$COMMIT_SHA',
          '--build-arg', 'PERSISTENCE_AGENT_IMAGE=gcr.io/$PROJECT_ID/persistenceagent:$COMMIT_SHA',
          '--build-arg', 'UI_IMAGE=gcr.io/$PROJECT_ID/frontend:$COMMIT_SHA',
-         '-t', 'gcr.io/$PROJECT_ID/bootstrapper:$COMMIT_SHA', '/workspace/ml-pipeline']
+         '-t', 'gcr.io/$PROJECT_ID/bootstrapper:$COMMIT_SHA', '/workspace/pipeline']
   id:   'buildBootstrapper'
 - name: 'debian'
   entrypoint: '/bin/bash'

ml-pipeline/Dockerfile → pipeline/Dockerfile

@@ -18,9 +18,9 @@ RUN mv ./ks_${KS_VERSION}_linux_amd64/ks /usr/local/bin/
 ENV USER=default
 
 # Copy bootstrapper files
-COPY . /ml-pipeline/
-RUN chmod +x /ml-pipeline/bootstrapper.sh
-RUN chmod +x /ml-pipeline/deploy.sh
+COPY . /pipeline/
+RUN chmod +x /pipeline/bootstrapper.sh
+RUN chmod +x /pipeline/deploy.sh
 
 # install uuidgen. Used for reporting usage
 RUN apt-get install -y uuid-runtime
@@ -40,5 +40,5 @@ ENV SCHEDULED_WORKFLOW_IMAGE ${SCHEDULED_WORKFLOW_IMAGE}
 ENV PERSISTENCE_AGENT_IMAGE ${PERSISTENCE_AGENT_IMAGE}
 ENV UI_IMAGE ${UI_IMAGE}
 
-ENTRYPOINT ["/ml-pipeline/deploy.sh"]
+ENTRYPOINT ["/pipeline/deploy.sh"]
 CMD []

ml-pipeline/deploy.sh → pipeline/deploy.sh

@@ -114,7 +114,7 @@ while [ "$1" != "" ]; do
 done
 
 echo "Configure ksonnet ..."
-/ml-pipeline/bootstrapper.sh
+/pipeline/bootstrapper.sh
 echo "Configure ksonnet completed successfully"
 
 echo "Initialize a ksonnet APP ..."
@@ -127,17 +127,17 @@ echo "Initialized ksonnet APP completed successfully"
 # an known issue: https://github.com/ksonnet/ksonnet/issues/232, we are working around by creating
 # a symbolic links in ./vendor and manually modifying app.yaml
 # when the repo is public we can do following:
-# ks registry add ml-pipeline github.com/kubeflow/pipelines/tree/master/ml-pipeline
-# ks pkg install ml-pipeline/ml-pipeline
+# ks registry add pipeline github.com/kubeflow/pipelines/tree/master/pipeline
+# ks pkg install pipeline/pipeline
 BASEDIR=$(cd $(dirname "$0") && pwd)
-ln -s ${BASEDIR} ${APP_DIR}/vendor/ml-pipeline
+ln -s ${BASEDIR} ${APP_DIR}/vendor/pipeline
 
 # Modifying the app.yaml
 sed '/kind: ksonnet.io\/app/r '<(cat<<'EOF'
 libraries:
-  ml-pipeline:
-    name: ml-pipeline
-    registry: ml-pipeline
+  pipeline:
+    name: pipeline
+    registry: pipeline
 EOF
 )  ${APP_DIR}/app.yaml > ${APP_DIR}/tmp.yaml
 mv ${APP_DIR}/tmp.yaml ${APP_DIR}/app.yaml
@@ -152,15 +152,15 @@ else
 fi
 
 # Generate a ksonnet component manifest and assign parameters
-( cd ${APP_DIR} && ks generate ml-pipeline ml-pipeline )
+( cd ${APP_DIR} && ks generate pipeline pipeline )
 ( cd ${APP_DIR} && ks env set default --namespace ${NAMESPACE} )
-( cd ${APP_DIR} && ks param set ml-pipeline apiImage ${API_SERVER_IMAGE} )
-( cd ${APP_DIR} && ks param set ml-pipeline scheduledWorkflowImage ${SCHEDULED_WORKFLOW_IMAGE} )
-( cd ${APP_DIR} && ks param set ml-pipeline persistenceAgentImage ${PERSISTENCE_AGENT_IMAGE} )
-( 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 usageId $(uuidgen) )
+( cd ${APP_DIR} && ks param set pipeline apiImage ${API_SERVER_IMAGE} )
+( cd ${APP_DIR} && ks param set pipeline scheduledWorkflowImage ${SCHEDULED_WORKFLOW_IMAGE} )
+( cd ${APP_DIR} && ks param set pipeline persistenceAgentImage ${PERSISTENCE_AGENT_IMAGE} )
+( cd ${APP_DIR} && ks param set pipeline uiImage ${UI_IMAGE} )
+( cd ${APP_DIR} && ks param set pipeline deployArgo ${DEPLOY_ARGO} )
+( cd ${APP_DIR} && ks param set pipeline reportUsage ${REPORT_USAGE} )
+( cd ${APP_DIR} && ks param set pipeline usageId $(uuidgen) )
 
 # Get current active service account and create a user-gcp-sa secret with the service key
 if [ "$PLATFORM" = "gcp" ]; then
@@ -201,7 +201,7 @@ if ${UNINSTALL} ; then
 fi
 
 # Install ML pipeline
-( cd ${APP_DIR} && ks apply default -c ml-pipeline)
+( cd ${APP_DIR} && ks apply default -c pipeline)
 
 # Wait for service to be ready
 

ml-pipeline/kf_deploy.sh → pipeline/kf_deploy.sh

@@ -18,6 +18,6 @@ set -xe
 
 REGISTRY="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 
-ks registry add ml-pipeline "${REGISTRY}"
-ks pkg install ml-pipeline/ml-pipeline
-ks generate ml-pipeline ml-pipeline
+ks registry add pipeline "${REGISTRY}"
+ks pkg install pipeline/pipeline
+ks generate pipeline pipeline

ml-pipeline/ml-pipeline/all.libsonnet → pipeline/pipeline/all.libsonnet

@@ -2,14 +2,14 @@
   parts(_env, _params):: {
     local params = _env + _params,
 
-    local argo = import "ml-pipeline/ml-pipeline/argo.libsonnet",
-    local minio = import "ml-pipeline/ml-pipeline/minio.libsonnet",
-    local mysql = import "ml-pipeline/ml-pipeline/mysql.libsonnet",
-    local pipeline_apiserver = import "ml-pipeline/ml-pipeline/pipeline-apiserver.libsonnet",
-    local pipeline_scheduledworkflow = import "ml-pipeline/ml-pipeline/pipeline-scheduledworkflow.libsonnet",
-    local pipeline_persistenceagent = import "ml-pipeline/ml-pipeline/pipeline-persistenceagent.libsonnet",
-    local pipeline_ui = import "ml-pipeline/ml-pipeline/pipeline-ui.libsonnet",
-    local spartakus = import "ml-pipeline/ml-pipeline/spartakus.libsonnet",
+    local argo = import "pipeline/pipeline/argo.libsonnet",
+    local minio = import "pipeline/pipeline/minio.libsonnet",
+    local mysql = import "pipeline/pipeline/mysql.libsonnet",
+    local pipeline_apiserver = import "pipeline/pipeline/pipeline-apiserver.libsonnet",
+    local pipeline_scheduledworkflow = import "pipeline/pipeline/pipeline-scheduledworkflow.libsonnet",
+    local pipeline_persistenceagent = import "pipeline/pipeline/pipeline-persistenceagent.libsonnet",
+    local pipeline_ui = import "pipeline/pipeline/pipeline-ui.libsonnet",
+    local spartakus = import "pipeline/pipeline/spartakus.libsonnet",
 
     local name = params.name,
     local namespace = params.namespace,

ml-pipeline/ml-pipeline/parts.yaml → pipeline/pipeline/parts.yaml

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 {
-  name: "ml-pipeline",
+  name: "pipeline",
   apiVersion: "0.0.1",
   kind: "ksonnet.io/parts",
   description: "Prototypes for running ML pipeline.\n",
@@ -32,13 +32,13 @@
     url: "https://github.com/kubeflow/pipelines/issues",
   },
   keywords: [
-    "ml-pipeline",
+    "pipeline",
   ],
   quickStart: {
-    prototype: "io.ksonnet.pkg.ml-pipeline",
-    componentName: "ml-pipeline",
+    prototype: "io.ksonnet.pkg.pipeline",
+    componentName: "pipeline",
     flags: {
-      name: "ml-pipeline",
+      name: "pipeline",
       namespace: "default",
     },
     comment: "Deploy ML pipeline",

ml-pipeline/ml-pipeline/prototypes/ml-pipeline.jsonnet → pipeline/pipeline/prototypes/pipeline.jsonnet

@@ -1,5 +1,5 @@
 // @apiVersion 0.1
-// @name io.ksonnet.pkg.ml-pipeline
+// @name io.ksonnet.pkg.pipeline
 // @description ML pipeline. Currently includes pipeline API server, frontend and dependencies.
 // @shortDescription ML pipeline
 // @param name string Name to give to each of the components
@@ -11,6 +11,6 @@
 // @optionalParam reportUsage string false flag to report usage
 
 local k = import "k.libsonnet";
-local all = import "ml-pipeline/ml-pipeline/all.libsonnet";
+local all = import "pipeline/pipeline/all.libsonnet";
 
 std.prune(k.core.v1.list.new(all.parts(env, params).all))

ml-pipeline/registry.yaml → pipeline/registry.yaml

@@ -15,6 +15,6 @@
 apiVersion: '0.1'
 kind: ksonnet.io/registry
 libraries:
-  ml-pipeline:
+  pipeline:
     version: master
-    path: ml-pipeline
+    path: pipeline

test/build_image.yaml

@@ -45,7 +45,7 @@ spec:
           - name: commit-sha
             value: "{{inputs.parameters.commit-sha}}"
           - name: docker-path
-            value: ml-pipeline
+            value: pipeline
           - name: image-name
             value: "{{inputs.parameters.bootstrapper-image}}"
       - name: build-api-server-image