From 524b0fbe1f9e854d41cae69cf114f1bcedbea258 Mon Sep 17 00:00:00 2001 From: numerology Date: Fri, 4 Oct 2019 09:03:19 -0700 Subject: [PATCH 1/2] Finalize. Add todo --- .../chart/kubeflow-pipelines/values.yaml | 2 +- manifests/gcp_marketplace/schema.yaml | 31 ++++++++++--------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/manifests/gcp_marketplace/chart/kubeflow-pipelines/values.yaml b/manifests/gcp_marketplace/chart/kubeflow-pipelines/values.yaml index dd69d781788..8853025aaac 100644 --- a/manifests/gcp_marketplace/chart/kubeflow-pipelines/values.yaml +++ b/manifests/gcp_marketplace/chart/kubeflow-pipelines/values.yaml @@ -15,7 +15,7 @@ images: metadataenvoy: gcr.io/ml-pipeline/google/pipelines/metadataenvoy:0.1.31 gcpSecretName: "user-gcp-sa" -serviceAccountCredential: null +serviceAccountCredential: "" managedstorage: enabled: false diff --git a/manifests/gcp_marketplace/schema.yaml b/manifests/gcp_marketplace/schema.yaml index f45348039ff..c72ebb128b1 100644 --- a/manifests/gcp_marketplace/schema.yaml +++ b/manifests/gcp_marketplace/schema.yaml @@ -100,20 +100,23 @@ properties: type: string x-google-marketplace: type: NAMESPACE - serviceAccountCredential: - title: |- - GCP Service Account credentials used to call other GCP services. - description: |- - This deployment requires a service account to use for authentication when calling other GCP services. - Specify the base64-encoded credentials for the service account you want to use. - You can get these credentials by running the following command in a terminal window. - \"$ gcloud iam service-accounts keys create application_default_credentials.json --iam-account [your-service-account] && cat application_default_credentials.json | base64\" - If you are using Linux, please use \"base64 -w 0\" to disable line wrapping. - type: string - default: "" - x-google-marketplace: - type: STRING +# TODO: temporarily remove sa credential from deploy page in MKP. SA will be added by user manually +# after deployment. +# +# serviceAccountCredential: +# title: |- +# GCP Service Account credentials used to call other GCP services. +# description: |- +# This deployment requires a service account to use for authentication when calling other GCP services. +# Specify the base64-encoded credentials for the service account you want to use. +# You can get these credentials by running the following command in a terminal window. +# \"$ gcloud iam service-accounts keys create application_default_credentials.json --iam-account [your-service-account] && cat application_default_credentials.json | base64\" +# If you are using Linux, please use \"base64 -w 0\" to disable line wrapping. +# type: string +# default: "" +# x-google-marketplace: +# type: STRING required: - name - namespace - - serviceAccountCredential +# - serviceAccountCredential From 8d9b47dd5c932ab1fe39b42f8df8e03b0f4e2fbb Mon Sep 17 00:00:00 2001 From: numerology Date: Fri, 4 Oct 2019 11:20:19 -0700 Subject: [PATCH 2/2] Remove --- manifests/gcp_marketplace/schema.yaml | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/manifests/gcp_marketplace/schema.yaml b/manifests/gcp_marketplace/schema.yaml index c72ebb128b1..86223316de5 100644 --- a/manifests/gcp_marketplace/schema.yaml +++ b/manifests/gcp_marketplace/schema.yaml @@ -100,23 +100,8 @@ properties: type: string x-google-marketplace: type: NAMESPACE -# TODO: temporarily remove sa credential from deploy page in MKP. SA will be added by user manually -# after deployment. -# -# serviceAccountCredential: -# title: |- -# GCP Service Account credentials used to call other GCP services. -# description: |- -# This deployment requires a service account to use for authentication when calling other GCP services. -# Specify the base64-encoded credentials for the service account you want to use. -# You can get these credentials by running the following command in a terminal window. -# \"$ gcloud iam service-accounts keys create application_default_credentials.json --iam-account [your-service-account] && cat application_default_credentials.json | base64\" -# If you are using Linux, please use \"base64 -w 0\" to disable line wrapping. -# type: string -# default: "" -# x-google-marketplace: -# type: STRING + required: - name - namespace -# - serviceAccountCredential +