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.

Sign up for GitHub

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

Jump to bottom

cherry pick of #116140: update otelhttp to v0.35.1 #116143

Merged
merged 1 commit into from Sep 7, 2023
Merged

cherry pick of #116140: update otelhttp to v0.35.1 #116143

merged 1 commit into from Sep 7, 2023

Conversation

dashpole
Copy link
Contributor

What type of PR is this?

/kind bug
/sig instrumentation

What this PR does / why we need it:

Update the otelhttp dependency to include open-telemetry/opentelemetry-go-contrib#2983. That patch is necessary to prevent port-forwarding from breaking when using APIServerTracing.

Which issue(s) this PR fixes:

Address #116139 on the 1.26 branch.

Special notes for your reviewer:

Does this PR introduce a user-facing change?

None

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

- [KEP]: https://github.com/kubernetes/enhancements/blob/master/keps/sig-instrumentation/647-apiserver-tracing/README.md

cc https://github.com/orgs/kubernetes/teams/sig-instrumentation-leads

@k8s-ci-robot k8s-ci-robot added this to the v1.26 milestone Feb 28, 2023
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. kind/bug Categorizes issue or PR as related to a bug. labels Feb 28, 2023
@k8s-ci-robot
Copy link
Contributor

This cherry pick PR is for a release branch and has not yet been approved by Release Managers.
Adding the do-not-merge/cherry-pick-not-approved label.

To merge this cherry pick, it must first be approved (/lgtm + /approve) by the relevant OWNERS.

AFTER it has been approved by code owners, please leave the following comment on a line by itself, with no leading whitespace: /cc kubernetes/release-managers

(This command will request a cherry pick review from Release Managers and should work for all GitHub users, whether they are members of the Kubernetes GitHub organization or not.)

For details on the patch release process and schedule, see the Patch Releases page.

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.

@k8s-ci-robot k8s-ci-robot added sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. area/apiserver labels Feb 28, 2023
@k8s-ci-robot k8s-ci-robot requested review from cheftako and a team February 28, 2023 18:21
@k8s-ci-robot k8s-ci-robot added area/dependency Issues or PRs related to dependency changes sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/architecture Categorizes an issue or PR as relevant to SIG Architecture. sig/auth Categorizes an issue or PR as relevant to SIG Auth. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. labels Feb 28, 2023
@dashpole
Copy link
Contributor Author

/priority important-soon

@k8s-ci-robot k8s-ci-robot added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Feb 28, 2023
@cici37
Copy link
Contributor

cici37 commented Feb 28, 2023

/triage accepted

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Feb 28, 2023
@dgrisonnet
Copy link
Member

/assign @logicalhan

logicalhan
logicalhan approved these changes Mar 9, 2023
View reviewed changes
Copy link
Member

@logicalhan logicalhan left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 9, 2023
@k8s-ci-robot k8s-ci-robot added the sig/storage Categorizes an issue or PR as relevant to SIG Storage. label Aug 18, 2023
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Aug 18, 2023
@dashpole
Copy link
Contributor Author

/test pull-kubernetes-unit-go-compatibility
/test pull-kubernetes-unit

@dashpole
Copy link
Contributor Author

/test pull-kubernetes-e2e-gce-ubuntu-containerd

@bart0sh bart0sh added this to Triage in SIG Node PR Triage Aug 21, 2023
@bart0sh bart0sh moved this from Triage to Needs Reviewer in SIG Node PR Triage Aug 21, 2023
@dashpole
Copy link
Contributor Author

run hack/update-vendor.sh is needed.

Fixed

@logicalhan needs LGTM again

@bart0sh
Copy link
Contributor

bart0sh commented Aug 29, 2023

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 29, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 3987788c1c8c6becdbb26e733a81ade4c92ba16d

@bart0sh
Copy link
Contributor

bart0sh commented Aug 29, 2023

/cc kubernetes/release-managers

@k8s-ci-robot k8s-ci-robot requested a review from a team August 29, 2023 15:44
@bart0sh bart0sh moved this from Needs Reviewer to Needs Approver in SIG Node PR Triage Aug 29, 2023
@xmudrii
Copy link
Member

xmudrii commented Sep 7, 2023

@bart0sh @dashpole @liggitt This PR is on hold but has lgtm+approved. If you want to get this PR merged on this release branch, please remove hold and we'll be happy to cherry-pick-approve it.

@dashpole
Copy link
Contributor Author

dashpole commented Sep 7, 2023

Hold was placed because tests were failing: #116143 (comment), and tests are now passing

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 7, 2023
@liggitt
Copy link
Member

liggitt commented Sep 7, 2023

/hold cancel

xmudrii
xmudrii approved these changes Sep 7, 2023
View reviewed changes
Copy link
Member

@xmudrii xmudrii left a comment

Choose a reason for hiding this comment

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

For RelEng:
/lgtm
/approve

@xmudrii xmudrii added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Sep 7, 2023
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Sep 7, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dashpole, liggitt, logicalhan, xmudrii

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

@xmudrii
Copy link
Member

xmudrii commented Sep 7, 2023

/retest

@k8s-ci-robot k8s-ci-robot merged commit a1ae926 into kubernetes:release-1.26 Sep 7, 2023
16 checks passed
SIG Node PR Triage automation moved this from Needs Approver to Done Sep 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xmudrii xmudrii xmudrii approved these changes

@caesarxuchao caesarxuchao Awaiting requested review from caesarxuchao

@cheftako cheftako Awaiting requested review from cheftako

@liggitt liggitt Awaiting requested review from liggitt

@logicalhan logicalhan Awaiting requested review from logicalhan

@Verolop Verolop Awaiting requested review from Verolop

Assignees

@logicalhan logicalhan

@liggitt liggitt

@Verolop Verolop

@bart0sh bart0sh

@xmudrii xmudrii

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver area/cloudprovider area/code-generation area/dependency Issues or PRs related to dependency changes area/kubectl cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note-none Denotes a PR that doesn't merit a release note. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/architecture Categorizes an issue or PR as relevant to SIG Architecture. sig/auth Categorizes an issue or PR as relevant to SIG Auth. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/storage Categorizes an issue or PR as relevant to SIG Storage. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
SIG Auth
Archived in project
SIG Node PR Triage
Done
Milestone
v1.26
Development

Successfully merging this pull request may close these issues.

None yet