CARRY: Move webhooks into pkg/webhooks #374
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
openshift-ci
bot
added
the
do-not-merge/hold
The CI script should not show errors for expected failures, such as when checking if a resource exists. This commit redirects the standard error to standard output, which is in turn redirected to `/dev/null`.
It should start with lowercase, and should not include the redundant `It`.
The previous one was deleted by mistake, use a newer one that is available.
…ase-0.9 Ci fixes release 0.9
mandre
force-pushed
the
webhooks-0.9
branch
2 times, most recently
from
ffd5751 to
b41a83a
Compare
Moves webhooks from api to pkg/webhooks making only mechanical code changes except for the removal of the defaulting webhooks, because they weren't used. This results in there now being no mutating webhook configured. NOTE(stephenfin): There were a lot of conflicts here. These were mostly mitigated by faking the addition of v1alpha8, which moved the webhooks to the 'api/v1alpha8' package (commit 750b84d), followed by the subsequent rename of this package to v1beta1 (commit e9fb53c), for the webhook files and tests. This still resulted in some merge conflicts due the v1alpha8 changes such as 564b6bd and 4368c4f (which we obviously don't want to include here) but it made the backport much simpler. NOTE(stephenfin): We also include commit 30ba121 which was a follow-up that fixed the CRD generation broken in this commit. Signed-off-by: Stephen Finucane <[email protected]> (cherry picked from commit 750b84d)
stephenfin
force-pushed
the
webhooks-0.9
branch
from
b41a83a to
cb3d212
Compare
The conversion webhook fails to register without this.
Conflicts:
api/v1alpha7/conversion.go
NOTE(stephenfin): Conflicts are due to absence of v1beta1 API on this
branch. We also need to `s/v1beta1/v1alpha7/` on the other files to
handle this.
(cherry picked from commit cb09d5f)
stephenfin
force-pushed
the
webhooks-0.9
branch
from
257df7f to
614bc67
Compare
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: mandre The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/hold cancel |
openshift-ci
bot
removed
the
do-not-merge/hold
|
This should be good to go. The upstream patch at kubernetes-sigs#2612 passes CI on the release-0.9 branch, however the branch is unmaintained now and we can't reasonably expect the maintainers to merge the patch upstream. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Moves webhooks from api to pkg/webhooks making only mechanical code changes except for the removal of the defaulting webhooks, because they weren't used. This results in there now being no mutating webhook configured.
NOTE(stephenfin): There were a lot of conflicts here. These were mostly mitigated by faking the addition of v1alpha8, which moved the webhooks to the 'api/v1alpha8' package (commit 750b84d), followed by the subsequent rename of this package to v1beta1 (commit e9fb53c), for the webhook files and tests. This still resulted in some merge conflicts due the v1alpha8 changes such as 564b6bd and 4368c4f (which we obviously don't want to include here) but it made the backport much simpler.
(cherry picked from commit 750b84d)
/hold