From 1e88bf3faa2bfa67b9e1530cb9a23c0fc8d33550 Mon Sep 17 00:00:00 2001 From: Tim Flannagan Date: Thu, 30 Jan 2025 18:07:11 -0500 Subject: [PATCH] go.mod: Re-organize dependencies (#10560) Signed-off-by: timflannagan --- go.mod | 67 ++++++++++++++++++++++++++++------------------------------ 1 file changed, 32 insertions(+), 35 deletions(-) diff --git a/go.mod b/go.mod index ada765b6e96..d958519583d 100644 --- a/go.mod +++ b/go.mod @@ -3,81 +3,65 @@ module github.com/kgateway-dev/kgateway go 1.23.3 require ( + fybrik.io/crdoc v0.6.3 github.com/Masterminds/semver/v3 v3.3.0 github.com/Netflix/go-expect v0.0.0-20180928190340-9d1f4485533b + github.com/ahmetb/gen-crd-api-reference-docs v0.3.1-0.20240214155107-6cf1ede4da61 github.com/avast/retry-go v2.4.3+incompatible - github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect + github.com/avast/retry-go/v4 v4.3.3 github.com/cncf/xds/go v0.0.0-20241223141626-cff3c89139a3 github.com/envoyproxy/go-control-plane v0.13.2-0.20241022220226-23b7e55d7f65 - github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect + github.com/fgrosse/zaptest v1.1.0 github.com/fsnotify/fsnotify v1.7.0 github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 - github.com/go-openapi/swag v0.23.0 // indirect - github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.4 // indirect + github.com/go-logr/logr v1.4.2 + github.com/go-logr/zapr v1.3.0 + github.com/golang/mock v1.6.0 + github.com/google/go-cmp v0.6.0 github.com/google/go-github/v32 v32.0.0 - github.com/gorilla/mux v1.8.1 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 github.com/hashicorp/go-multierror v1.1.1 github.com/hinshun/vt10x v0.0.0-20180809195222-d55458df857c - github.com/imdario/mergo v1.0.0 // indirect github.com/kelseyhightower/envconfig v1.4.0 github.com/onsi/ginkgo/v2 v2.20.2 github.com/onsi/gomega v1.35.0 github.com/pkg/errors v0.9.1 github.com/rotisserie/eris v0.5.4 github.com/saiskee/gettercheck v0.0.0-20210820204958-38443d06ebe0 - github.com/sergi/go-diff v1.2.0 // indirect + github.com/solo-io/envoy-gloo/go v0.0.0-20250102165327-33a74fcf9966 github.com/solo-io/go-list-licenses v0.1.4 github.com/solo-io/go-utils v0.27.3 github.com/spf13/afero v1.11.0 github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.5 - github.com/spf13/viper v1.19.0 // indirect + github.com/stoewer/go-strcase v1.3.0 + github.com/stretchr/testify v1.9.0 go.opencensus.io v0.24.0 - go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 - golang.org/x/crypto v0.28.0 // indirect - golang.org/x/sync v0.8.0 // indirect + golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 + golang.org/x/net v0.30.0 golang.org/x/tools v0.26.0 google.golang.org/grpc v1.67.1 google.golang.org/protobuf v1.36.1 gopkg.in/AlecAivazis/survey.v1 v1.8.7 helm.sh/helm/v3 v3.16.2 + istio.io/api v1.24.0-alpha.0.0.20241106042855-9e26cdd3450a + istio.io/client-go v1.24.0-alpha.0.0.20241106043554-b5828356941f + istio.io/istio v0.0.0-20241107203726-094b9e700412 k8s.io/api v0.31.2 k8s.io/apiextensions-apiserver v0.31.2 k8s.io/apimachinery v0.31.2 k8s.io/client-go v0.31.2 k8s.io/code-generator v0.31.2 k8s.io/component-base v0.31.2 - k8s.io/kubectl v0.31.2 // indirect + k8s.io/kube-openapi v0.0.0-20240423202451-8948a665c108 k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 knative.dev/pkg v0.0.0-20211206113427-18589ac7627e sigs.k8s.io/controller-runtime v0.19.1 - sigs.k8s.io/gateway-api v1.2.0 - sigs.k8s.io/yaml v1.4.0 -) - -require ( - fybrik.io/crdoc v0.6.3 - github.com/ahmetb/gen-crd-api-reference-docs v0.3.1-0.20240214155107-6cf1ede4da61 - github.com/avast/retry-go/v4 v4.3.3 - github.com/fgrosse/zaptest v1.1.0 - github.com/go-logr/logr v1.4.2 - github.com/go-logr/zapr v1.3.0 - github.com/golang/mock v1.6.0 - github.com/google/go-cmp v0.6.0 - github.com/solo-io/envoy-gloo/go v0.0.0-20250102165327-33a74fcf9966 - github.com/stoewer/go-strcase v1.3.0 - github.com/stretchr/testify v1.9.0 - golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 - golang.org/x/net v0.30.0 - istio.io/api v1.24.0-alpha.0.0.20241106042855-9e26cdd3450a - istio.io/client-go v1.24.0-alpha.0.0.20241106043554-b5828356941f - istio.io/istio v0.0.0-20241107203726-094b9e700412 - k8s.io/kube-openapi v0.0.0-20240423202451-8948a665c108 sigs.k8s.io/controller-tools v0.16.5 + sigs.k8s.io/gateway-api v1.2.0 sigs.k8s.io/structured-merge-diff/v4 v4.4.1 + sigs.k8s.io/yaml v1.4.0 ) require ( @@ -101,6 +85,7 @@ require ( github.com/blang/semver/v4 v4.0.0 // indirect github.com/bugsnag/bugsnag-go v1.5.0 // indirect github.com/bugsnag/panicwrap v1.2.0 // indirect + github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/chai2010/gettext-go v1.0.2 // indirect github.com/containerd/containerd v1.7.12 // indirect @@ -120,6 +105,7 @@ require ( github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect github.com/emicklei/go-restful/v3 v3.12.0 // indirect github.com/emirpasic/gods v1.12.0 // indirect + github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect github.com/evanphx/json-patch v5.9.0+incompatible // indirect github.com/evanphx/json-patch/v5 v5.9.0 // indirect github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect @@ -136,12 +122,15 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/go-openapi/jsonpointer v0.21.0 // indirect github.com/go-openapi/jsonreference v0.21.0 // indirect + github.com/go-openapi/swag v0.23.0 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/gobuffalo/flect v1.0.3 // indirect github.com/gobwas/glob v0.2.3 // indirect github.com/goccy/go-json v0.10.3 // indirect github.com/gofrs/uuid v3.2.0+incompatible // indirect + github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/google/btree v1.1.2 // indirect github.com/google/cel-go v0.21.0 // indirect github.com/google/gnostic-models v0.6.8 // indirect @@ -150,12 +139,14 @@ require ( github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/google/uuid v1.6.0 // indirect + github.com/gorilla/mux v1.8.1 // indirect github.com/gorilla/websocket v1.5.3 // indirect github.com/gosuri/uitable v0.0.4 // indirect github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/huandu/xstrings v1.5.0 // indirect + github.com/imdario/mergo v1.0.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect github.com/jmoiron/sqlx v1.4.0 // indirect @@ -216,10 +207,12 @@ require ( github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/sagikazarmark/locafero v0.4.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect + github.com/sergi/go-diff v1.2.0 // indirect github.com/shopspring/decimal v1.4.0 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/sourcegraph/conc v0.3.0 // indirect github.com/spf13/cast v1.7.0 // indirect + github.com/spf13/viper v1.19.0 // indirect github.com/subosito/gotenv v1.6.0 // indirect github.com/x448/float16 v0.8.4 // indirect github.com/xanzy/ssh-agent v0.3.0 // indirect @@ -240,8 +233,11 @@ require ( go.opentelemetry.io/proto/otlp v1.3.1 // indirect go.starlark.net v0.0.0-20231121155337-90ade8b19d09 // indirect go.uber.org/atomic v1.11.0 // indirect + go.uber.org/multierr v1.11.0 // indirect + golang.org/x/crypto v0.28.0 // indirect golang.org/x/mod v0.21.0 // indirect golang.org/x/oauth2 v0.23.0 // indirect + golang.org/x/sync v0.8.0 // indirect golang.org/x/sys v0.26.0 // indirect golang.org/x/term v0.25.0 // indirect golang.org/x/text v0.19.0 // indirect @@ -260,6 +256,7 @@ require ( k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect k8s.io/klog/v2 v2.130.1 // indirect + k8s.io/kubectl v0.31.2 // indirect oras.land/oras-go v1.2.5 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/kustomize/api v0.17.2 // indirect