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

change otel dep version to make the build pass #734

Merged
merged 1 commit into from
Sep 20, 2024
Merged

change otel dep version to make the build pass #734

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion patch/istio/1.21/20240410-htnn-go-mod.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ diff --git a/go.mod b/go.mod
index e7f308e890..def9507093 100644
--- a/go.mod
+++ b/go.mod
@@ -5,6 +5,29 @@ go 1.21
@@ -5,6 +5,31 @@ go 1.21
// Client-go does not handle different versions of mergo due to some breaking changes - use the matching version
replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.5

Expand All @@ -28,6 +28,8 @@ index e7f308e890..def9507093 100644
+// added in v0.18.0 causes `go test istio.io/istio/pkg/config/crd` to fail because of compilation error.
+// We can't update the test to solve the error because it's indirect depended by k8s/apiserver.
+replace github.com/google/cel-go => github.com/google/cel-go v0.17.8
+// HTNN requires a higher version of opentelemetry package
+replace go.opentelemetry.io/otel/sdk/metric => go.opentelemetry.io/otel/sdk/metric v1.28.0
+
require (
cloud.google.com/go/compute/metadata v0.2.3
Expand Down
Loading