Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Declarative test setup #9283

Closed
wants to merge 46 commits into from
Closed

Declarative test setup #9283

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
7f1ea61
only add declarative setup
npolshakova Mar 28, 2024
4aec0e2
dedup helm values from declarative setup
npolshakova Mar 28, 2024
6770aff
changelog
npolshakova Mar 28, 2024
1ffaf1c
revert mergo version
npolshakova Mar 28, 2024
754b868
move changelog
npolshakova Mar 28, 2024
c1ead87
regen
npolshakova Mar 28, 2024
8c1f0d7
Merge refs/heads/main into npolshak/declarative-setup
soloio-bulldozer[bot] Mar 29, 2024
f17b956
Merge refs/heads/main into npolshak/declarative-setup
soloio-bulldozer[bot] Mar 29, 2024
0793f9d
Adding changelog file to new location
Mar 29, 2024
a557d94
Deleting changelog file from old location
Mar 29, 2024
30589af
Merge remote-tracking branch 'origin/main' into npolshak/declarative-…
npolshakova Apr 2, 2024
590c640
Merge refs/heads/main into npolshak/declarative-setup
soloio-bulldozer[bot] Apr 2, 2024
ef49794
pr feedback
npolshakova Apr 2, 2024
88ce86c
Merge refs/heads/main into npolshak/declarative-setup
soloio-bulldozer[bot] Apr 3, 2024
174e83e
Merge refs/heads/main into npolshak/declarative-setup
soloio-bulldozer[bot] Apr 3, 2024
b2b123c
Adding changelog file to new location
Apr 3, 2024
f8959bc
Deleting changelog file from old location
Apr 3, 2024
1b996a3
Merge refs/heads/main into npolshak/declarative-setup
soloio-bulldozer[bot] Apr 4, 2024
92fa0ae
Merge refs/heads/main into npolshak/declarative-setup
soloio-bulldozer[bot] Apr 5, 2024
6dfabef
Merge refs/heads/main into npolshak/declarative-setup
soloio-bulldozer[bot] Apr 5, 2024
0b62590
Merge refs/heads/main into npolshak/declarative-setup
soloio-bulldozer[bot] Apr 8, 2024
97fa5bb
Merge refs/heads/main into npolshak/declarative-setup
soloio-bulldozer[bot] Apr 9, 2024
a860944
Adding changelog file to new location
Apr 9, 2024
9ba2cfb
Deleting changelog file from old location
Apr 9, 2024
d0ce0c1
Merge refs/heads/main into npolshak/declarative-setup
soloio-bulldozer[bot] Apr 9, 2024
f784298
Merge refs/heads/main into npolshak/declarative-setup
soloio-bulldozer[bot] Apr 9, 2024
af0885e
Adding changelog file to new location
Apr 10, 2024
41acb20
Deleting changelog file from old location
Apr 10, 2024
7343ecc
Adding changelog file to new location
Apr 11, 2024
61270a7
Deleting changelog file from old location
Apr 11, 2024
286f7a3
Adding changelog file to new location
Apr 12, 2024
0737b0d
Deleting changelog file from old location
Apr 12, 2024
ee0db27
Adding changelog file to new location
Apr 14, 2024
c9c540b
Deleting changelog file from old location
Apr 14, 2024
8b43782
Adding changelog file to new location
Apr 17, 2024
a38e60e
Deleting changelog file from old location
Apr 17, 2024
8b5fee2
Adding changelog file to new location
Apr 25, 2024
bd8645c
Deleting changelog file from old location
Apr 25, 2024
11cc186
Adding changelog file to new location
Apr 30, 2024
ef3e849
Deleting changelog file from old location
Apr 30, 2024
8538828
Adding changelog file to new location
May 3, 2024
2d8eac7
Deleting changelog file from old location
May 3, 2024
db8e393
Adding changelog file to new location
May 9, 2024
a466f3e
Deleting changelog file from old location
May 9, 2024
f561fda
Adding changelog file to new location
May 13, 2024
cdc2c95
Deleting changelog file from old location
May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 12 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -921,6 +921,18 @@ build-test-chart: ## Build the Helm chart and place it in the _test directory
helm package --destination $(TEST_ASSET_DIR) $(HELM_DIR)
helm repo index $(TEST_ASSET_DIR)

# Sets up environment for running e2e tests
.PHONY: setup-declarative-env
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had imagined that the benefit for a declarative environment, is that the config we supply/declare is what defines what should be run. What if instead of having env variables that gate the steps, we just say the processor of the config says "if docker is to true, build the images", "if chart needs to be built, build the chart"...etc? That way we isolate complexity to this declarative setup?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I the separate docker/helm/declarative-setup is how GME handles it. I think it's possible to have the declarative setup also build the images/package the helm chart, but it's a little tricky because I think we'd want it to be identical to what we run in CI so we'd want to somehow reuse the make targets. I don't think it makes sense to hard code all the images/helm chart paths in the declarative setup code to do this since then that could drift.

ifneq ($(SKIP_BUILDING_IMAGES),true)
setup-declarative-env: docker # build docker images
endif
ifneq ($(SKIP_PACKAGE_HELM), true)
setup-declarative-env: package-chart
endif
setup-declarative-env:
@echo "Using config file $(CONFIG)"
@go run ./test/setup setup --config $(CONFIG)

#----------------------------------------------------------------------------------
# Security Scan
#----------------------------------------------------------------------------------
Expand Down
4 changes: 4 additions & 0 deletions changelog/v1.17.0-beta16/add-declarative-setup.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
changelog:
- type: NON_USER_FACING
description: >-
- Added declarative setup for setting up kind cluster, installing gloo and example applications to simplify e2e testing.
2 changes: 1 addition & 1 deletion docs/content/static/content/osa_included.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Name|Version|License
---|---|---
[consul/api](https://github.com/hashicorp/consul)|v1.14.0|Mozilla Public License 2.0
[consul/api](https://github.com/hashicorp/consul)|v1.20.0|Mozilla Public License 2.0
[hashicorp/go-multierror](https://github.com/hashicorp/go-multierror)|v1.1.1|Mozilla Public License 2.0
[hashicorp/go-uuid](https://github.com/hashicorp/go-uuid)|v1.0.2|Mozilla Public License 2.0
[vault/api](https://github.com/hashicorp/vault)|v1.8.2|Mozilla Public License 2.0
Expand Down
22 changes: 13 additions & 9 deletions docs/content/static/content/osa_provided.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Name|Version|License
[go-github/v32](https://github.com/google/go-github)|v32.0.0|BSD 3-clause "New" or "Revised" License
[google/uuid](https://github.com/google/uuid)|v1.3.1|BSD 3-clause "New" or "Revised" License
[gorilla/mux](https://github.com/gorilla/mux)|v1.8.0|BSD 3-clause "New" or "Revised" License
[grpc-ecosystem/go-grpc-middleware](https://github.com/grpc-ecosystem/go-grpc-middleware)|v1.3.0|Apache License 2.0
[grpc-ecosystem/go-grpc-middleware](https://github.com/grpc-ecosystem/go-grpc-middleware)|v1.4.0|Apache License 2.0
[hinshun/vt10x](https://github.com/hinshun/vt10x)|v0.0.0-20180809195222-d55458df857c|MIT License
[imdario/mergo](https://github.com/imdario/mergo)|v0.3.16|BSD 3-clause "New" or "Revised" License
[inconshreveable/go-update](https://github.com/inconshreveable/go-update)|v0.0.0-20160112193335-8152e7eb6ccf|UNKNOWN
Expand All @@ -40,27 +40,30 @@ Name|Version|License
[rotisserie/eris](https://github.com/rotisserie/eris)|v0.5.4|MIT License
[saiskee/gettercheck](https://github.com/saiskee/gettercheck)|v0.0.0-20210820204958-38443d06ebe0|MIT License
[sergi/go-diff](https://github.com/sergi/go-diff)|v1.1.0|MIT License
[spf13/afero](https://github.com/spf13/afero)|v1.9.2|Apache License 2.0
[spf13/afero](https://github.com/spf13/afero)|v1.9.5|Apache License 2.0
[spf13/cobra](https://github.com/spf13/cobra)|v1.8.0|Apache License 2.0
[spf13/pflag](https://github.com/spf13/pflag)|v1.0.5|BSD 3-clause "New" or "Revised" License
[spf13/viper](https://github.com/spf13/viper)|v1.8.1|MIT License
[spf13/viper](https://github.com/spf13/viper)|v1.16.0|MIT License
[go.opencensus.io](https://go.opencensus.io)|v0.24.0|Apache License 2.0
[go.uber.org/goleak](https://go.uber.org/goleak)|v1.2.1|MIT License
[go.uber.org/multierr](https://go.uber.org/multierr)|v1.11.0|MIT License
[go.uber.org/zap](https://go.uber.org/zap)|v1.26.0|MIT License
[x/crypto](https://golang.org/x/crypto)|v0.17.0|BSD 3-clause "New" or "Revised" License
[x/crypto](https://golang.org/x/crypto)|v0.21.0|BSD 3-clause "New" or "Revised" License
[x/exp](https://golang.org/x/exp)|v0.0.0-20231006140011-7918f672742d|BSD 3-clause "New" or "Revised" License
[x/sync](https://golang.org/x/sync)|v0.4.0|BSD 3-clause "New" or "Revised" License
[x/tools](https://golang.org/x/tools)|v0.14.0|BSD 3-clause "New" or "Revised" License
[googleapis/api](https://google.golang.org/genproto/googleapis/api)|v0.0.0-20230822172742-b8732ec3820d|Apache License 2.0
[googleapis/rpc](https://google.golang.org/genproto/googleapis/rpc)|v0.0.0-20230822172742-b8732ec3820d|Apache License 2.0
[x/sync](https://golang.org/x/sync)|v0.6.0|BSD 3-clause "New" or "Revised" License
[x/tools](https://golang.org/x/tools)|v0.19.0|BSD 3-clause "New" or "Revised" License
[googleapis/api](https://google.golang.org/genproto/googleapis/api)|v0.0.0-20231012201019-e917dd12ba7a|Apache License 2.0
[googleapis/rpc](https://google.golang.org/genproto/googleapis/rpc)|v0.0.0-20231009173412-8bfb1ae86b6c|Apache License 2.0
[google.golang.org/grpc](https://google.golang.org/grpc)|v1.59.0|Apache License 2.0
[google.golang.org/protobuf](https://google.golang.org/protobuf)|v1.32.0|BSD 3-clause "New" or "Revised" License
[AlecAivazis/survey.v1](https://gopkg.in/AlecAivazis/survey.v1)|v1.8.7|MIT License
[gopkg.in/yaml.v2](https://gopkg.in/yaml.v2)|v2.4.0|Apache License 2.0
[helm/v3](https://helm.sh/helm/v3)|v3.14.2|Apache License 2.0
[istio.io/istio](https://istio.io/istio)|v0.0.0-20231207195727-552626bd81f6|Apache License 2.0
[k8s.io/api](https://k8s.io/api)|v0.28.3|Apache License 2.0
[k8s.io/apiextensions-apiserver](https://k8s.io/apiextensions-apiserver)|v0.28.3|Apache License 2.0
[k8s.io/apimachinery](https://k8s.io/apimachinery)|v0.28.3|Apache License 2.0
[k8s.io/cli-runtime](https://k8s.io/cli-runtime)|v0.28.3|Apache License 2.0
[k8s.io/client-go](https://k8s.io/client-go)|v0.28.3|Apache License 2.0
[k8s.io/code-generator](https://k8s.io/code-generator)|v0.28.3|Apache License 2.0
[k8s.io/component-base](https://k8s.io/component-base)|v0.28.3|Apache License 2.0
Expand All @@ -69,7 +72,8 @@ Name|Version|License
[knative.dev/networking](https://knative.dev/networking)|v0.0.0-20211210083629-bace06e98aee|Apache License 2.0
[knative.dev/pkg](https://knative.dev/pkg)|v0.0.0-20211206113427-18589ac7627e|Apache License 2.0
[sigs.k8s.io/controller-runtime](https://sigs.k8s.io/controller-runtime)|v0.16.3|Apache License 2.0
[sigs.k8s.io/gateway-api](https://sigs.k8s.io/gateway-api)|v1.0.1-0.20231102234148-3b5969669194|Apache License 2.0
[sigs.k8s.io/gateway-api](https://sigs.k8s.io/gateway-api)|v1.0.1-0.20231102234152-004e14bfe016|Apache License 2.0
[sigs.k8s.io/kind](https://sigs.k8s.io/kind)|v0.20.0|Apache License 2.0
[sigs.k8s.io/yaml](https://sigs.k8s.io/yaml)|v1.4.0|MIT License
[cmd/goimports](https://golang.org/x/tools/cmd/goimports)|latest|MIT License
[gogo/protobuf](https://github.com/gogo/protobuf)|latest|MIT License
Expand Down
103 changes: 60 additions & 43 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ require (
github.com/google/go-github v17.0.0+incompatible
github.com/google/go-github/v32 v32.0.0
github.com/gorilla/mux v1.8.0
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
github.com/hashicorp/consul/api v1.14.0
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
github.com/hashicorp/consul/api v1.20.0
github.com/hashicorp/go-multierror v1.1.1
github.com/hashicorp/go-uuid v1.0.2
github.com/hashicorp/vault/api v1.8.2
github.com/hashicorp/vault/api/auth/aws v0.3.0
github.com/hinshun/vt10x v0.0.0-20180809195222-d55458df857c
github.com/imdario/mergo v0.3.16
github.com/imdario/mergo v1.0.0
github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf
github.com/jhump/protoreflect v1.15.3
github.com/kelseyhightower/envconfig v1.4.0
Expand All @@ -57,22 +57,23 @@ require (
// Pinned to the latest `gloo-repo-branch` tag of solo-apis (`sa-k8s-1.28-bump`)
github.com/solo-io/solo-apis v0.0.0-20231206142556-d2e3ed6d4476
github.com/solo-io/solo-kit v0.34.2
github.com/spf13/afero v1.9.2
github.com/spf13/afero v1.9.5
github.com/spf13/cobra v1.8.0
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.8.1
github.com/spf13/viper v1.16.0
go.opencensus.io v0.24.0
go.uber.org/goleak v1.2.1
go.uber.org/multierr v1.11.0
go.uber.org/zap v1.26.0
golang.org/x/crypto v0.17.0
golang.org/x/sync v0.4.0
golang.org/x/tools v0.14.0
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
golang.org/x/crypto v0.21.0
golang.org/x/sync v0.6.0
golang.org/x/tools v0.19.0
google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 // indirect
google.golang.org/grpc v1.59.0
google.golang.org/protobuf v1.32.0
gopkg.in/AlecAivazis/survey.v1 v1.8.7
helm.sh/helm/v3 v3.14.2
istio.io/istio v0.0.0-20231207195727-552626bd81f6 // Istio 1.20.1 commit https://github.com/istio/istio/commit/552626bd81f625917bcba6e415cae5aa3d5c61af
k8s.io/api v0.29.0
k8s.io/apiextensions-apiserver v0.29.0
k8s.io/apimachinery v0.29.0
Expand All @@ -84,6 +85,7 @@ require (
knative.dev/networking v0.0.0-20211210083629-bace06e98aee
knative.dev/pkg v0.0.0-20211206113427-18589ac7627e
sigs.k8s.io/controller-runtime v0.16.3
sigs.k8s.io/kind v0.20.0
sigs.k8s.io/yaml v1.4.0
)

Expand All @@ -94,13 +96,15 @@ require (
github.com/google/uuid v1.3.1
github.com/quasilyte/go-ruleguard/dsl v0.3.22
golang.org/x/exp v0.0.0-20231006140011-7918f672742d
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d
sigs.k8s.io/gateway-api v1.0.1-0.20231102234148-3b5969669194
google.golang.org/genproto/googleapis/api v0.0.0-20231012201019-e917dd12ba7a
google.golang.org/genproto/googleapis/rpc v0.0.0-20231009173412-8bfb1ae86b6c
gopkg.in/yaml.v2 v2.4.0
k8s.io/cli-runtime v0.29.0
sigs.k8s.io/gateway-api v1.0.1-0.20231102234152-004e14bfe016
)

require (
contrib.go.opencensus.io/exporter/prometheus v0.4.0 // indirect
contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
cuelang.org/go v0.3.2 // indirect
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/BurntSushi/toml v1.3.2 // indirect
Expand All @@ -114,9 +118,10 @@ require (
github.com/Microsoft/hcsshim v0.11.4 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect
github.com/acomagu/bufpipe v1.0.3 // indirect
github.com/armon/go-metrics v0.3.11 // indirect
github.com/alessio/shellescape v1.4.1 // indirect
github.com/armon/go-metrics v0.4.0 // indirect
github.com/armon/go-radix v1.0.0 // indirect
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/bufbuild/protocompile v0.6.0 // indirect
Expand All @@ -129,9 +134,9 @@ require (
github.com/containerd/containerd v1.7.11 // indirect
github.com/containerd/continuity v0.4.3 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
github.com/creack/pty v1.1.18 // indirect
github.com/creack/pty v1.1.20 // indirect
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/daviddengcn/go-colortext v1.0.0 // indirect
github.com/docker/cli v24.0.6+incompatible // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect
Expand All @@ -148,10 +153,12 @@ require (
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
github.com/fatih/camelcase v1.0.0 // indirect
github.com/fatih/color v1.15.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fgrosse/zaptest v1.1.0 // indirect
github.com/fvbommel/sortorder v1.1.0 // indirect
github.com/gertd/go-pluralize v0.1.1 // indirect
github.com/getkin/kin-openapi v0.80.0 // indirect
github.com/gliderlabs/ssh v0.3.3 // indirect
github.com/go-errors/errors v1.4.2 // indirect
github.com/go-git/gcfg v1.5.0 // indirect
github.com/go-git/go-billy/v5 v5.3.1 // indirect
Expand All @@ -173,12 +180,13 @@ require (
github.com/gobwas/glob v0.2.3 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/btree v1.0.1 // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/go-querystring v1.0.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 // indirect
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/goph/emperror v0.17.1 // indirect
github.com/gosuri/uitable v0.0.4 // indirect
Expand All @@ -195,18 +203,18 @@ require (
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6 // indirect
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
github.com/hashicorp/go-sockaddr v1.0.2 // indirect
github.com/hashicorp/go-version v1.2.0 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hashicorp/serf v0.9.7 // indirect
github.com/hashicorp/serf v0.10.1 // indirect
github.com/hashicorp/vault/sdk v0.6.0 // indirect
github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
github.com/huandu/xstrings v1.4.0 // indirect
github.com/iancoleman/strcase v0.2.0 // indirect
github.com/imroc/req v0.3.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/jmespath/go-jmespath v0.3.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/jmoiron/sqlx v1.3.5 // indirect
github.com/jonboulle/clockwork v0.2.2 // indirect
github.com/josharian/intern v1.0.0 // indirect
Expand All @@ -222,11 +230,11 @@ require (
github.com/lithammer/dedent v1.1.0 // indirect
github.com/lyft/protoc-gen-star v0.6.1 // indirect
github.com/lyft/protoc-gen-star/v2 v2.0.3 // indirect
github.com/magiconair/properties v1.8.5 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.17 // indirect
github.com/mattn/go-runewidth v0.0.9 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect
github.com/mattn/go-zglob v0.0.3 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
Expand All @@ -250,61 +258,64 @@ require (
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.17.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.45.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/prometheus/statsd_exporter v0.21.0 // indirect
github.com/prometheus/statsd_exporter v0.22.7 // indirect
github.com/pseudomuto/protoc-gen-doc v1.5.1 // indirect
github.com/pseudomuto/protokit v0.2.0 // indirect
github.com/radovskyb/watcher v1.0.2 // indirect
github.com/rivo/uniseg v0.4.3 // indirect
github.com/rogpeppe/go-internal v1.11.0 // indirect
github.com/rubenv/sql-migrate v1.5.2 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/ryanuber/go-glob v1.0.0 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/solo-io/anyvendor v0.0.4 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/cast v1.5.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/src-d/gcfg v1.4.0 // indirect
github.com/stretchr/testify v1.8.4 // indirect
github.com/subosito/gotenv v1.2.0 // indirect
github.com/subosito/gotenv v1.4.2 // indirect
github.com/xanzy/ssh-agent v0.3.0 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
github.com/yuin/goldmark v1.4.13 // indirect
github.com/yuin/goldmark v1.6.0 // indirect
go.mongodb.org/mongo-driver v1.1.2 // indirect
go.opentelemetry.io/otel v1.21.0 // indirect
go.opentelemetry.io/otel/metric v1.21.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
golang.org/x/mod v0.13.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.13.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/term v0.15.0 // indirect
golang.org/x/mod v0.16.0 // indirect
golang.org/x/net v0.22.0 // indirect
golang.org/x/oauth2 v0.18.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.62.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
gopkg.in/src-d/go-git.v4 v4.10.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gotest.tools/v3 v3.5.0 // indirect
istio.io/api v1.20.1-0.20231207143627-8237149662d6 // indirect
k8s.io/apiserver v0.29.0 // indirect
k8s.io/cli-runtime v0.29.0 // indirect
k8s.io/component-helpers v0.28.3 // indirect
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
k8s.io/klog/v2 v2.110.1 // indirect
Expand All @@ -314,7 +325,7 @@ require (
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
sigs.k8s.io/kustomize/kustomize/v5 v5.0.4-0.20230601165947-6ce0bf390ce3 // indirect
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
sigs.k8s.io/kustomize/kyaml v0.14.3 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
)

Expand All @@ -331,12 +342,18 @@ replace (
github.com/dgrijalva/jwt-go => github.com/form3tech-oss/jwt-go v0.0.0-20210511163231-5b2d2b5f6c34
github.com/docker/docker => github.com/moby/moby v24.0.7+incompatible

// Remove once we get to envoy 1.30
// Remove once we get to a version with extproc changes in upstream envoy (currently targeted 1.30)
github.com/envoyproxy/go-control-plane => github.com/solo-io/go-control-plane-fork-v2 v1.29.0-patch1

// Newer versions result in changes to the names of generated metrics
// remove this when we fix https://github.com/solo-io/solo-kit/issues/516
github.com/iancoleman/strcase => github.com/iancoleman/strcase v0.1.3

// go: istio.io/istio requires github.com/imdario/mergo@v1.0.0: parsing go.mod:
// module declares its path as: dario.cat/mergo
// but was required as: github.com/imdario/mergo
github.com/imdario/mergo => github.com/imdario/mergo v0.3.16

github.com/opencontainers/go-digest => github.com/opencontainers/go-digest v1.0.0-rc1
// skv2 uses a newer version than the imported solo-kit version which causes issues. Replaces the version with the solo-kit version
github.com/pseudomuto/protoc-gen-doc => github.com/pseudomuto/protoc-gen-doc v1.0.0
Expand Down