🐛 Fix the CRD kustomization path logic to ensure webhook patches are generated exclusively for resources that are configured with webhooks #3838
Conversation
This file contains 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
k8s-ci-robot
added
the
cncf-cla: yes
k8s-ci-robot
added
approved
camilamacedo86
force-pushed
the
fix-dist-g
branch
from
8f33559
to
e003fe3
Compare
camilamacedo86
changed the title
|
/test pull-kubebuilder-e2e-k8s-1-26-6 |
Kavinjsir
approved these changes
Apr 1, 2024
Comment on lines
92
to
95
| if !f.Resource.Webhooks.IsEmpty() { | ||
| webhookPatch := make([]string, 0) | ||
| // Change the line to uncomment the patch line | ||
| webhookPatch = append(webhookPatch, fmt.Sprintf(webhookPatchCodeFragment, suffix)) | ||
| fragments[machinery.NewMarkerFor(f.Path, webhookPatchMarker)] = webhookPatch | ||
| } |
There was a problem hiding this comment.
nit: does it make sense if we simplify the code lines like:
Suggested change
| if !f.Resource.Webhooks.IsEmpty() { | |
| webhookPatch := make([]string, 0) | |
| // Change the line to uncomment the patch line | |
| webhookPatch = append(webhookPatch, fmt.Sprintf(webhookPatchCodeFragment, suffix)) | |
| fragments[machinery.NewMarkerFor(f.Path, webhookPatchMarker)] = webhookPatch | |
| } | |
| if !f.Resource.Webhooks.IsEmpty() { | |
| webhookPatch := fmt.Sprintf(webhookPatchCodeFragment, suffix) | |
| fragments[machinery.NewMarkerFor(f.Path, webhookPatchMarker)] = []string{webhookPatch} | |
| } |
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: camilamacedo86, Kavinjsir 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 |
k8s-ci-robot
added
the
needs-rebase
|
PR needs 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. |
camilamacedo86
force-pushed
the
fix-dist-g
branch
from
e003fe3
to
2caa380
Compare
k8s-ci-robot
removed
the
lgtm
…nerated exclusively for resources that are configured with webhooks
camilamacedo86
force-pushed
the
fix-dist-g
branch
from
2caa380
to
8372976
Compare
|
/lgtm |
k8s-ci-robot
added
the
lgtm
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.
This PR addresses a bug in the generation process of the dist/installer for the testdata sample with multi-group layouts. Previously, the process incorrectly generated webhook patches for all resources, leading to failures in installer creation. With this update, webhook patches are now correctly generated only for resources that have webhooks configured, resolving the issue and ensuring successful generation of the installer.
Closes: #3761