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

KFP 1.3.0 Rebase #423

Merged
merged 8 commits into from
Jan 19, 2021
Merged

Conversation

kfp-tekton-bot
Copy link
Contributor

@kfp-tekton-bot kfp-tekton-bot commented Jan 14, 2021

Which issue is resolved by this Pull Request:
Resolves #410

Description of your changes:
Merging the changes from kubeflow/pipelines
1.0.4..1.3.0 into kfp-tekton:

Process followed:

cd ~/Projects/kfp-tekton

mkdir -p ./temp/kubeflow/pipelines
git clone https://github.com/kubeflow/pipelines.git ./temp/kubeflow/pipelines
cd ./temp/kubeflow/pipelines
git diff 1.0.4 1.3.0 -- > ../../git_diff_1.0.4_to_1.3.0.patch

cd -  # back to project root
git checkout master
git pull
git checkout -b kfp_1.3.0_rebase
git apply --reject ./temp/git_diff_1.0.4_to_1.3.0.patch

Environment tested: -- NOT TESTED

  • Python Version (use python --version):
  • Tekton Version (use tkn version):
  • Kubernetes Version (use kubectl version):
  • OS (e.g. from /etc/os-release):

/cc @Tomcli @drewbutlerbb4

/assign @Tomcli @drewbutlerbb4

Please review/revise the following files which had/have merge conflicts. The *.rej files contain the chunks that Git (and I) could not resolve. Create a PR with the resolved changes on the kfp-tekton-bot fork and remove the *.rej files for each resolved file.

frontend/server/configs.ts.rej
frontend/server/app.ts.rej
frontend/src/components/SideNav.tsx.rej
frontend/src/lib/Apis.ts.rej
frontend/src/lib/WorkflowParser.ts.rej
frontend/src/lib/Utils.tsx.rej
frontend/src/lib/CompareUtils.ts.rej
frontend/src/lib/ParserUtils.ts.rej
frontend/src/pages/RunDetails.tsx.rej
frontend/src/pages/PipelineDetails.tsx.rej
frontend/src/pages/__snapshots__/PipelineDetails.test.tsx.snap.rej

backend/Dockerfile.persistenceagent.rej
backend/metadata_writer/src/metadata_writer.py.rej
backend/Dockerfile.scheduledworkflow.rej
backend/src/crd/controller/viewer/reconciler/reconciler.go.rej
backend/src/crd/controller/viewer/reconciler/reconciler_test.go.rej
backend/src/crd/controller/viewer/main.go.rej
backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/BUILD.bazel.rej
backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/scheduledworkflow_client.go.rej
backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/fake/fake_scheduledworkflow.go.rej
backend/src/agent/persistence/persistence_agent.go.rej
backend/src/common/util/workflow_test.go.rej
backend/src/common/client/api_server/pipeline_client_fake.go.rej
backend/src/apiserver/client_manager.go.rej
backend/src/apiserver/config/config.json.rej
backend/src/apiserver/server/pipeline_upload_server_test.go.rej
backend/src/apiserver/server/BUILD.bazel.rej
backend/src/apiserver/server/test_util.go.rej
backend/src/apiserver/server/pipeline_server_test.go.rej
backend/src/apiserver/server/job_server_test.go.rej
backend/src/apiserver/server/experiment_server_test.go.rej
backend/src/apiserver/server/run_server_test.go.rej
backend/src/apiserver/common/config.go.rej
backend/src/apiserver/model/BUILD.bazel.rej
backend/src/apiserver/model/resource_reference_test.go.rej
backend/src/apiserver/resource/client_manager_fake.go.rej
backend/src/apiserver/resource/resource_manager_util_test.go.rej
backend/src/apiserver/resource/resource_manager.go.rej
backend/src/apiserver/resource/resource_manager_test.go.rej
backend/src/apiserver/resource/BUILD.bazel.rej
backend/src/apiserver/resource/resource_manager_util.go.rej
backend/src/apiserver/main.go.rej
backend/src/apiserver/client/BUILD.bazel.rej

sdk/python/tests/compiler/compiler_tests.py.rej

manifests/kustomize/base/pipeline/ml-pipeline-apiserver-role.yaml.rej

@review-notebook-app
Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.


Powered by ReviewNB

@kfp-tekton-bot kfp-tekton-bot changed the title KFP 1.3.0 Rebase [WIP] KFP 1.3.0 Rebase Jan 14, 2021
@ckadner
Copy link
Member

ckadner commented Jan 14, 2021

/assign @Tomcli @drewbutlerbb4

Please review/revise the following files which had/have merge conflicts. The *.rej files contain the chunks that Git (and I) could not resolve. Create a PR with the resolved changes on the kfp-tekton-bot fork and remove the *.rej files for each resolved file.

frontend/server/configs.ts.rej
frontend/server/app.ts.rej
frontend/src/components/SideNav.tsx.rej
frontend/src/lib/Apis.ts.rej
frontend/src/lib/WorkflowParser.ts.rej
frontend/src/lib/Utils.tsx.rej
frontend/src/lib/CompareUtils.ts.rej
frontend/src/lib/ParserUtils.ts.rej
frontend/src/pages/RunDetails.tsx.rej
frontend/src/pages/PipelineDetails.tsx.rej
frontend/src/pages/__snapshots__/PipelineDetails.test.tsx.snap.rej

backend/Dockerfile.persistenceagent.rej
backend/metadata_writer/src/metadata_writer.py.rej
backend/Dockerfile.scheduledworkflow.rej
backend/src/crd/controller/viewer/reconciler/reconciler.go.rej
backend/src/crd/controller/viewer/reconciler/reconciler_test.go.rej
backend/src/crd/controller/viewer/main.go.rej
backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/BUILD.bazel.rej
backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/scheduledworkflow_client.go.rej
backend/src/crd/pkg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/fake/fake_scheduledworkflow.go.rej
backend/src/agent/persistence/persistence_agent.go.rej
backend/src/common/util/workflow_test.go.rej
backend/src/common/client/api_server/pipeline_client_fake.go.rej
backend/src/apiserver/client_manager.go.rej
backend/src/apiserver/config/config.json.rej
backend/src/apiserver/server/pipeline_upload_server_test.go.rej
backend/src/apiserver/server/BUILD.bazel.rej
backend/src/apiserver/server/test_util.go.rej
backend/src/apiserver/server/pipeline_server_test.go.rej
backend/src/apiserver/server/job_server_test.go.rej
backend/src/apiserver/server/experiment_server_test.go.rej
backend/src/apiserver/server/run_server_test.go.rej
backend/src/apiserver/common/config.go.rej
backend/src/apiserver/model/BUILD.bazel.rej
backend/src/apiserver/model/resource_reference_test.go.rej
backend/src/apiserver/resource/client_manager_fake.go.rej
backend/src/apiserver/resource/resource_manager_util_test.go.rej
backend/src/apiserver/resource/resource_manager.go.rej
backend/src/apiserver/resource/resource_manager_test.go.rej
backend/src/apiserver/resource/BUILD.bazel.rej
backend/src/apiserver/resource/resource_manager_util.go.rej
backend/src/apiserver/main.go.rej
backend/src/apiserver/client/BUILD.bazel.rej

sdk/python/tests/compiler/compiler_tests.py.rej

manifests/kustomize/base/pipeline/ml-pipeline-apiserver-role.yaml.rej

@Tomcli Tomcli mentioned this pull request Jan 15, 2021
2 tasks
@Tomcli
Copy link
Member

Tomcli commented Jan 15, 2021

FYI here is the PR to flx the backend conflicts
kfp-tekton-bot#3

In this release, kfp moved away from kfam for auth, so we will need the upcoming kubeflow central control plane that uses the new authorization api for multi-user support.

@ckadner
Copy link
Member

ckadner commented Jan 15, 2021

Thanks @Tomcli and @drewbutlerbb4 -- I merged your PRs and re-committed them using the @kfp-tekton-bot user

@kfp-tekton-bot kfp-tekton-bot changed the title [WIP] KFP 1.3.0 Rebase KFP 1.3.0 Rebase Jan 15, 2021
@ckadner
Copy link
Member

ckadner commented Jan 15, 2021

I fixed the remaining files that still had references to KFP 1.0.4, regenerated the compile report and the "golden" test files

@Tomcli @drewbutlerbb4 @animeshsingh -- I think this PR is ready to merge now but feel free to give it another look.

@Tomcli
Copy link
Member

Tomcli commented Jan 16, 2021

from code wise it looks good to me

I will leave it for the weekend in case someone found some issue or see something missing in the documents.

@Tomcli
Copy link
Member

Tomcli commented Jan 19, 2021

@ckadner can you rebase this PR?

@ckadner
Copy link
Member

ckadner commented Jan 19, 2021

@Tomcli -- the merge conflicts are resolved. All checks passing again.

@Tomcli
Copy link
Member

Tomcli commented Jan 19, 2021

thanks @ckadner
/lgtm
/approve

@k8s-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kfp-tekton-bot, Tomcli

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

@k8s-ci-robot k8s-ci-robot merged commit d5e86d7 into kubeflow:master Jan 19, 2021
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.

migrate to kfp 1.3.0
5 participants