-
Notifications
You must be signed in to change notification settings - Fork 10
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.
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
OSSM-5690: Sync with istio 1.20 #49
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
7503652
Update deps
yannuil e1ef472
Update API groups
yannuil eab1c1f
Run make gen
yannuil c7c96f5
Use the same version gateway-api as in upstream 1.20
yannuil e34587b
Update openshift packages
yannuil a5844b5
Use the same istio client-go as in the upstream 1.20
yannuil 3b8809a
Update depguard configuration as a golangci limitation
yannuil File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 |
---|---|---|
|
@@ -5,7 +5,7 @@ clean: | |
rm -rf out/ | ||
|
||
deps: | ||
go mod tidy -go=1.20 | ||
go mod tidy -go=1.21 | ||
go mod download | ||
|
||
build: deps | ||
|
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,72 +1,75 @@ | ||
module github.com/maistra/xns-informer | ||
|
||
go 1.20 | ||
go 1.21 | ||
|
||
toolchain go1.21.5 | ||
|
||
// Client-go does not handle different versions of mergo due to some breaking changes - use the matching version | ||
replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.5 | ||
|
||
require ( | ||
github.com/openshift/api v0.0.0-20200929171550-c99a4deebbe5 | ||
github.com/openshift/client-go v0.0.0-20200929181438-91d71ef2122c | ||
github.com/openshift/api v0.0.0-20231212152002-ef62af078a93 | ||
github.com/openshift/client-go v0.0.0-20231212205830-0ab0864ec8c2 | ||
github.com/spf13/pflag v1.0.5 | ||
istio.io/client-go v1.18.6 | ||
k8s.io/api v0.27.0 | ||
k8s.io/apimachinery v0.27.0 | ||
k8s.io/client-go v0.27.0 | ||
k8s.io/code-generator v0.27.0 | ||
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d | ||
k8s.io/klog/v2 v2.90.1 | ||
sigs.k8s.io/gateway-api v0.6.2 | ||
istio.io/client-go v1.20.0-rc.0 | ||
k8s.io/api v0.28.3 | ||
k8s.io/apimachinery v0.28.3 | ||
k8s.io/client-go v0.28.3 | ||
k8s.io/code-generator v0.28.3 | ||
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 | ||
k8s.io/klog/v2 v2.100.1 | ||
sigs.k8s.io/gateway-api v1.0.0 | ||
) | ||
|
||
require ( | ||
github.com/davecgh/go-spew v1.1.1 // indirect | ||
github.com/emicklei/go-restful/v3 v3.9.0 // indirect | ||
github.com/evanphx/json-patch v5.6.0+incompatible // indirect | ||
github.com/evanphx/json-patch/v5 v5.6.0 // indirect | ||
github.com/go-logr/logr v1.2.3 // indirect | ||
github.com/go-openapi/jsonpointer v0.19.6 // indirect | ||
github.com/go-openapi/jsonreference v0.20.1 // indirect | ||
github.com/go-openapi/swag v0.22.3 // 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/evanphx/json-patch v5.7.0+incompatible // indirect | ||
github.com/evanphx/json-patch/v5 v5.7.0 // indirect | ||
github.com/go-logr/logr v1.3.0 // indirect | ||
github.com/go-openapi/jsonpointer v0.20.0 // indirect | ||
github.com/go-openapi/jsonreference v0.20.2 // indirect | ||
github.com/go-openapi/swag v0.22.4 // indirect | ||
github.com/gogo/protobuf v1.3.2 // indirect | ||
github.com/golang/protobuf v1.5.3 // indirect | ||
github.com/google/gnostic v0.5.7-v3refs // indirect | ||
github.com/google/go-cmp v0.5.9 // 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.3.0 // indirect | ||
github.com/imdario/mergo v0.3.12 // indirect | ||
github.com/google/uuid v1.3.1 // indirect | ||
github.com/imdario/mergo v1.0.0 // indirect | ||
github.com/josharian/intern v1.0.0 // indirect | ||
github.com/json-iterator/go v1.1.12 // indirect | ||
github.com/mailru/easyjson v0.7.7 // indirect | ||
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect | ||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect | ||
github.com/modern-go/reflect2 v1.0.2 // indirect | ||
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect | ||
github.com/pkg/errors v0.9.1 // indirect | ||
github.com/pmezard/go-difflib v1.0.0 // indirect | ||
github.com/stretchr/testify v1.8.1 // indirect | ||
golang.org/x/mod v0.9.0 // indirect | ||
golang.org/x/net v0.8.0 // indirect | ||
golang.org/x/oauth2 v0.6.0 // indirect | ||
golang.org/x/sys v0.6.0 // indirect | ||
golang.org/x/term v0.6.0 // indirect | ||
golang.org/x/text v0.8.0 // indirect | ||
golang.org/x/time v0.0.0-20220920022843-2ce7c2934d45 // indirect | ||
golang.org/x/tools v0.7.0 // indirect | ||
google.golang.org/appengine v1.6.7 // indirect | ||
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect | ||
google.golang.org/protobuf v1.30.0 // indirect | ||
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect | ||
github.com/stretchr/testify v1.8.4 // 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.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/tools v0.14.0 // indirect | ||
google.golang.org/appengine v1.6.8 // indirect | ||
google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 // indirect | ||
google.golang.org/genproto/googleapis/api v0.0.0-20230920204549-e6e6cdab5c13 // indirect | ||
google.golang.org/protobuf v1.31.0 // indirect | ||
gopkg.in/inf.v0 v0.9.1 // indirect | ||
gopkg.in/yaml.v2 v2.4.0 // indirect | ||
gopkg.in/yaml.v3 v3.0.1 // indirect | ||
istio.io/api v0.0.0-20231206023236-e7cadb36da57 // indirect | ||
k8s.io/apiextensions-apiserver v0.27.0 // indirect | ||
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // indirect | ||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect | ||
sigs.k8s.io/controller-runtime v0.13.0 // indirect | ||
istio.io/api v1.20.2-0.20231213020515-8655fab91d5d // indirect | ||
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect | ||
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect | ||
sigs.k8s.io/controller-runtime v0.16.3 // indirect | ||
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect | ||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect | ||
sigs.k8s.io/yaml v1.3.0 // indirect | ||
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect | ||
sigs.k8s.io/yaml v1.4.0 // indirect | ||
) | ||
|
||
// https://github.com/containerd/containerd/issues/5781 | ||
exclude k8s.io/kubernetes v1.13.0 | ||
|
||
// Client-go does not handle different versions of mergo due to some breaking changes - use the matching version | ||
replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.5 |
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.
Shouldn't it be
istio.io/client-go v1.20.2-0.20231213021015-d9f0411d8b67
, like in maistra/istio?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.
I want to make it the same as the istio commit 1.20 I am rebasing on, I can eliminate the extra changes in the go.mod commit.