Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable HTTP/2 for webhoook by updating Knative #1822

Merged
merged 1 commit into from
Nov 2, 2023

Conversation

khrm
Copy link
Contributor

@khrm khrm commented Nov 2, 2023

Changes

Submitter Checklist

These are the criteria that every PR should meet, please check them off as you
review them:

See the contribution guide for more details.

Release Notes

NONE

@tekton-robot tekton-robot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Nov 2, 2023
@tekton-robot tekton-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. release-note-none Denotes a PR that doesnt merit a release note. and removed release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Nov 2, 2023
Copy link
Contributor Author

@khrm khrm left a comment

Choose a reason for hiding this comment

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

/kind misc

@tekton-robot tekton-robot added the kind/misc Categorizes issue or PR as a miscellaneuous one. label Nov 2, 2023
@khrm
Copy link
Contributor Author

khrm commented Nov 2, 2023

/assign @jkandasa @vdemeester

@jkandasa
Copy link
Member

jkandasa commented Nov 2, 2023

@vdemeester I guess we are updating knative along with pipelines version bump. Isn't?

@vdemeester
Copy link
Member

yeah we can do it at the same time or now, both work for me.

Copy link
Member

@jkandasa jkandasa left a comment

Choose a reason for hiding this comment

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

/lgtm

@tekton-robot tekton-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 2, 2023
@tekton-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jkandasa

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

@tekton-robot tekton-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 2, 2023
@tekton-robot tekton-robot merged commit 7f78426 into tektoncd:main Nov 2, 2023
@khrm
Copy link
Contributor Author

khrm commented Nov 2, 2023

/cherry-pick release-v0.68.x

@khrm khrm deleted the webhook-http2-main branch November 2, 2023 18:42
@tekton-robot
Copy link
Contributor

@khrm: #1822 failed to apply on top of branch "release-v0.68.x":

Applying: Disable HTTP/2 for webhoook by updating Knative
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/knative.dev/pkg/webhook/webhook.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging vendor/knative.dev/pkg/webhook/webhook.go
CONFLICT (content): Merge conflict in vendor/knative.dev/pkg/webhook/webhook.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
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/2 for webhoook by updating Knative
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".

In response to this:

/cherry-pick release-v0.68.x

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.

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. kind/misc Categorizes issue or PR as a miscellaneuous one. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesnt merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants