From 28251f8b92a9694d65dc52beb7978fc76b26b4fa Mon Sep 17 00:00:00 2001 From: Ryan Richard Date: Tue, 27 Feb 2024 14:54:26 -0800 Subject: [PATCH] Update some comments in go.mod --- go.mod | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 6bb829ad7..154cb0b10 100644 --- a/go.mod +++ b/go.mod @@ -1,16 +1,15 @@ module go.pinniped.dev -// k8s.io/api@v0.29.0 requires go@1.21 go 1.21.3 toolchain go1.22.0 -// This version taken from https://github.com/kubernetes/apiserver/blob/v0.29.0/go.mod#L14 to avoid compile failures. +// This version taken from https://github.com/kubernetes/apiserver/blob/v0.29.2/go.mod#L14 to avoid compile failures. replace github.com/google/cel-go => github.com/google/cel-go v0.17.7 // Fostite depends on ory/x which depends on opentelemetry. kubernetes/apiserver also depends on opentelemetry. // Where they clash and cause "go mod tidy" to fail, use replace directives to make it work. -// Copied from https://github.com/kubernetes/apiserver/blob/v0.29.0/go.mod#L28-L33. +// Copied from https://github.com/kubernetes/apiserver/blob/v0.29.2/go.mod#L28-L33. replace ( go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc => go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 @@ -20,7 +19,7 @@ replace ( go.opentelemetry.io/otel/trace => go.opentelemetry.io/otel/trace v1.19.0 ) -// https://github.com/kubernetes/apiserver/blob/v0.29.0/go.mod does not include this one, but it is also needed +// https://github.com/kubernetes/apiserver/blob/v0.29.2/go.mod does not include this one, but it is also needed // to resolve the clashes with ory/x, so use the same version that kubernetes/apiserver chooses for opentelemetry. replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp => go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0