mod: upgrade istio deps #41
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,75 +1,76 @@ | ||
| module github.com/solo-io/external-apis | ||
|
|
||
| go 1.21.5 | ||
|
|
||
| require ( | ||
| github.com/aws/aws-app-mesh-controller-for-k8s v1.1.1 | ||
| github.com/cilium/cilium v1.15.0-pre.2 | ||
| github.com/golang/mock v1.6.0 | ||
| github.com/pkg/errors v0.9.1 | ||
| github.com/rotisserie/eris v0.1.1 | ||
| github.com/servicemeshinterface/smi-sdk-go v0.4.1 | ||
| github.com/solo-io/skv2 v0.36.3 | ||
|
There was a problem hiding this comment. Let's check that this skv2 bump does break with gloo mesh enterprise. It shouldn't, but it's currently using 0.36.1: https://github.com/solo-io/gloo-mesh-enterprise/blob/main/go.mod#L95 There was a problem hiding this comment. Good call, I'll open a PR in GME to import this, and prove that it works via CI There was a problem hiding this comment. I updated the PR body to include this detail, but I opened https://github.com/solo-io/gloo-mesh-enterprise/pull/14631 to demonstrate tthis can be pulled in. I'll try to get eyes on that PR There was a problem hiding this comment. CI is passing on that linked PR, so I would consider this check completd, but happy to perform more validation if neeeded |
||
| istio.io/client-go v1.20.1 | ||
| istio.io/istio v0.0.0-20231207195727-552626bd81f6 | ||
| k8s.io/api v0.28.3 | ||
| k8s.io/apiextensions-apiserver v0.28.3 | ||
| k8s.io/apimachinery v0.28.3 | ||
| k8s.io/client-go v0.28.3 | ||
| sigs.k8s.io/controller-runtime v0.16.3 | ||
| sigs.k8s.io/gateway-api v1.0.1-0.20231102234152-004e14bfe016 | ||
| ) | ||
|
|
||
| require ( | ||
| github.com/BurntSushi/toml v1.2.1 // indirect | ||
| github.com/Masterminds/goutils v1.1.1 // indirect | ||
| github.com/Masterminds/semver v1.4.2 // indirect | ||
| github.com/Masterminds/semver/v3 v3.2.1 // indirect | ||
| github.com/Masterminds/sprig/v3 v3.2.3 // 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/cespare/xxhash/v2 v2.2.0 // indirect | ||
| github.com/cilium/ebpf v0.12.2 // indirect | ||
| github.com/cilium/proxy v0.0.0-20231018073547-ab187719b71b // indirect | ||
| github.com/cockroachdb/apd/v2 v2.0.1 // indirect | ||
| github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect | ||
| github.com/emicklei/go-restful/v3 v3.11.0 // indirect | ||
| github.com/emicklei/proto v1.6.15 // indirect | ||
| github.com/envoyproxy/protoc-gen-validate v1.0.2 // indirect | ||
| github.com/evanphx/json-patch/v5 v5.7.0 // indirect | ||
| github.com/fsnotify/fsnotify v1.7.0 // indirect | ||
| github.com/gertd/go-pluralize v0.1.1 // indirect | ||
| github.com/go-logr/logr v1.2.4 // indirect | ||
| github.com/go-logr/stdr v1.2.2 // indirect | ||
| github.com/go-ole/go-ole v1.2.6 // indirect | ||
| github.com/go-openapi/analysis v0.21.4 // indirect | ||
| github.com/go-openapi/errors v0.20.4 // indirect | ||
| github.com/go-openapi/jsonpointer v0.20.0 // indirect | ||
| github.com/go-openapi/jsonreference v0.20.2 // indirect | ||
| github.com/go-openapi/loads v0.21.2 // indirect | ||
| github.com/go-openapi/runtime v0.26.0 // indirect | ||
| github.com/go-openapi/spec v0.20.9 // indirect | ||
| github.com/go-openapi/strfmt v0.21.7 // indirect | ||
| github.com/go-openapi/swag v0.22.4 // indirect | ||
| github.com/go-openapi/validate v0.22.1 // indirect | ||
| github.com/gobuffalo/envy v1.8.1 // indirect | ||
| github.com/gobuffalo/packd v0.3.0 // indirect | ||
| github.com/gobuffalo/packr v1.30.1 // 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.3 // indirect | ||
| github.com/google/gnostic-models v0.6.8 // indirect | ||
| github.com/google/go-cmp v0.6.0 // indirect | ||
| github.com/google/gofuzz v1.2.0 // indirect | ||
| github.com/google/uuid v1.4.0 // indirect | ||
| github.com/hashicorp/errwrap v1.1.0 // indirect | ||
| github.com/hashicorp/go-multierror v1.1.1 // indirect | ||
| github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect | ||
| github.com/hashicorp/hcl v1.0.0 // indirect | ||
| github.com/huandu/xstrings v1.4.0 // indirect | ||
| github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0 // indirect | ||
| github.com/iancoleman/strcase v0.2.0 // indirect | ||
| github.com/imdario/mergo v1.0.0 // indirect | ||
| github.com/inconshreveable/mousetrap v1.1.0 // indirect | ||
| github.com/invopop/jsonschema v0.7.0 // indirect | ||
| github.com/joho/godotenv v1.3.0 // indirect | ||
|
|
@@ -79,10 +80,10 @@ require ( | |
| github.com/kr/pretty v0.3.1 // indirect | ||
| github.com/kr/text v0.2.0 // indirect | ||
| github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // 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.19 // indirect | ||
| github.com/mattn/go-zglob v0.0.3 // indirect | ||
| github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect | ||
| github.com/mitchellh/copystructure v1.2.0 // indirect | ||
|
|
@@ -95,55 +96,67 @@ require ( | |
| github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de // indirect | ||
| github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect | ||
| github.com/oklog/ulid v1.3.1 // indirect | ||
| github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect | ||
| github.com/pborman/uuid v1.2.0 // indirect | ||
| github.com/pelletier/go-toml/v2 v2.1.0 // indirect | ||
| github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect | ||
| github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect | ||
| github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // 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/rogpeppe/go-internal v1.10.0 // indirect | ||
| github.com/sagikazarmark/locafero v0.3.0 // indirect | ||
| github.com/sagikazarmark/slog-shim v0.1.0 // indirect | ||
| github.com/sasha-s/go-deadlock v0.3.1 // indirect | ||
| github.com/shirou/gopsutil/v3 v3.23.2 // 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/solo-io/cue v0.4.7 // indirect | ||
| github.com/solo-io/go-utils v0.21.4 // indirect | ||
| github.com/solo-io/protoc-gen-ext v0.0.18 // indirect | ||
| github.com/sourcegraph/conc v0.3.0 // indirect | ||
| github.com/spf13/afero v1.10.0 // indirect | ||
| github.com/spf13/cast v1.5.1 // indirect | ||
| github.com/spf13/cobra v1.7.0 // indirect | ||
| github.com/spf13/pflag v1.0.5 // indirect | ||
| github.com/spf13/viper v1.17.0 // indirect | ||
| github.com/subosito/gotenv v1.6.0 // indirect | ||
| github.com/tklauser/go-sysconf v0.3.11 // indirect | ||
| github.com/tklauser/numcpus v0.6.0 // indirect | ||
| github.com/vishvananda/netlink v1.2.1-beta.2.0.20231024175852-77df5d35f725 // indirect | ||
| github.com/vishvananda/netns v0.0.4 // indirect | ||
| github.com/yusufpapurcu/wmi v1.2.3 // indirect | ||
| go.mongodb.org/mongo-driver v1.11.3 // indirect | ||
| go.opentelemetry.io/otel v1.19.0 // indirect | ||
| go.opentelemetry.io/otel/metric v1.19.0 // indirect | ||
| go.opentelemetry.io/otel/trace v1.19.0 // indirect | ||
| go.uber.org/dig v1.17.1 // indirect | ||
| go.uber.org/multierr v1.11.0 // indirect | ||
| go.uber.org/zap v1.26.0 // indirect | ||
| go4.org/netipx v0.0.0-20230824141953-6213f710f925 // indirect | ||
| golang.org/x/crypto v0.14.0 // indirect | ||
| golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect | ||
| golang.org/x/net v0.17.0 // indirect | ||
| golang.org/x/oauth2 v0.13.0 // indirect | ||
| golang.org/x/sync v0.4.0 // indirect | ||
| golang.org/x/sys v0.13.0 // indirect | ||
| golang.org/x/term v0.13.0 // indirect | ||
| golang.org/x/text v0.13.0 // indirect | ||
| golang.org/x/time v0.3.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 | ||
| google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a // indirect | ||
| google.golang.org/genproto/googleapis/api v0.0.0-20231012201019-e917dd12ba7a // indirect | ||
| google.golang.org/protobuf v1.31.0 // indirect | ||
| gopkg.in/inf.v0 v0.9.1 // indirect | ||
| gopkg.in/ini.v1 v1.67.0 // indirect | ||
| gopkg.in/yaml.v2 v2.4.0 // indirect | ||
| gopkg.in/yaml.v3 v3.0.1 // indirect | ||
| istio.io/api v1.20.1-0.20231207143627-8237149662d6 // indirect | ||
| k8s.io/component-base v0.28.3 // indirect | ||
| k8s.io/klog/v2 v2.100.1 // indirect | ||
| k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect | ||
|
|
@@ -152,3 +165,8 @@ require ( | |
| sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect | ||
| sigs.k8s.io/yaml v1.4.0 // indirect | ||
| ) | ||
|
|
||
| // go: istio.io/[email protected] requires github.com/imdario/[email protected]: parsing go.mod: | ||
| // module declares its path as: dario.cat/mergo | ||
| // but was required as: github.com/imdario/mergo | ||
| replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.5 | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will adding the patch version here effect the edge side? I know gloo-mesh-enterprise is using patches and golang will do patch version upgrades automatically with the new version manager shipped in 1.21.1, but I thought edge is still using 1.21 in the go.mod
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Edge Enterprise relies on the same patch version as GME: https://github.com/solo-io/solo-projects/blob/main/go.mod#L3 (1.21.5), so I think we're safe