Skip to content

Conversation

@dmvolod
Copy link
Member

@dmvolod dmvolod commented May 13, 2025

What this PR does / why we need it:
This PR removes "Webhook" suffix from the all web-hook related structures and aligns comments with web-hook implementations (defaulting and/or validating) according to following comments:
#3434 (comment)
#3434 (comment)

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 13, 2025
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label May 13, 2025
@dmvolod
Copy link
Member Author

dmvolod commented May 13, 2025

@sbueringer please have a look at this fix.

Copy link
Member

@sbueringer sbueringer left a comment

Choose a reason for hiding this comment

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

One nit

@sbueringer
Copy link
Member

/cherry-pick release-1.13

@sbueringer
Copy link
Member

/cherry-pick release-1.12

@k8s-infra-cherrypick-robot

@sbueringer: once the present PR merges, I will cherry-pick it on top of release-1.13 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.13

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.

@sbueringer
Copy link
Member

/cherry-pick release-1.11

@k8s-infra-cherrypick-robot

@sbueringer: once the present PR merges, I will cherry-pick it on top of release-1.12 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.12

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.

@k8s-infra-cherrypick-robot

@sbueringer: once the present PR merges, I will cherry-pick it on top of release-1.11 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.11

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.

@dmvolod dmvolod force-pushed the fix-webhook-alias branch from 4aebd0d to a9803d0 Compare May 13, 2025 08:34
@k8s-ci-robot
Copy link
Contributor

@dmvolod: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-cluster-api-provider-vsphere-apidiff-main a9803d0 link false /test pull-cluster-api-provider-vsphere-apidiff-main

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

@sbueringer
Copy link
Member

Thx!

/lgtm

I'll approve once the other PRs are merged, so the cherry-picks have a chance to go through

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

LGTM label has been added.

Git tree hash: 8099d781475cdb072e2ebffe89e606249db31fdd

@sbueringer
Copy link
Member

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 13, 2025
@k8s-ci-robot k8s-ci-robot merged commit 469f3a7 into kubernetes-sigs:main May 13, 2025
13 of 14 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.14 milestone May 13, 2025
@k8s-infra-cherrypick-robot

@sbueringer: new pull request created: #3463

In response to this:

/cherry-pick release-1.13

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.

@k8s-infra-cherrypick-robot

@sbueringer: #3462 failed to apply on top of branch "release-1.12":

Applying: seedling: Fix webhook structure names and descriptions
Using index info to reconstruct a base tree...
M	controllers/vmware/test/controllers_test.go
M	internal/test/helpers/envtest.go
M	internal/webhooks/vmware/vspheremachine.go
M	internal/webhooks/vspheredeploymentzone.go
M	internal/webhooks/vspherefailuredomain.go
M	internal/webhooks/vspheremachine.go
M	internal/webhooks/vspheremachinetemplate.go
M	internal/webhooks/vspheremachinetemplate_test.go
M	internal/webhooks/vspherevm.go
M	main.go
Falling back to patching base and 3-way merge...
Auto-merging main.go
Auto-merging internal/webhooks/vspherevm.go
Auto-merging internal/webhooks/vspheremachinetemplate_test.go
Auto-merging internal/webhooks/vspheremachinetemplate.go
CONFLICT (content): Merge conflict in internal/webhooks/vspheremachinetemplate.go
Auto-merging internal/webhooks/vspheremachine.go
Auto-merging internal/webhooks/vspherefailuredomain.go
Auto-merging internal/webhooks/vspheredeploymentzone.go
Auto-merging internal/webhooks/vmware/vspheremachine.go
Auto-merging internal/test/helpers/envtest.go
Auto-merging controllers/vmware/test/controllers_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 seedling: Fix webhook structure names and descriptions

In response to this:

/cherry-pick release-1.12

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.

@k8s-infra-cherrypick-robot

@sbueringer: #3462 failed to apply on top of branch "release-1.11":

Applying: seedling: Fix webhook structure names and descriptions
Using index info to reconstruct a base tree...
M	controllers/vmware/test/controllers_test.go
M	internal/test/helpers/envtest.go
M	internal/webhooks/vmware/vspheremachine.go
M	internal/webhooks/vspheredeploymentzone.go
M	internal/webhooks/vspherefailuredomain.go
M	internal/webhooks/vspherefailuredomain_test.go
M	internal/webhooks/vspheremachine.go
M	internal/webhooks/vspheremachinetemplate.go
M	internal/webhooks/vspheremachinetemplate_test.go
M	internal/webhooks/vspherevm.go
M	main.go
Falling back to patching base and 3-way merge...
Auto-merging main.go
CONFLICT (content): Merge conflict in main.go
Auto-merging internal/webhooks/vspherevm.go
Auto-merging internal/webhooks/vspheremachinetemplate_test.go
Auto-merging internal/webhooks/vspheremachinetemplate.go
CONFLICT (content): Merge conflict in internal/webhooks/vspheremachinetemplate.go
Auto-merging internal/webhooks/vspheremachine.go
Auto-merging internal/webhooks/vspherefailuredomain_test.go
Auto-merging internal/webhooks/vspherefailuredomain.go
Auto-merging internal/webhooks/vspheredeploymentzone.go
Auto-merging internal/webhooks/vmware/vspheremachine.go
Auto-merging internal/test/helpers/envtest.go
Auto-merging controllers/vmware/test/controllers_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 seedling: Fix webhook structure names and descriptions

In response to this:

/cherry-pick release-1.11

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.

@sbueringer
Copy link
Member

@dmvolod Can you please open manual cherry-pick PRs for release-1.12 & release-1.11. I would prefer if we only make changes to the exported structs there (i.e. changes to the aliases are good enough)

@dmvolod
Copy link
Member Author

dmvolod commented May 13, 2025

@dmvolod Can you please open manual cherry-pick PRs for release-1.12 & release-1.11. I would prefer if we only make changes to the exported structs there (i.e. changes to the aliases are good enough)

Yes, sure, @sbueringer
Will do it with manual PR.

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. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants