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.

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

Cherry pick KFP multi user changes to 1.1 branch #1383

Merged
merged 6 commits into from
Jul 14, 2020

Conversation

Bobgy
Copy link
Contributor

@Bobgy Bobgy commented Jul 14, 2020

Which issue is resolved by this Pull Request:
Part of kubeflow/pipelines#3241

Checklist:

  • Unit tests have been rebuilt:
    1. cd manifests/tests
    2. make generate-changed-only
    3. make test

Bobgy added 6 commits July 14, 2020 14:10
…authorization (kubeflow#1342)

* Add argo to stacks/generic

* Pull pipelines manifest from upstream

* Updated kfp

* Minio v3 manifests

* Rename minio configmap

* Add generic minio install

* Generate new test data

* Mysql kustomize v3 manifest - generic install

* Add mysql gcp pd install

* Generate test data

* Pipelines kustomize v3 manifests

* Add kfp ui virtual service

* Add metadata deployment to stacks/generic

* Use common cluster domain

* Deploy metadata writer

* Add kfp cache server

* Update test data

* Enable KFP multi user mode without istio security

* Fix persistence agent watch namespace

* Fix namespace env for some deployments

* Fix cluster roles and bindings

* fix rename

* Fix pipelines ui role

* Updated kfp to rc2

* simplify pipeline v3 manifest using updated kfp rc2 manifest

* Fix pipeline-install-config

* remove redundant configmap

* update tests

* updated to kfp 1.0.0-rc.3

* Adapt to kfp 1.0rc3 refactoring

* update test snapshots

* fix pull kfp script to detect empty dir

* fix example ref

* update snapshot

* fix gcp pd manifest

* Update stacks ref

* revert alice example to gcp stack

* update snapshot

* fix profile controller iam binding

* Update kfp profile controller can be configured to different images and
istio sidecar

* add missing viewer controller cluster roles

* Use python3 for sync.py

* Revert gcp stack back to use non multi user kfp

* revert unintended changes

* revert upstream changes
…ubeflow#1368)

* Add argo to stacks/generic

* Pull pipelines manifest from upstream

* Updated kfp

* Minio v3 manifests

* Rename minio configmap

* Add generic minio install

* Generate new test data

* Mysql kustomize v3 manifest - generic install

* Add mysql gcp pd install

* Generate test data

* Pipelines kustomize v3 manifests

* Add kfp ui virtual service

* Add metadata deployment to stacks/generic

* Use common cluster domain

* Deploy metadata writer

* Add kfp cache server

* Update test data

* Enable KFP multi user mode without istio security

* Fix persistence agent watch namespace

* Fix namespace env for some deployments

* Fix cluster roles and bindings

* fix rename

* Fix pipelines ui role

* Updated kfp to rc2

* simplify pipeline v3 manifest using updated kfp rc2 manifest

* Fix pipeline-install-config

* remove redundant configmap

* update tests

* updated to kfp 1.0.0-rc.3

* Adapt to kfp 1.0rc3 refactoring

* update test snapshots

* fix pull kfp script to detect empty dir

* fix example ref

* update snapshot

* fix gcp pd manifest

* Update stacks ref

* revert alice example to gcp stack

* update snapshot

* fix profile controller iam binding

* Update kfp profile controller can be configured to different images and
istio sidecar

* add missing viewer controller cluster roles

* Use python3 for sync.py

* Revert gcp stack back to use non multi user kfp

* revert unintended changes

* revert upstream changes

* Secure kfp multi user mode with istio authorization

* patch minio to disable istio sidecar injection

* fix cache server istio authz

* enable istio sidecar for profiles deploy

* enable istio sidecar for centraldashboard

* Do not protect profile controller with istio

* Allow admission webhook traffic to cache-server

* revert gcp stack back to pipeline generic

* Reuse minio generic install as base for gcp-pd and ibm

* update snapshot
…rom the secret (kubeflow#1372)

* refactor: pipelines profile controller should get minio access keys from the secret

* do not print secrets in log
* refactor: pipelines profile controller should get minio access keys from the secret

* do not print secrets in log

* use kfp multi user mode for gcp stacks

* update snapshot
…eflow#1374)

* Add common labels to kfp components

* Add KFP application

* update snapshot

* Use json format for json patch, because yaml will look like a resource and fail tests

* Remove part of label

* update snapshots

* Fix profile controller deployment version

* update snapshot

* Fix userid-header for gcp

* update snapshot

* Fix b64encode exception

* update snapshot

* update snapshot
@kubeflow-bot
Copy link
Contributor

This change is Reviewable

@Bobgy Bobgy changed the base branch from master to v1.1-branch July 14, 2020 06:12
@Bobgy
Copy link
Contributor Author

Bobgy commented Jul 14, 2020

/assign @jlewi

@Bobgy
Copy link
Contributor Author

Bobgy commented Jul 14, 2020

Because this PR cherry picks multiple commits.
/label tide/merge-method-rebase

@k8s-ci-robot
Copy link
Contributor

@Bobgy: The label(s) tide/merge-method-rebase cannot be applied, because the repository doesn't have them

In response to this:

Because this PR cherry picks multiple commits.
/label tide/merge-method-rebase

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@Bobgy
Copy link
Contributor Author

Bobgy commented Jul 14, 2020

@jlewi is it possible adding labels in https://github.com/kubernetes/test-infra/blob/master/config/prow/config.yaml#L562 to this repo, so I can configure merge method?

@jlewi
Copy link
Contributor

jlewi commented Jul 14, 2020

@Bobgy sure send me a PR.

how does method rebase work?

@Bobgy
Copy link
Contributor Author

Bobgy commented Jul 14, 2020

it's not a PR, in github UI, repo maintainers can add new labels to the repo.

Tide can use different merge methods if those labels are present.

@jlewi
Copy link
Contributor

jlewi commented Jul 14, 2020

@Bobgy Right my question is what is the different merge method doing?

I assume its rebasing off something but what is it rebasing off of and how is that different from the default method?

/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jlewi

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@jlewi jlewi mentioned this pull request Jul 14, 2020
2 tasks
@k8s-ci-robot k8s-ci-robot merged commit f7be127 into kubeflow:v1.1-branch Jul 14, 2020
@Bobgy
Copy link
Contributor Author

Bobgy commented Jul 14, 2020

when a PR has multiple commits, the default is to squash them into one before merging.

rebase and merge are also possible, but they keep the original commits in merged branch.

because this PR cherrypicks many past commits, I think It makes more sense not squashing to one commit.

if we add the suggested labels, PR author can configure merge behavior for specific PRs

@Bobgy Bobgy deleted the cp_kfp_multi_user branch July 15, 2020 05:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants