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

chore: fix OpenTelemetry-Go Contrib CVE-2023-45142 #4847

Merged
merged 1 commit into from Oct 26, 2023

Conversation

feiskyer
Copy link
Member

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

chore: fix OpenTelemetry-Go Contrib CVE-2023-45142

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

fix OpenTelemetry-Go Contrib CVE-2023-45142

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


@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Oct 26, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: feiskyer

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

@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Oct 26, 2023
@MartinForReal
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 26, 2023
@feiskyer
Copy link
Member Author

seems something wrong in tide, merging manually.

@feiskyer feiskyer merged commit da696a1 into master Oct 26, 2023
18 of 19 checks passed
@feiskyer
Copy link
Member Author

/cherry-pick release-1.28

@k8s-infra-cherrypick-robot

@feiskyer: #4847 failed to apply on top of branch "release-1.28":

Applying: chore: fix OpenTelemetry-Go Contrib CVE-2023-45142
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
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/retry/LICENSE
Removing vendor/go.opentelemetry.io/otel/exporters/otlp/internal/config.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
Removing LICENSES/vendor/go.opentelemetry.io/otel/exporters/otlp/internal/retry/LICENSE
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 chore: fix OpenTelemetry-Go Contrib CVE-2023-45142
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-1.28

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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants