Pin golang.org/x and google.golang.org modules to same ver as upstream

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
k3s-io · Oct 17, 2023 · 7ea155b · 7ea155b
1 parent b8dc955
commit 7ea155b
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 289 deletions.
diff --git a/go.mod b/go.mod
@@ -42,11 +42,18 @@ replace (
 	go.opentelemetry.io/otel/sdk => go.opentelemetry.io/otel/sdk v1.13.0
 	go.opentelemetry.io/otel/trace => go.opentelemetry.io/otel/trace v1.13.0
 	go.opentelemetry.io/proto/otlp => go.opentelemetry.io/proto/otlp v0.19.0
-	golang.org/x/crypto => golang.org/x/crypto v0.1.0
+	golang.org/x/crypto => golang.org/x/crypto v0.14.0
 	golang.org/x/net => golang.org/x/net v0.17.0
-	golang.org/x/sys => golang.org/x/sys v0.6.0
-	google.golang.org/genproto => google.golang.org/genproto v0.0.0-20230525234035-dd9d682886f9
-	google.golang.org/grpc => google.golang.org/grpc v1.58.3
+	golang.org/x/oauth2 => golang.org/x/oauth2 v0.8.0
+	golang.org/x/sync => golang.org/x/sync v0.2.0
+	golang.org/x/sys => golang.org/x/sys v0.13.0
+	golang.org/x/term => golang.org/x/term v0.13.0
+	golang.org/x/time => golang.org/x/time v0.3.0
+	golang.org/x/tools => golang.org/x/tools v0.8.0
+	google.golang.org/api => google.golang.org/api v0.114.0
+	google.golang.org/genproto => google.golang.org/genproto v0.0.0-20230525234030-28d5490b6b19
+	google.golang.org/grpc => google.golang.org/grpc v1.54.0
+	google.golang.org/protobuf => google.golang.org/protobuf v1.30.0
 	gopkg.in/square/go-jose.v2 => gopkg.in/square/go-jose.v2 v2.6.0
 	k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.28.2-k3s1
 	k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.28.2-k3s1
@@ -266,7 +273,6 @@ require (
 	github.com/google/go-containerregistry v0.14.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/pprof v0.0.0-20230323073829-e72429f035bd // indirect
-	github.com/google/s2a-go v0.1.5 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect
 	github.com/googleapis/gax-go/v2 v2.12.0 // indirect