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

Add a BaseWebhook that replaces all kubeflow webhooks #3102

Merged
merged 1 commit into from
Sep 19, 2024

Conversation

alculquicondor
Copy link
Contributor

@alculquicondor alculquicondor commented Sep 19, 2024

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Introduce a BaseWebhook that can be used as-is for most job integrations. This removes a lot of repeated code for kubeflow.

Which issue(s) this PR fixes:

I did this in preparation for #2878
It can also justify the removal of integration tests for most kubeflow jobs #2993

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Add a jobframework.BaseWebhook that can be used for custom job integrations

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. labels Sep 19, 2024
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Sep 19, 2024
Copy link

netlify bot commented Sep 19, 2024

Deploy Preview for kubernetes-sigs-kueue canceled.

Name Link
🔨 Latest commit 8d04237
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-sigs-kueue/deploys/66ec82d71fb5fe0008e42a42

@alculquicondor alculquicondor force-pushed the base-webhook branch 2 times, most recently from b44c458 to 28d2e22 Compare September 19, 2024 19:59
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Sep 19, 2024
Change-Id: Ia6343aa06900654011dec92ff4136b8c2deeaf3f
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alculquicondor

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 added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Sep 19, 2024
Copy link
Member

@tenzen-y tenzen-y left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 19, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 313e1f5f3a611c46ce7521e4083f8aa89ee30b5c

@k8s-ci-robot k8s-ci-robot merged commit 65165be into kubernetes-sigs:main Sep 19, 2024
16 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v0.9 milestone Sep 19, 2024
@mbobrovskyi
Copy link
Contributor

/cherry-pick release-0.8

@k8s-infra-cherrypick-robot
Copy link
Contributor

@mbobrovskyi: #3102 failed to apply on top of branch "release-0.8":

Applying: Add a BaseWebhook that replaces all kubeflow webhooks
Using index info to reconstruct a base tree...
M	pkg/controller/jobs/kubeflow/jobs/mxjob/mxjob_controller.go
M	pkg/controller/jobs/kubeflow/jobs/paddlejob/paddlejob_controller.go
M	pkg/controller/jobs/kubeflow/jobs/pytorchjob/pytorchjob_controller.go
M	pkg/controller/jobs/kubeflow/jobs/tfjob/tfjob_controller.go
M	pkg/controller/jobs/kubeflow/jobs/xgboostjob/xgboostjob_controller.go
M	pkg/controller/jobs/mpijob/mpijob_controller.go
M	pkg/controller/jobs/mpijob/mpijob_webhook.go
M	pkg/controller/jobs/mpijob/mpijob_webhook_test.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): pkg/controller/jobs/mpijob/mpijob_webhook.go deleted in Add a BaseWebhook that replaces all kubeflow webhooks and modified in HEAD. Version HEAD of pkg/controller/jobs/mpijob/mpijob_webhook.go left in tree.
Auto-merging pkg/controller/jobs/mpijob/mpijob_controller.go
CONFLICT (content): Merge conflict in pkg/controller/jobs/mpijob/mpijob_controller.go
Removing pkg/controller/jobs/kubeflow/jobs/xgboostjob/xgboostjob_webhook_test.go
Removing pkg/controller/jobs/kubeflow/jobs/xgboostjob/xgboostjob_webhook.go
Auto-merging pkg/controller/jobs/kubeflow/jobs/xgboostjob/xgboostjob_controller.go
Removing pkg/controller/jobs/kubeflow/jobs/tfjob/tfjob_webhook_test.go
Removing pkg/controller/jobs/kubeflow/jobs/tfjob/tfjob_webhook.go
Auto-merging pkg/controller/jobs/kubeflow/jobs/tfjob/tfjob_controller.go
Removing pkg/controller/jobs/kubeflow/jobs/pytorchjob/pytorchjob_webhook_test.go
Removing pkg/controller/jobs/kubeflow/jobs/pytorchjob/pytorchjob_webhook.go
Auto-merging pkg/controller/jobs/kubeflow/jobs/pytorchjob/pytorchjob_controller.go
Removing pkg/controller/jobs/kubeflow/jobs/paddlejob/paddlejob_webhook_test.go
Removing pkg/controller/jobs/kubeflow/jobs/paddlejob/paddlejob_webhook.go
Auto-merging pkg/controller/jobs/kubeflow/jobs/paddlejob/paddlejob_controller.go
Removing pkg/controller/jobs/kubeflow/jobs/mxjob/mxjob_webhook_test.go
Removing pkg/controller/jobs/kubeflow/jobs/mxjob/mxjob_webhook.go
Auto-merging pkg/controller/jobs/kubeflow/jobs/mxjob/mxjob_controller.go
Auto-merging pkg/controller/jobframework/base_webhook_test.go
CONFLICT (content): Merge conflict in pkg/controller/jobframework/base_webhook_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Add a BaseWebhook that replaces all kubeflow webhooks

In response to this:

/cherry-pick release-0.8

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-sigs/prow repository.

kannon92 pushed a commit to openshift-kannon92/kubernetes-sigs-kueue that referenced this pull request Nov 19, 2024
…s#3102)

Change-Id: Ia6343aa06900654011dec92ff4136b8c2deeaf3f
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants