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-22519: bump opentelemetry package #840

Merged

Conversation

jmencak
Copy link
Contributor

@jmencak jmencak commented Oct 28, 2023

Bump opentelemetry package to resolve CVE-2023-45142.

Resolves: OCPBUGS-22519

Bump opentelemetry package to resolve CVE-2023-45142.

Resolves: OCPBUGS-22519
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Oct 28, 2023
@openshift-ci-robot
Copy link
Contributor

@jmencak: This pull request references Jira Issue OCPBUGS-22519, which is invalid:

  • expected the bug to target either version "4.15." or "openshift-4.15.", but it targets "4.14.0" instead

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:

Bump opentelemetry package to resolve CVE-2023-45142.

Resolves: OCPBUGS-22519

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-ci openshift-ci bot requested review from MarSik and yanirq October 28, 2023 06:12
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 28, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jmencak

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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 28, 2023
@jmencak
Copy link
Contributor Author

jmencak commented Oct 28, 2023

/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 Oct 28, 2023
@openshift-ci-robot
Copy link
Contributor

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

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.0) matches configured target version for branch (4.15.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (liqcui@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 kubernetes/test-infra repository.

@jmencak
Copy link
Contributor Author

jmencak commented Oct 30, 2023

/retest

@ffromani
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 30, 2023
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 7ad3f9b and 2 for PR HEAD 08c0bf4 in total

@jmencak
Copy link
Contributor Author

jmencak commented Nov 5, 2023

/retest

Copy link
Contributor

openshift-ci bot commented Nov 5, 2023

@jmencak: 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.

@openshift-ci openshift-ci bot merged commit 12b9a12 into openshift:master Nov 5, 2023
14 checks passed
@openshift-ci-robot
Copy link
Contributor

@jmencak: Jira Issue OCPBUGS-22519: All pull requests linked via external trackers have merged:

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

In response to this:

Bump opentelemetry package to resolve CVE-2023-45142.

Resolves: OCPBUGS-22519

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.

@jmencak jmencak deleted the 4.15-OCPBUGS-22519-otelhttp-bump branch November 5, 2023 20:44
@jmencak
Copy link
Contributor Author

jmencak commented Nov 5, 2023

/cherry-pick release-4.14

@openshift-cherrypick-robot

@jmencak: #840 failed to apply on top of branch "release-4.14":

Applying: OCPBUGS-22519: bump opentelemetry package
.git/rebase-apply/patch:60309: trailing whitespace.
- If you are adding a new file, make sure it has the copyright message template 
.git/rebase-apply/patch:60310: trailing whitespace.
  at the top as a comment. You can copy over the message from an existing file 
.git/rebase-apply/patch:60323: trailing whitespace.
- If you want to fix formatting or style, consider whether your changes are an 
.git/rebase-apply/patch:60324: trailing whitespace.
  obvious improvement or might be considered a personal preference. If a style 
.git/rebase-apply/patch:60325: 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
A	vendor/github.com/golang/glog/glog.go
A	vendor/github.com/golang/glog/glog_file.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/k8s.io/klog/klog_file.go
CONFLICT (content): Merge conflict in vendor/k8s.io/klog/klog_file.go
Auto-merging vendor/k8s.io/klog/klog.go
CONFLICT (content): Merge conflict in vendor/k8s.io/klog/klog.go
Removing vendor/go.opentelemetry.io/otel/metric/noop.go
Removing vendor/go.opentelemetry.io/otel/metric/internal/global/state.go
Removing vendor/go.opentelemetry.io/otel/metric/internal/global/meter.go
Removing vendor/go.opentelemetry.io/otel/metric/internal/global/instruments.go
Removing vendor/go.opentelemetry.io/otel/metric/instrument/syncint64/syncint64.go
Removing vendor/go.opentelemetry.io/otel/metric/instrument/syncfloat64/syncfloat64.go
Removing vendor/go.opentelemetry.io/otel/metric/instrument/config.go
Removing vendor/go.opentelemetry.io/otel/metric/instrument/asyncint64/asyncint64.go
Removing vendor/go.opentelemetry.io/otel/metric/instrument/asyncfloat64/asyncfloat64.go
Removing vendor/go.opentelemetry.io/otel/metric/global/global.go
Removing vendor/go.opentelemetry.io/otel/exporters/otlp/internal/config.go
Removing vendor/github.com/cenkalti/backoff/v4/.travis.yml
Auto-merging 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 OCPBUGS-22519: bump opentelemetry package
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-merge-robot
Copy link
Contributor

Fix included in accepted release 4.15.0-0.nightly-2023-11-06-102702

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. 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

5 participants