Closed mhenriks closed 1 month ago
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: akalenyu
The full list of commands accepted by this bot can be found here.
The pull request process is described here
/lgtm
/cherrypick release-v1.59
@mhenriks: #3380 failed to apply on top of branch "release-v1.59":
Applying: Inject cdi-uploadproxy CA cert into user created routes
Using index info to reconstruct a base tree...
M pkg/operator/controller/callbacks.go
M pkg/operator/controller/controller.go
M pkg/operator/controller/controller_test.go
M pkg/operator/controller/route.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/operator/controller/route.go
CONFLICT (content): Merge conflict in pkg/operator/controller/route.go
Auto-merging pkg/operator/controller/controller_test.go
Auto-merging pkg/operator/controller/controller.go
Auto-merging pkg/operator/controller/callbacks.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Inject cdi-uploadproxy CA cert into user created routes
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
What this PR does / why we need it:
Users want to create their own routes but certificate rotation make it difficult to keep them up to date
To take advantage of this feature, routes must meet the following restrictions:
operator.cdi.kubevirt.io/injectUploadProxyCert: "true"
annotationWhich issue(s) this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)
format, will close the issue(s) when PR gets merged): Fixes #https://issues.redhat.com/browse/CNV-31492
Special notes for your reviewer:
Release note: