From ea579fce7188525fc8a6bd7147fa89b60dadd580 Mon Sep 17 00:00:00 2001 From: IronPan Date: Tue, 17 Sep 2019 16:41:12 +0800 Subject: [PATCH 1/4] small fixes --- manifests/gcp_marketplace/Makefile | 0 manifests/gcp_marketplace/README.md | 2 +- .../chart/kubeflow-pipelines/templates/application.yaml | 2 +- .../chart/kubeflow-pipelines/templates/gcp_secret.yaml | 1 + manifests/gcp_marketplace/schema.yaml | 2 +- 5 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 manifests/gcp_marketplace/Makefile diff --git a/manifests/gcp_marketplace/Makefile b/manifests/gcp_marketplace/Makefile new file mode 100644 index 00000000000..e69de29bb2d diff --git a/manifests/gcp_marketplace/README.md b/manifests/gcp_marketplace/README.md index eadc4fd9949..f469983d549 100644 --- a/manifests/gcp_marketplace/README.md +++ b/manifests/gcp_marketplace/README.md @@ -134,7 +134,7 @@ export MARKETPLACE_TOOLS_IMAGE=gcr.io/cloud-marketplace-staging/marketplace-k8s- Run the install script ```shell -mpdev scripts/install --deployer=gcr.io/ml-pipeline/google/pipelines/deployer:0.2 --parameters='{"name": "'$APP_INSTANCE_NAME'", "namespace": "'$NAMESPACE'", "serviceAccountCredential": "'$SERVICE_ACCOUNT_TOKEN"'}' +mpdev scripts/install --deployer=gcr.io/ml-pipeline/google/pipelines/deployer:0.2 --parameters='{"name": "'$APP_INSTANCE_NAME'", "namespace": "'$NAMESPACE'", "serviceAccountCredential": "'$SERVICE_ACCOUNT_TOKEN'"}' ``` diff --git a/manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/application.yaml b/manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/application.yaml index c1978b441b3..2bded2e1d26 100644 --- a/manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/application.yaml +++ b/manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/application.yaml @@ -12,7 +12,7 @@ metadata: spec: descriptor: type: Kubeflow Pipelines - version: '0.2' + version: '0.1' description: |- Machine Learning Pipeline on Kubernetes maintainers: diff --git a/manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/gcp_secret.yaml b/manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/gcp_secret.yaml index edb758f9ce8..d9ae06d3693 100644 --- a/manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/gcp_secret.yaml +++ b/manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/gcp_secret.yaml @@ -8,3 +8,4 @@ metadata: type: Opaque data: application_default_credentials.json: {{ .Values.serviceAccountCredential | quote }} + user-gcp-sa.json: {{ .Values.serviceAccountCredential | quote }} \ No newline at end of file diff --git a/manifests/gcp_marketplace/schema.yaml b/manifests/gcp_marketplace/schema.yaml index 14036fe9a28..05a033e37fb 100644 --- a/manifests/gcp_marketplace/schema.yaml +++ b/manifests/gcp_marketplace/schema.yaml @@ -1,7 +1,7 @@ x-google-marketplace: schemaVersion: v2 applicationApiVersion: v1beta1 - publishedVersion: '0.2' + publishedVersion: '0.1' publishedVersionMetadata: releaseNote: >- Initial release. From 66bedf7e037bf13c72430e9b806c8e2a50e71d7f Mon Sep 17 00:00:00 2001 From: IronPan Date: Sat, 21 Sep 2019 12:18:59 +0800 Subject: [PATCH 2/4] push pipeline-lite YAML as part of release --- .release.cloudbuild.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.release.cloudbuild.yaml b/.release.cloudbuild.yaml index fe4114ec11a..515fe3fa47d 100644 --- a/.release.cloudbuild.yaml +++ b/.release.cloudbuild.yaml @@ -201,6 +201,16 @@ steps: id: 'copyPythonComponentSDKToLatest' waitFor: ['copyPythonComponentSDKLocal'] +# Generate and copy the pipeline-lite deployment YAML +- name: 'google/cloud-sdk' + args: ['kustomize', '/workspace/manifests/kustomize/env/dev', 'namespaced-install.yaml'] + id: 'generateDeploymentYaml' +- name: 'gcr.io/cloud-builders/gsutil' + args: ['cp', 'namespaced-install.yaml', 'gs://ml-pipeline/namespaced_deployment/$TAG_NAME/namespaced-install.yaml'] + id: 'copyDeploymentYaml' + waitFor: ['generateDeploymentYaml'] + + images: - 'gcr.io/ml-pipeline/frontend:$TAG_NAME' - 'gcr.io/ml-pipeline/frontend:$COMMIT_SHA' From 87141bc27c65e7110c99d12c850d763a032600c3 Mon Sep 17 00:00:00 2001 From: IronPan Date: Sat, 21 Sep 2019 12:20:12 +0800 Subject: [PATCH 3/4] Delete Makefile --- manifests/gcp_marketplace/Makefile | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 manifests/gcp_marketplace/Makefile diff --git a/manifests/gcp_marketplace/Makefile b/manifests/gcp_marketplace/Makefile deleted file mode 100644 index e69de29bb2d..00000000000 From 1a965b2d51af839116018c241ef51750f4fefe70 Mon Sep 17 00:00:00 2001 From: IronPan Date: Sat, 21 Sep 2019 12:22:12 +0800 Subject: [PATCH 4/4] push pipeline-lite YAML as part of release --- .release.cloudbuild.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.release.cloudbuild.yaml b/.release.cloudbuild.yaml index 515fe3fa47d..55709bedf22 100644 --- a/.release.cloudbuild.yaml +++ b/.release.cloudbuild.yaml @@ -206,7 +206,7 @@ steps: args: ['kustomize', '/workspace/manifests/kustomize/env/dev', 'namespaced-install.yaml'] id: 'generateDeploymentYaml' - name: 'gcr.io/cloud-builders/gsutil' - args: ['cp', 'namespaced-install.yaml', 'gs://ml-pipeline/namespaced_deployment/$TAG_NAME/namespaced-install.yaml'] + args: ['cp', 'namespaced-install.yaml', 'gs://ml-pipeline/pipeline-lite/$TAG_NAME/namespaced-install.yaml'] id: 'copyDeploymentYaml' waitFor: ['generateDeploymentYaml']