Closed slintes closed 9 months ago
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: clobrano, slintes
The full list of commands accepted by this bot can be found here.
The pull request process is described here
/test 4.13-images
/retest
flaky test /override ci/prow/4.14-openshift-e2e
/cherry-pick release-0.14 /cherry-pick release-0.16
@slintes: once the present PR merges, I will cherry-pick it on top of release-0.14 in a new PR and assign it to you.
@slintes: Overrode contexts on behalf of slintes: ci/prow/4.14-openshift-e2e
@slintes: #100 failed to apply on top of branch "release-0.14":
Applying: Disable HTTP/s on webhook server
Using index info to reconstruct a base tree...
M api/v1beta1/nodemaintenance_webhook.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 api/v1beta1/nodemaintenance_webhook.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 Disable HTTP/s on webhook server
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".
@slintes: new pull request created: #101
Mitigates HTTP/2 CVE