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

OCPBUGS-30219: bump otelgrpc to 0.46.0 #712

Merged

Conversation

grokspawn
Copy link
Contributor

@grokspawn grokspawn commented Mar 4, 2024

Manual backport cherry-pick of e2e482a

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 4, 2024
@grokspawn grokspawn changed the title bump otelgrpc to 0.46.0 OCPBUGS-30219: bump otelgrpc to 0.46.0 Mar 4, 2024
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Mar 4, 2024
@openshift-ci-robot
Copy link

@grokspawn: This pull request references Jira Issue OCPBUGS-30219, which is invalid:

  • expected Jira Issue OCPBUGS-30219 to depend on a bug targeting a version in 4.16.0 and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Mar 4, 2024
@grokspawn
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Mar 4, 2024
@openshift-ci-robot
Copy link

@grokspawn: This pull request references Jira Issue OCPBUGS-30219, which is valid. The bug has been moved to the POST state.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.z) matches configured target version for branch (4.15.z)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-23823 is in the state Closed (Done), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-23823 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (jfan@redhat.com), skipping review request.

In response to this:

/jira refresh

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 openshift-eng/jira-lifecycle-plugin repository.

@grokspawn grokspawn force-pushed the otelgrpc-bump-4.15 branch 3 times, most recently from f8e0313 to e2e482a Compare March 5, 2024 15:08
@openshift-ci-robot
Copy link

@grokspawn: This pull request references Jira Issue OCPBUGS-30219, which is valid.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.z) matches configured target version for branch (4.15.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-23823 is in the state Closed (Done), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-23823 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (jfan@redhat.com), skipping review request.

In response to this:

Manual backport cherry-pick of e2e482a

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 openshift-eng/jira-lifecycle-plugin repository.

Copy link
Contributor

@everettraven everettraven left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 5, 2024
@kevinrizza
Copy link
Member

/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Mar 6, 2024
@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Mar 11, 2024
@emmajiafan
Copy link

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 11, 2024
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Mar 11, 2024
@grokspawn
Copy link
Contributor Author

good spot, @emmajiafan. Updated, pending ci.

@emmajiafan
Copy link

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 11, 2024
Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: e6d8fb022872af61bd34e80c185ff206d01dabcf
@grokspawn
Copy link
Contributor Author

/retest

Copy link
Contributor

openshift-ci bot commented Mar 11, 2024

@grokspawn: all tests passed!

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

Copy link
Contributor

@everettraven everettraven left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 11, 2024
Copy link
Contributor

openshift-ci bot commented Mar 11, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: everettraven, grokspawn

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

@openshift-merge-bot openshift-merge-bot bot merged commit 59aa935 into openshift:release-4.15 Mar 11, 2024
13 checks passed
@openshift-ci-robot
Copy link

@grokspawn: Jira Issue OCPBUGS-30219: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-30219 has been moved to the MODIFIED state.

In response to this:

Manual backport cherry-pick of e2e482a

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 openshift-eng/jira-lifecycle-plugin repository.

@grokspawn
Copy link
Contributor Author

/cherry-pick release-4.14

@grokspawn grokspawn deleted the otelgrpc-bump-4.15 branch March 11, 2024 18:54
@openshift-cherrypick-robot

@grokspawn: #712 failed to apply on top of branch "release-4.14":

Applying: bump grpc to 1.60.1, reconnect idle connections (#3147)
.git/rebase-apply/patch:6188: trailing whitespace.
- If you are adding a new file, make sure it has the copyright message template 
.git/rebase-apply/patch:6189: trailing whitespace.
  at the top as a comment. You can copy over the message from an existing file 
.git/rebase-apply/patch:6202: trailing whitespace.
- If you want to fix formatting or style, consider whether your changes are an 
.git/rebase-apply/patch:6203: trailing whitespace.
  obvious improvement or might be considered a personal preference. If a style 
.git/rebase-apply/patch:6204: trailing whitespace.
  change is based on preference, it likely will not be accepted. If it corrects 
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	staging/operator-lifecycle-manager/go.mod
M	staging/operator-lifecycle-manager/go.sum
M	staging/operator-lifecycle-manager/pkg/package-server/provider/registry_test.go
M	staging/operator-lifecycle-manager/test/e2e/util.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
Removing vendor/google.golang.org/grpc/resolver_conn_wrapper.go
Removing vendor/google.golang.org/grpc/reflection/grpc_reflection_v1alpha/reflection.proto
Removing vendor/google.golang.org/grpc/internal/grpcutil/target.go
Removing vendor/google.golang.org/grpc/install_gae.sh
Removing vendor/google.golang.org/grpc/balancer_conn_wrappers.go
Removing vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go
Removing vendor/github.com/docker/distribution/.travis.yml
Removing vendor/github.com/docker/distribution/.gometalinter.json
Auto-merging staging/operator-lifecycle-manager/test/e2e/util.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/test/e2e/util.go
Auto-merging staging/operator-lifecycle-manager/pkg/package-server/provider/registry_test.go
Auto-merging staging/operator-lifecycle-manager/go.sum
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/go.sum
Auto-merging staging/operator-lifecycle-manager/go.mod
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/go.mod
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging 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 bump grpc to 1.60.1, reconnect idle connections (#3147)
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-4.14

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.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build operator-lifecycle-manager-container-v4.15.0-202403111911.p0.g59aa935.assembly.stream.el9 for distgit operator-lifecycle-manager.
All builds following this will include this PR.

@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.15.0-0.nightly-2024-03-12-010512

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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet