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

Also bump etcd to v3.5.10

Signed-off-by: Brad Davidson <[email protected]>

go.mod

@@ -20,14 +20,14 @@ replace (
 	github.com/opencontainers/runtime-spec => github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78
 	github.com/opencontainers/selinux => github.com/opencontainers/selinux v1.10.1
 	github.com/rancher/wrangler => github.com/rancher/wrangler v1.1.1-0.20230818201331-3604a6be798d
-	go.etcd.io/etcd/api/v3 => github.com/k3s-io/etcd/api/v3 v3.5.9-k3s1
-	go.etcd.io/etcd/client/pkg/v3 => github.com/k3s-io/etcd/client/pkg/v3 v3.5.9-k3s1
-	go.etcd.io/etcd/client/v2 => github.com/k3s-io/etcd/client/v2 v2.305.9-k3s1
-	go.etcd.io/etcd/client/v3 => github.com/k3s-io/etcd/client/v3 v3.5.9-k3s1
-	go.etcd.io/etcd/etcdutl/v3 => github.com/k3s-io/etcd/etcdutl/v3 v3.5.9-k3s1
-	go.etcd.io/etcd/pkg/v3 => github.com/k3s-io/etcd/pkg/v3 v3.5.9-k3s1
-	go.etcd.io/etcd/raft/v3 => github.com/k3s-io/etcd/raft/v3 v3.5.9-k3s1
-	go.etcd.io/etcd/server/v3 => github.com/k3s-io/etcd/server/v3 v3.5.9-k3s1
+	go.etcd.io/etcd/api/v3 => github.com/brandond/etcd/api/v3 v3.5.10-alpha.1-k3s1
+	go.etcd.io/etcd/client/pkg/v3 => github.com/brandond/etcd/client/pkg/v3 v3.5.10-alpha.1-k3s1
+	go.etcd.io/etcd/client/v2 => github.com/brandond/etcd/client/v2 v2.305.10-alpha.1-k3s1
+	go.etcd.io/etcd/client/v3 => github.com/brandond/etcd/client/v3 v3.5.10-alpha.1-k3s1
+	go.etcd.io/etcd/etcdutl/v3 => github.com/brandond/etcd/etcdutl/v3 v3.5.10-alpha.1-k3s1
+	go.etcd.io/etcd/pkg/v3 => github.com/brandond/etcd/pkg/v3 v3.5.10-alpha.1-k3s1
+	go.etcd.io/etcd/raft/v3 => github.com/brandond/etcd/raft/v3 v3.5.10-alpha.1-k3s1
+	go.etcd.io/etcd/server/v3 => github.com/brandond/etcd/server/v3 v3.5.10-alpha.1-k3s1
 	go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful => go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.35.0
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc => go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1
@@ -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
@@ -136,14 +143,14 @@ require (
 	github.com/urfave/cli v1.22.14
 	github.com/vishvananda/netlink v1.2.1-beta.2
 	github.com/yl2chen/cidranger v1.0.2
-	go.etcd.io/etcd/api/v3 v3.5.9
-	go.etcd.io/etcd/client/pkg/v3 v3.5.9
-	go.etcd.io/etcd/client/v3 v3.5.9
-	go.etcd.io/etcd/etcdutl/v3 v3.5.9
-	go.etcd.io/etcd/server/v3 v3.5.9
+	go.etcd.io/etcd/api/v3 v3.5.10-alpha.1
+	go.etcd.io/etcd/client/pkg/v3 v3.5.10-alpha.1
+	go.etcd.io/etcd/client/v3 v3.5.10-alpha.1
+	go.etcd.io/etcd/etcdutl/v3 v3.5.10-alpha.1
+	go.etcd.io/etcd/server/v3 v3.5.10-alpha.1
 	go.uber.org/zap v1.24.0
 	golang.org/x/crypto v0.14.0
-	golang.org/x/net v0.14.0
+	golang.org/x/net v0.17.0
 	golang.org/x/sync v0.3.0
 	golang.org/x/sys v0.13.0
 	google.golang.org/grpc v1.57.0
@@ -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