From f649eb57a045416505b4b8ab410abd1c69b0c83d Mon Sep 17 00:00:00 2001 From: Renmin Date: Tue, 1 Oct 2019 18:01:07 -0700 Subject: [PATCH] Disable cloudsql and update to v0.1.31 (#2284) * add owner * updated owners per comment, keep at least one from SHA for easy co-operation * limit OWNERS scope first * refine doc for MKP * fix James comments for wording * fix doc and mask pwd * temp disable managed storage * also update images to 0.1.31 --- manifests/gcp_marketplace/README.md | 2 +- .../chart/kubeflow-pipelines/values.yaml | 14 +++--- manifests/gcp_marketplace/guide.md | 28 ------------ manifests/gcp_marketplace/schema.yaml | 45 ------------------- 4 files changed, 8 insertions(+), 81 deletions(-) diff --git a/manifests/gcp_marketplace/README.md b/manifests/gcp_marketplace/README.md index f469983d549..61adef5e39c 100644 --- a/manifests/gcp_marketplace/README.md +++ b/manifests/gcp_marketplace/README.md @@ -11,7 +11,7 @@ Kubeflow Pipelines can be installed using either of the following approaches: Get up and running with a few clicks! Install this Kubeflow Pipelines app to a Google Kubernetes Engine cluster using Google Cloud Marketplace. Follow the -[on-screen instructions](https://console.cloud.google.com/marketplace/details/google-cloud-ai-platform/kubeflow-pipelines). +[on-screen instructions](https://console.cloud.google.com/marketplace/details/google-cloud-ai-platform/kubeflow-pipelines) and [guide](https://github.com/kubeflow/pipelines/blob/master/manifests/gcp_marketplace/guide.md). ## Using the command line diff --git a/manifests/gcp_marketplace/chart/kubeflow-pipelines/values.yaml b/manifests/gcp_marketplace/chart/kubeflow-pipelines/values.yaml index fcef7252e8c..cd82b6b859e 100644 --- a/manifests/gcp_marketplace/chart/kubeflow-pipelines/values.yaml +++ b/manifests/gcp_marketplace/chart/kubeflow-pipelines/values.yaml @@ -1,17 +1,17 @@ images: - apiserver: gcr.io/ml-pipeline/api-server:0.1.27 + apiserver: gcr.io/ml-pipeline/api-server:0.1.31 argoexecutor: gcr.io/ml-pipeline/argoexec:v2.3.0-license-compliance argoworkflowcontroller: gcr.io/ml-pipeline/workflow-controller:v2.3.0-license-compliance cloudsqlproxy: gcr.io/cloudsql-docker/gce-proxy:1.14 - frontend: gcr.io/ml-pipeline/frontend:0.1.27 + frontend: gcr.io/ml-pipeline/frontend:0.1.31 metadataserver: gcr.io/tfx-oss-public/ml_metadata_store_server:0.14.0 minio: gcr.io/ml-pipeline/minio:RELEASE.2019-08-14T20-37-41Z-license-compliance mysql: gcr.io/ml-pipeline/mysql:5.6 - persistenceagent: gcr.io/ml-pipeline/persistenceagent:0.1.27 - proxyagent: gcr.io/ml-pipeline/inverse-proxy-agent:0.1.27 - scheduledworkflow: gcr.io/ml-pipeline/scheduledworkflow:0.1.27 - viewercrd: gcr.io/ml-pipeline/viewer-crd-controller:0.1.27 - visualizationserver: gcr.io/ml-pipeline/visualization-server:0.1.27 + persistenceagent: gcr.io/ml-pipeline/persistenceagent:0.1.31 + proxyagent: gcr.io/ml-pipeline/inverse-proxy-agent:0.1.31 + scheduledworkflow: gcr.io/ml-pipeline/scheduledworkflow:0.1.31 + viewercrd: gcr.io/ml-pipeline/viewer-crd-controller:0.1.31 + visualizationserver: gcr.io/ml-pipeline/visualization-server:0.1.31 metadataenvoy: gcr.io/ml-pipeline/envoy:initial gcpSecretName: "user-gcp-sa" diff --git a/manifests/gcp_marketplace/guide.md b/manifests/gcp_marketplace/guide.md index 76c96cb7248..a6e11978aa1 100644 --- a/manifests/gcp_marketplace/guide.md +++ b/manifests/gcp_marketplace/guide.md @@ -34,34 +34,6 @@ cat existing_credentials.json | base64 If you are running this command on Linux, please use `base64 -w 0` to disable line wrapping. -## Use managed storage -Select this option if you want your Kubeflow Pipelines deployment to use Cloud Storage and Cloud SQL for storage. Managed storage takes care of data backup for you, so that your data will be preserved in the case that your cluster is accidentally deleted. - -If you don't select this option, your Kubeflow Pipelines deployment will use Kubernetes [Persisent Volume](https://kubernetes.io/docs/concepts/storage/persistent-volumes/) and in-cluster MySQL. - -## Cloud SQL instance connection name -This is a required field if you choose to use managed storage. -Provide the instance connection name for an existing Cloud SQL for MySQL instance. -The instance connection name can be found on the instance detail page in the Cloud SQL console. -The instance connection name uses the format `project:zone:instance-name`. Example: myproject:us-central1:myinstance. -For more details on how to create a new instance, see https://cloud.google.com/sql/docs/mysql/quickstart. - -## Database username -The database username to use when connecting to the Cloud SQL instance. -If you leave this field empty, the deployment will use the default 'root' user account to connect. -For more details about MySQL users, see https://cloud.google.com/sql/docs/mysql/users. - -## Database password -The database password to use when connecting to the Cloud SQL instance. -If you leave this field empty, the deployment will try to connect to the instance without providing a password. -This will fail if a password is required for the username you provided. - -## Database name prefix -The prefix of the database name. Kubeflow Pipelines will create two databases, `prefix_pipeline` and `prefix_metadata`. -Use lowercase letters, numbers, and hyphens. The name must start with a letter. -If you are reusing a prefix from a previous deployment, your new deployment will recover the data from that deployment. -If the prefix is not specified, the app instance name will be used. - ## Deploy Click `Deploy` to start deploying Kubeflow Pipelines into the cluster you specified. Deployment might take few minutes, so please be patient. After deployment is complete, go to the [Pipelines Console](http://pantheon.corp.google.com/ai-platform/pipelines) to access the Kubeflow Pipelines instance. diff --git a/manifests/gcp_marketplace/schema.yaml b/manifests/gcp_marketplace/schema.yaml index e05b8d5688c..f45348039ff 100644 --- a/manifests/gcp_marketplace/schema.yaml +++ b/manifests/gcp_marketplace/schema.yaml @@ -113,51 +113,6 @@ properties: default: "" x-google-marketplace: type: STRING - managedstorage.enabled: - type: boolean - title: Use managed storage - description: |- - Use Cloud SQL and GCS for storing the data. - Using CloudSQL and GCS provides better reliability and performance, - as well as features such as data backup and usage monitoring. - This is the recommended option especially for production scenarios. - If false, the data will be stored in GCE Persistent Disk. - default: false - managedstorage.cloudsqlInstanceConnectionName: - type: string - title: Cloud SQL instance connection name (Managed storage only) - description: |- - This field must be specified if choose to use managed storage. - Provide the instance connection name for an existing Cloud SQL for MySQL instance. - The instance connection name can be found on the instance detail page in the Cloud SQL console. - The instance connection name uses the format project:zone:instance-name, for example,myproject:us-central1:myinstance. - For more details on how to create a new instance, see https://cloud.google.com/sql/docs/mysql/quickstart. - managedstorage.dbUsername: - type: string - title: Database username (Managed storage only) - description: |- - The database username to use when connecting to the Cloud SQL instance. - If you leave this field empty, the deployment will use the default 'root' user account to connect. - For more details about MySQL users, see https://cloud.google.com/sql/docs/mysql/users. - managedstorage.dbPassword: - type: string - title: Database password (Managed storage only) - x-google-marketplace: - type: MASKED_FIELD - description: |- - The database password to use when connecting to the Cloud SQL instance. - If you leave this field empty, the deployment will try to connect to the instance without providing a password. - This will fail if a password is required for the username you provided. - managedstorage.databaseNamePrefix: - type: string - title: Database name prefix (Managed storage only) - description: |- - The prefix of the database name. Kubeflow Pipelines will create two databases, - [prefix]_pipeline and [prefix]_metadata. - Use lowercase letters, numbers, and hyphens. Start with a letter. - If the prefix specified is same as an old deployment in the past, - the deployment will recover from an old deployment. - If this not specified, the app instance name will be used. required: - name - namespace