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

[3.5] CVE-2023-47108: Backport go.opentelemetry.io/otel@v1.20.0 and go.open… #16946

Merged
merged 2 commits into from
Nov 16, 2023

Conversation

sharathsivakumar
Copy link
Contributor

This PR addresses the #16926 by bumping dependencies:

  • bump dependency go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc from 0.45.0 to 0.46.0

…telemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc@v0.46.0

Signed-off-by: sharath sivakumar <sharath.sivakumar@mollie.com>
@k8s-ci-robot
Copy link

Hi @sharathsivakumar. Thanks for your PR.

I'm waiting for a etcd-io member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@sharathsivakumar sharathsivakumar changed the title CVE-2023-47108: Backport go.opentelemetry.io/otel@v1.20.0 and go.open… [Draft] CVE-2023-47108: Backport go.opentelemetry.io/otel@v1.20.0 and go.open… Nov 15, 2023
@@ -188,6 +206,15 @@
}
]
},
{
"project": "github.com/grpc-ecosystem/grpc-gateway/v2",
Copy link
Member

Choose a reason for hiding this comment

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

We don't bump grpc-gateway in 3.5. It's a big change.

#16595

Copy link
Member

Choose a reason for hiding this comment

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

It should be fine to just introduce an indirect dependency on grpc-gateway/v2. It means we are still using grpc-gateway v1 in 3.5

@ahrtr
Copy link
Member

ahrtr commented Nov 15, 2023

Please refer to 40c7f72 to resolve the workflow failure in linux-amd64-fmt.

@sharathsivakumar
Copy link
Contributor Author

@ahrtr thanks for the inputs. I will work on the fixes and push the changes.

@ahrtr ahrtr changed the title [Draft] CVE-2023-47108: Backport go.opentelemetry.io/otel@v1.20.0 and go.open… [3.5] CVE-2023-47108: Backport go.opentelemetry.io/otel@v1.20.0 and go.open… Nov 15, 2023
…apis/api,google.golang.org/grpc to make it consistent

Signed-off-by: sharath sivakumar <sharath.sivakumar@mollie.com>
Copy link
Member

@ahrtr ahrtr left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

Thanks

@ahrtr
Copy link
Member

ahrtr commented Nov 15, 2023

Copy link
Member

@jmhbnz jmhbnz left a comment

Choose a reason for hiding this comment

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

LGTM - Thanks @sharathsivakumar

Copy link
Member

@fuweid fuweid left a comment

Choose a reason for hiding this comment

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

LGTM

@fuweid
Copy link
Member

fuweid commented Nov 16, 2023

We still need changelog's change in main branch after merging this one :)

@ahrtr
Copy link
Member

ahrtr commented Nov 16, 2023

We still need changelog's change in main branch after merging this one :)

Yes, @sharathsivakumar Please feel free to raise a separate PR to change the changelog. thx

@ahrtr ahrtr merged commit a733d92 into etcd-io:release-3.5 Nov 16, 2023
12 checks passed
@jmhbnz jmhbnz mentioned this pull request Nov 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

5 participants