diff --git a/patch/istio/1.21/20240410-htnn-go-mod.patch b/patch/istio/1.21/20240410-htnn-go-mod.patch index 38c2c528..8944209b 100644 --- a/patch/istio/1.21/20240410-htnn-go-mod.patch +++ b/patch/istio/1.21/20240410-htnn-go-mod.patch @@ -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 @@ -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