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

pass projectID from env/configmap without user input #3458

Merged
merged 1 commit into from
Apr 13, 2020
Merged

pass projectID from env/configmap without user input #3458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 manifests/gcp_marketplace/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,5 @@ MANAGEDSTORAGE=true # True means use CloudSQL + Minio-GCS; False means use in-cl
CLOUDSQL=<yours> # Format like project_id:zone:cloudsql_instance_name
PROJECTID=<yours> # This field will be removed after Marketplace can pass in the project ID
mpdev install --deployer=gcr.io/ml-pipeline-test/hosted/$(git rev-parse HEAD)/deployer:$MM_VER \
--parameters='{"name": "'$APP_INSTANCE_NAME'", "namespace": "'$NAMESPACE'", "managedstorage.enabled": '$MANAGEDSTORAGE', "managedstorage.cloudsqlInstanceConnectionName": "'$CLOUDSQL'", "managedstorage.gcsProjectId": "'$PROJECTID'"}'
--parameters='{"name": "'$APP_INSTANCE_NAME'", "namespace": "'$NAMESPACE'", "managedstorage.enabled": '$MANAGEDSTORAGE', "managedstorage.cloudsqlInstanceConnectionName": "'$CLOUDSQL'"}'
```
9 changes: 7 additions & 2 deletions manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/minio.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,20 @@ spec:
- args:
- gateway
- gcs
- {{ .Values.managedstorage.gcsProjectId }}
- $(PROJECT_ID)
env:
- name: PROJECT_ID
valueFrom:
configMapKeyRef:
name: {{ .Values.gcpDefaultConfigName}}
key: "project_id"
- name: MINIO_ACCESS_KEY
value: minio
- name: MINIO_SECRET_KEY
value: minio123
# Minio is KFP system workload and we use GCE's default service account
# or later Workload Identity's corresponding service account.
# So here no need to setup GOOGLE_APPLICATION_CREDENTIALS.
# So here no need to setup GOOGLE_APPLICATION_CREDENTIALS.
# - name: GOOGLE_APPLICATION_CREDENTIALS
# value: "/etc/credentials/application_default_credentials.json"
image: {{ .Values.images.minio }}
Expand Down
6 changes: 0 additions & 6 deletions manifests/gcp_marketplace/schema.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,12 +161,6 @@ properties:
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.
managedstorage.gcsProjectId:
type: string
title: GCS Bucket's project ID (Managed storage only)
description: |-
Normally it's the same project which installs Kubeflow Pipelines.
It's required if enabled managed storage.

required:
- name
Expand Down