Skip to content

Commit bfe41a4

Browse files
jehawleyjehawley
authored
Istio 1.24 bump (#51)
* use dedicated istio operator repo * upgrade k8s to 0.31.1 * promote Telemetry proto to v1 * need both telemetry crds? * need both telemetry crds? * need both versions of all graduated crds? * need both versions of all graduated crds even more? * generate code * upgrade istio dep to 1.24 * upgrade operator dep * move to using solo's version of the istio operator fork * use released tag of legacy operator dep
1 parent 4bf65dd commit bfe41a4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+22206
-797
lines changed

‎codegen/istio_groups.go

+65-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
package codegen
22

33
import (
4+
operator "github.com/solo-io/istio-operator-legacy/operator/pkg/apis/istio/v1alpha1"
45
"github.com/solo-io/skv2/codegen/model"
56
extensionsv1alpha1 "istio.io/client-go/pkg/apis/extensions/v1alpha1"
7+
networkingv1 "istio.io/client-go/pkg/apis/networking/v1"
68
networkingv1alpha3 "istio.io/client-go/pkg/apis/networking/v1alpha3"
79
networkingv1beta1 "istio.io/client-go/pkg/apis/networking/v1beta1"
10+
securityv1 "istio.io/client-go/pkg/apis/security/v1"
811
"istio.io/client-go/pkg/apis/security/v1beta1"
12+
istiotelemetryv1 "istio.io/client-go/pkg/apis/telemetry/v1"
913
istiotelemetryv1alpha1 "istio.io/client-go/pkg/apis/telemetry/v1alpha1"
10-
operator "istio.io/istio/operator/pkg/apis/istio/v1alpha1"
1114
)
1215

1316
func init() {
@@ -54,6 +57,36 @@ func istioGroups() []model.Group {
5457
ApiRoot: istioApiRoot,
5558
PointerSlices: true,
5659
},
60+
{
61+
GroupVersion: networkingv1.SchemeGroupVersion,
62+
Module: istioModule,
63+
Resources: []model.Resource{
64+
{
65+
Kind: "DestinationRule",
66+
},
67+
{
68+
Kind: "Gateway",
69+
},
70+
{
71+
Kind: "ServiceEntry",
72+
},
73+
{
74+
Kind: "WorkloadEntry",
75+
},
76+
{
77+
Kind: "WorkloadGroup",
78+
},
79+
{
80+
Kind: "VirtualService",
81+
},
82+
{
83+
Kind: "Sidecar",
84+
},
85+
},
86+
CustomTypesImportPath: "istio.io/client-go/pkg/apis/networking/v1",
87+
ApiRoot: istioApiRoot,
88+
PointerSlices: true,
89+
},
5790
{
5891
GroupVersion: networkingv1alpha3.SchemeGroupVersion,
5992
Module: istioModule,
@@ -84,6 +117,24 @@ func istioGroups() []model.Group {
84117
ApiRoot: istioApiRoot,
85118
PointerSlices: true,
86119
},
120+
{
121+
GroupVersion: securityv1.SchemeGroupVersion,
122+
Module: istioModule,
123+
Resources: []model.Resource{
124+
{
125+
Kind: "AuthorizationPolicy",
126+
},
127+
{
128+
Kind: "PeerAuthentication",
129+
},
130+
{
131+
Kind: "RequestAuthentication",
132+
},
133+
},
134+
CustomTypesImportPath: "istio.io/client-go/pkg/apis/security/v1",
135+
ApiRoot: istioApiRoot,
136+
PointerSlices: true,
137+
},
87138
{
88139
GroupVersion: operator.SchemeGroupVersion,
89140
Module: "install.istio.io",
@@ -92,9 +143,21 @@ func istioGroups() []model.Group {
92143
Kind: "IstioOperator",
93144
},
94145
},
95-
CustomTypesImportPath: "istio.io/istio/operator/pkg/apis/istio/v1alpha1",
146+
CustomTypesImportPath: "github.com/solo-io/istio-operator-legacy/operator/pkg/apis/istio/v1alpha1",
96147
ApiRoot: istioApiRoot,
97148
},
149+
{
150+
GroupVersion: istiotelemetryv1.SchemeGroupVersion,
151+
Module: istioModule,
152+
Resources: []model.Resource{
153+
{
154+
Kind: "Telemetry",
155+
},
156+
},
157+
CustomTypesImportPath: "istio.io/client-go/pkg/apis/telemetry/v1",
158+
ApiRoot: istioApiRoot,
159+
PointerSlices: true,
160+
},
98161
{
99162
GroupVersion: istiotelemetryv1alpha1.SchemeGroupVersion,
100163
Module: istioModule,

‎go.mod

+68-64
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/solo-io/external-apis
22

3-
go 1.22.2
3+
go 1.23.2
44

55
require (
66
github.com/aws/aws-app-mesh-controller-for-k8s v1.1.1
@@ -9,77 +9,79 @@ require (
99
github.com/pkg/errors v0.9.1
1010
github.com/rotisserie/eris v0.1.1
1111
github.com/servicemeshinterface/smi-sdk-go v0.4.1
12-
github.com/solo-io/skv2 v0.39.1
13-
istio.io/client-go v1.20.1
14-
istio.io/istio v0.0.0-20231207195727-552626bd81f6
15-
k8s.io/api v0.29.2
16-
k8s.io/apiextensions-apiserver v0.29.2
17-
k8s.io/apimachinery v0.29.2
18-
k8s.io/client-go v0.29.2
19-
sigs.k8s.io/controller-runtime v0.17.4
20-
sigs.k8s.io/gateway-api v1.0.1-0.20231102234152-004e14bfe016
12+
github.com/solo-io/istio-operator-legacy v1.23.3
13+
github.com/solo-io/skv2 v0.41.0
14+
istio.io/client-go v1.24.0
15+
k8s.io/api v0.31.1
16+
k8s.io/apiextensions-apiserver v0.31.1
17+
k8s.io/apimachinery v0.31.1
18+
k8s.io/client-go v0.31.1
19+
sigs.k8s.io/controller-runtime v0.19.0
20+
sigs.k8s.io/gateway-api v1.2.0
2121
)
2222

2323
require (
24-
github.com/BurntSushi/toml v1.2.1 // indirect
24+
dario.cat/mergo v1.0.1 // indirect
25+
github.com/BurntSushi/toml v1.3.2 // indirect
2526
github.com/Masterminds/goutils v1.1.1 // indirect
2627
github.com/Masterminds/semver v1.4.2 // indirect
27-
github.com/Masterminds/semver/v3 v3.2.1 // indirect
28-
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
28+
github.com/Masterminds/semver/v3 v3.3.0 // indirect
29+
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
2930
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
3031
github.com/beorn7/perks v1.0.1 // indirect
3132
github.com/blang/semver/v4 v4.0.0 // indirect
32-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
33+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3334
github.com/cilium/ebpf v0.12.2 // indirect
3435
github.com/cilium/proxy v0.0.0-20231018073547-ab187719b71b // indirect
3536
github.com/cockroachdb/apd/v2 v2.0.1 // indirect
3637
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
37-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
38+
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
3839
github.com/emicklei/proto v1.6.15 // indirect
39-
github.com/envoyproxy/protoc-gen-validate v1.0.2 // indirect
40-
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
40+
github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
41+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
4142
github.com/fsnotify/fsnotify v1.7.0 // indirect
43+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
4244
github.com/gertd/go-pluralize v0.1.1 // indirect
4345
github.com/getkin/kin-openapi v0.123.0 // indirect
4446
github.com/ghodss/yaml v1.0.0 // indirect
45-
github.com/go-logr/logr v1.4.1 // indirect
47+
github.com/go-logr/logr v1.4.2 // indirect
4648
github.com/go-logr/stdr v1.2.2 // indirect
4749
github.com/go-ole/go-ole v1.2.6 // indirect
4850
github.com/go-openapi/analysis v0.21.4 // indirect
4951
github.com/go-openapi/errors v0.20.4 // indirect
50-
github.com/go-openapi/jsonpointer v0.20.2 // indirect
51-
github.com/go-openapi/jsonreference v0.20.2 // indirect
52+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
53+
github.com/go-openapi/jsonreference v0.21.0 // indirect
5254
github.com/go-openapi/loads v0.21.2 // indirect
5355
github.com/go-openapi/runtime v0.26.0 // indirect
5456
github.com/go-openapi/spec v0.20.9 // indirect
5557
github.com/go-openapi/strfmt v0.21.7 // indirect
56-
github.com/go-openapi/swag v0.22.8 // indirect
58+
github.com/go-openapi/swag v0.23.0 // indirect
5759
github.com/go-openapi/validate v0.22.1 // indirect
5860
github.com/gobuffalo/envy v1.8.1 // indirect
5961
github.com/gobuffalo/packd v0.3.0 // indirect
6062
github.com/gobuffalo/packr v1.30.1 // indirect
6163
github.com/gogo/protobuf v1.3.2 // indirect
6264
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
63-
github.com/golang/protobuf v1.5.3 // indirect
65+
github.com/golang/protobuf v1.5.4 // indirect
6466
github.com/google/gnostic-models v0.6.8 // indirect
6567
github.com/google/go-cmp v0.6.0 // indirect
6668
github.com/google/gofuzz v1.2.0 // indirect
67-
github.com/google/uuid v1.4.0 // indirect
69+
github.com/google/uuid v1.6.0 // indirect
6870
github.com/hashicorp/errwrap v1.1.0 // indirect
6971
github.com/hashicorp/go-multierror v1.1.1 // indirect
7072
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
7173
github.com/hashicorp/hcl v1.0.0 // indirect
72-
github.com/huandu/xstrings v1.4.0 // indirect
74+
github.com/huandu/xstrings v1.5.0 // indirect
7375
github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0 // indirect
74-
github.com/iancoleman/strcase v0.2.0 // indirect
75-
github.com/imdario/mergo v1.0.0 // indirect
76+
github.com/iancoleman/strcase v0.3.0 // indirect
7677
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7778
github.com/invopop/jsonschema v0.7.0 // indirect
7879
github.com/invopop/yaml v0.2.0 // indirect
7980
github.com/joho/godotenv v1.3.0 // indirect
8081
github.com/josharian/intern v1.0.0 // indirect
8182
github.com/json-iterator/go v1.1.12 // indirect
8283
github.com/k0kubun/pp v2.3.0+incompatible // indirect
84+
github.com/klauspost/compress v1.17.9 // indirect
8385
github.com/kr/pretty v0.3.1 // indirect
8486
github.com/kr/text v0.2.0 // indirect
8587
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
@@ -88,7 +90,6 @@ require (
8890
github.com/mattn/go-colorable v0.1.13 // indirect
8991
github.com/mattn/go-isatty v0.0.20 // indirect
9092
github.com/mattn/go-zglob v0.0.3 // indirect
91-
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
9293
github.com/mitchellh/copystructure v1.2.0 // indirect
9394
github.com/mitchellh/go-homedir v1.1.0 // indirect
9495
github.com/mitchellh/hashstructure v1.0.0 // indirect
@@ -102,72 +103,71 @@ require (
102103
github.com/oklog/ulid v1.3.1 // indirect
103104
github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect
104105
github.com/pborman/uuid v1.2.0 // indirect
105-
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
106+
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
106107
github.com/perimeterx/marshmallow v1.1.5 // indirect
107108
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
108109
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
109110
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
110-
github.com/prometheus/client_golang v1.18.0 // indirect
111-
github.com/prometheus/client_model v0.5.0 // indirect
112-
github.com/prometheus/common v0.45.0 // indirect
113-
github.com/prometheus/procfs v0.12.0 // indirect
111+
github.com/prometheus/client_golang v1.20.4 // indirect
112+
github.com/prometheus/client_model v0.6.1 // indirect
113+
github.com/prometheus/common v0.60.0 // indirect
114+
github.com/prometheus/procfs v0.15.1 // indirect
114115
github.com/rogpeppe/go-internal v1.12.0 // indirect
115-
github.com/sagikazarmark/locafero v0.3.0 // indirect
116+
github.com/sagikazarmark/locafero v0.4.0 // indirect
116117
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
117118
github.com/sasha-s/go-deadlock v0.3.1 // indirect
118119
github.com/shirou/gopsutil/v3 v3.23.2 // indirect
119-
github.com/shopspring/decimal v1.3.1 // indirect
120+
github.com/shopspring/decimal v1.4.0 // indirect
120121
github.com/sirupsen/logrus v1.9.3 // indirect
121122
github.com/solo-io/anyvendor v0.0.4 // indirect
122123
github.com/solo-io/cue v0.4.7 // indirect
123-
github.com/solo-io/go-utils v0.21.4 // indirect
124-
github.com/solo-io/protoc-gen-ext v0.0.18 // indirect
124+
github.com/solo-io/go-utils v0.26.0 // indirect
125+
github.com/solo-io/protoc-gen-ext v0.0.20 // indirect
125126
github.com/sourcegraph/conc v0.3.0 // indirect
126-
github.com/spf13/afero v1.10.0 // indirect
127-
github.com/spf13/cast v1.5.1 // indirect
128-
github.com/spf13/cobra v1.8.0 // indirect
127+
github.com/spf13/afero v1.11.0 // indirect
128+
github.com/spf13/cast v1.7.0 // indirect
129+
github.com/spf13/cobra v1.8.1 // indirect
129130
github.com/spf13/pflag v1.0.5 // indirect
130-
github.com/spf13/viper v1.17.0 // indirect
131+
github.com/spf13/viper v1.19.0 // indirect
131132
github.com/subosito/gotenv v1.6.0 // indirect
132133
github.com/tklauser/go-sysconf v0.3.11 // indirect
133134
github.com/tklauser/numcpus v0.6.0 // indirect
134135
github.com/ugorji/go/codec v1.2.12 // indirect
135-
github.com/vishvananda/netlink v1.2.1-beta.2.0.20231024175852-77df5d35f725 // indirect
136+
github.com/vishvananda/netlink v1.2.1-beta.2.0.20240411215012-578e95cc3190 // indirect
136137
github.com/vishvananda/netns v0.0.4 // indirect
138+
github.com/x448/float16 v0.8.4 // indirect
137139
github.com/yusufpapurcu/wmi v1.2.3 // indirect
138140
go.mongodb.org/mongo-driver v1.11.3 // indirect
139-
go.opentelemetry.io/otel v1.19.0 // indirect
140-
go.opentelemetry.io/otel/metric v1.19.0 // indirect
141-
go.opentelemetry.io/otel/trace v1.19.0 // indirect
141+
go.opentelemetry.io/otel v1.30.0 // indirect
142+
go.opentelemetry.io/otel/metric v1.30.0 // indirect
143+
go.opentelemetry.io/otel/trace v1.30.0 // indirect
142144
go.uber.org/dig v1.17.1 // indirect
143145
go.uber.org/multierr v1.11.0 // indirect
144-
go.uber.org/zap v1.26.0 // indirect
146+
go.uber.org/zap v1.27.0 // indirect
145147
go4.org/netipx v0.0.0-20230824141953-6213f710f925 // indirect
146-
golang.org/x/crypto v0.16.0 // indirect
147-
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
148-
golang.org/x/mod v0.14.0 // indirect
149-
golang.org/x/net v0.19.0 // indirect
150-
golang.org/x/oauth2 v0.13.0 // indirect
151-
golang.org/x/sync v0.5.0 // indirect
152-
golang.org/x/sys v0.16.0 // indirect
153-
golang.org/x/term v0.15.0 // indirect
154-
golang.org/x/text v0.14.0 // indirect
155-
golang.org/x/time v0.3.0 // indirect
148+
golang.org/x/crypto v0.27.0 // indirect
149+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
150+
golang.org/x/mod v0.20.0 // indirect
151+
golang.org/x/net v0.29.0 // indirect
152+
golang.org/x/oauth2 v0.23.0 // indirect
153+
golang.org/x/sync v0.8.0 // indirect
154+
golang.org/x/sys v0.25.0 // indirect
155+
golang.org/x/term v0.24.0 // indirect
156+
golang.org/x/text v0.18.0 // indirect
157+
golang.org/x/time v0.6.0 // indirect
156158
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
157159
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
158-
google.golang.org/appengine v1.6.8 // indirect
159-
google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a // indirect
160-
google.golang.org/genproto/googleapis/api v0.0.0-20231012201019-e917dd12ba7a // indirect
161-
google.golang.org/protobuf v1.31.0 // indirect
160+
google.golang.org/genproto/googleapis/api v0.0.0-20240930140551-af27646dc61f // indirect
161+
google.golang.org/protobuf v1.34.2 // indirect
162162
gopkg.in/inf.v0 v0.9.1 // indirect
163163
gopkg.in/ini.v1 v1.67.0 // indirect
164164
gopkg.in/yaml.v2 v2.4.0 // indirect
165165
gopkg.in/yaml.v3 v3.0.1 // indirect
166-
istio.io/api v1.20.1-0.20231207143627-8237149662d6 // indirect
167-
k8s.io/component-base v0.29.2 // indirect
168-
k8s.io/klog/v2 v2.110.1 // indirect
169-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
170-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
166+
istio.io/api v1.24.0 // indirect
167+
istio.io/api/123 v0.0.0-00010101000000-000000000000 // indirect
168+
k8s.io/klog/v2 v2.130.1 // indirect
169+
k8s.io/kube-openapi v0.0.0-20240423202451-8948a665c108 // indirect
170+
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 // indirect
171171
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
172172
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
173173
sigs.k8s.io/yaml v1.4.0 // indirect
@@ -177,3 +177,7 @@ require (
177177
// module declares its path as: dario.cat/mergo
178178
// but was required as: github.com/imdario/mergo
179179
replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.5
180+
181+
// This is necessary while we still depend on the IstioOperator and related apis, which were removed in 1.24
182+
// This can be removed once we drop ILM v2 support in GME.
183+
replace istio.io/api/123 => istio.io/api v1.23.3

0 commit comments

Comments
 (0)