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

Istio 1.24 bump #51

Merged
merged 12 commits into from
Nov 8, 2024
Merged

Istio 1.24 bump #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e1622ed
use dedicated istio operator repo
jehawley Nov 5, 2024
0dfa109
upgrade k8s to 0.31.1
jehawley Nov 5, 2024
f183f50
promote Telemetry proto to v1
jehawley Nov 5, 2024
a9000f7
need both telemetry crds?
jehawley Nov 5, 2024
2e878f8
need both telemetry crds?
jehawley Nov 5, 2024
d5054e8
need both versions of all graduated crds?
jehawley Nov 5, 2024
1d02848
need both versions of all graduated crds even more?
jehawley Nov 5, 2024
4445913
generate code
jehawley Nov 6, 2024
dca6146
upgrade istio dep to 1.24
jehawley Nov 8, 2024
b7169e7
upgrade operator dep
jehawley Nov 8, 2024
3c5925e
move to using solo's version of the istio operator fork
jehawley Nov 8, 2024
5b8e31c
use released tag of legacy operator dep
jehawley Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 65 additions & 2 deletions codegen/istio_groups.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
package codegen

import (
operator "github.com/solo-io/istio-operator-legacy/operator/pkg/apis/istio/v1alpha1"
"github.com/solo-io/skv2/codegen/model"
extensionsv1alpha1 "istio.io/client-go/pkg/apis/extensions/v1alpha1"
networkingv1 "istio.io/client-go/pkg/apis/networking/v1"
networkingv1alpha3 "istio.io/client-go/pkg/apis/networking/v1alpha3"
networkingv1beta1 "istio.io/client-go/pkg/apis/networking/v1beta1"
securityv1 "istio.io/client-go/pkg/apis/security/v1"
"istio.io/client-go/pkg/apis/security/v1beta1"
istiotelemetryv1 "istio.io/client-go/pkg/apis/telemetry/v1"
istiotelemetryv1alpha1 "istio.io/client-go/pkg/apis/telemetry/v1alpha1"
operator "istio.io/istio/operator/pkg/apis/istio/v1alpha1"
)

func init() {
Expand Down Expand Up @@ -54,6 +57,36 @@ func istioGroups() []model.Group {
ApiRoot: istioApiRoot,
PointerSlices: true,
},
{
GroupVersion: networkingv1.SchemeGroupVersion,
Module: istioModule,
Resources: []model.Resource{
{
Kind: "DestinationRule",
},
{
Kind: "Gateway",
},
{
Kind: "ServiceEntry",
},
{
Kind: "WorkloadEntry",
},
{
Kind: "WorkloadGroup",
},
{
Kind: "VirtualService",
},
{
Kind: "Sidecar",
},
},
CustomTypesImportPath: "istio.io/client-go/pkg/apis/networking/v1",
ApiRoot: istioApiRoot,
PointerSlices: true,
},
{
GroupVersion: networkingv1alpha3.SchemeGroupVersion,
Module: istioModule,
Expand Down Expand Up @@ -84,6 +117,24 @@ func istioGroups() []model.Group {
ApiRoot: istioApiRoot,
PointerSlices: true,
},
{
GroupVersion: securityv1.SchemeGroupVersion,
Module: istioModule,
Resources: []model.Resource{
{
Kind: "AuthorizationPolicy",
},
{
Kind: "PeerAuthentication",
},
{
Kind: "RequestAuthentication",
},
},
CustomTypesImportPath: "istio.io/client-go/pkg/apis/security/v1",
ApiRoot: istioApiRoot,
PointerSlices: true,
},
{
GroupVersion: operator.SchemeGroupVersion,
Module: "install.istio.io",
Expand All @@ -92,9 +143,21 @@ func istioGroups() []model.Group {
Kind: "IstioOperator",
},
},
CustomTypesImportPath: "istio.io/istio/operator/pkg/apis/istio/v1alpha1",
CustomTypesImportPath: "github.com/solo-io/istio-operator-legacy/operator/pkg/apis/istio/v1alpha1",
ApiRoot: istioApiRoot,
},
{
GroupVersion: istiotelemetryv1.SchemeGroupVersion,
Module: istioModule,
Resources: []model.Resource{
{
Kind: "Telemetry",
},
},
CustomTypesImportPath: "istio.io/client-go/pkg/apis/telemetry/v1",
ApiRoot: istioApiRoot,
PointerSlices: true,
},
{
GroupVersion: istiotelemetryv1alpha1.SchemeGroupVersion,
Module: istioModule,
Expand Down
132 changes: 68 additions & 64 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/solo-io/external-apis

go 1.22.2
go 1.23.2

require (
github.com/aws/aws-app-mesh-controller-for-k8s v1.1.1
Expand All @@ -9,77 +9,79 @@ require (
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.39.1
istio.io/client-go v1.20.1
istio.io/istio v0.0.0-20231207195727-552626bd81f6
k8s.io/api v0.29.2
k8s.io/apiextensions-apiserver v0.29.2
k8s.io/apimachinery v0.29.2
k8s.io/client-go v0.29.2
sigs.k8s.io/controller-runtime v0.17.4
sigs.k8s.io/gateway-api v1.0.1-0.20231102234152-004e14bfe016
github.com/solo-io/istio-operator-legacy v1.23.3
github.com/solo-io/skv2 v0.41.0
istio.io/client-go v1.24.0
k8s.io/api v0.31.1
k8s.io/apiextensions-apiserver v0.31.1
k8s.io/apimachinery v0.31.1
k8s.io/client-go v0.31.1
sigs.k8s.io/controller-runtime v0.19.0
sigs.k8s.io/gateway-api v1.2.0
)

require (
github.com/BurntSushi/toml v1.2.1 // indirect
dario.cat/mergo v1.0.1 // indirect
github.com/BurntSushi/toml v1.3.2 // 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/Masterminds/semver/v3 v3.3.0 // indirect
github.com/Masterminds/sprig/v3 v3.3.0 // 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/cespare/xxhash/v2 v2.3.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/go-restful/v3 v3.12.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.8.0 // indirect
github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/gertd/go-pluralize v0.1.1 // indirect
github.com/getkin/kin-openapi v0.123.0 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/logr v1.4.2 // 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.2 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.21.0 // 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.8 // indirect
github.com/go-openapi/swag v0.23.0 // 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/golang/protobuf v1.5.4 // 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/google/uuid v1.6.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/huandu/xstrings v1.5.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/iancoleman/strcase v0.3.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/invopop/jsonschema v0.7.0 // indirect
github.com/invopop/yaml v0.2.0 // indirect
github.com/joho/godotenv v1.3.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/k0kubun/pp v2.3.0+incompatible // indirect
github.com/klauspost/compress v1.17.9 // indirect
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
Expand All @@ -88,7 +90,6 @@ require (
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // 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
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/hashstructure v1.0.0 // indirect
Expand All @@ -102,72 +103,71 @@ require (
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/pelletier/go-toml/v2 v2.2.2 // indirect
github.com/perimeterx/marshmallow v1.1.5 // 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.18.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/client_golang v1.20.4 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.60.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
github.com/sagikazarmark/locafero v0.3.0 // indirect
github.com/sagikazarmark/locafero v0.4.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/shopspring/decimal v1.4.0 // 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/solo-io/go-utils v0.26.0 // indirect
github.com/solo-io/protoc-gen-ext v0.0.20 // 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.8.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.7.0 // indirect
github.com/spf13/cobra v1.8.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.17.0 // indirect
github.com/spf13/viper v1.19.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/ugorji/go/codec v1.2.12 // indirect
github.com/vishvananda/netlink v1.2.1-beta.2.0.20231024175852-77df5d35f725 // indirect
github.com/vishvananda/netlink v1.2.1-beta.2.0.20240411215012-578e95cc3190 // indirect
github.com/vishvananda/netns v0.0.4 // indirect
github.com/x448/float16 v0.8.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.opentelemetry.io/otel v1.30.0 // indirect
go.opentelemetry.io/otel/metric v1.30.0 // indirect
go.opentelemetry.io/otel/trace v1.30.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
go.uber.org/zap v1.27.0 // indirect
go4.org/netipx v0.0.0-20230824141953-6213f710f925 // indirect
golang.org/x/crypto v0.16.0 // indirect
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/oauth2 v0.13.0 // indirect
golang.org/x/sync v0.5.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/term v0.15.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/crypto v0.27.0 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/mod v0.20.0 // indirect
golang.org/x/net v0.29.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.25.0 // indirect
golang.org/x/term v0.24.0 // indirect
golang.org/x/text v0.18.0 // indirect
golang.org/x/time v0.6.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
google.golang.org/genproto/googleapis/api v0.0.0-20240930140551-af27646dc61f // indirect
google.golang.org/protobuf v1.34.2 // 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.29.2 // indirect
k8s.io/klog/v2 v2.110.1 // indirect
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
istio.io/api v1.24.0 // indirect
istio.io/api/123 v0.0.0-00010101000000-000000000000 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20240423202451-8948a665c108 // indirect
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
Expand All @@ -177,3 +177,7 @@ require (
// 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

// This is necessary while we still depend on the IstioOperator and related apis, which were removed in 1.24
// This can be removed once we drop ILM v2 support in GME.
replace istio.io/api/123 => istio.io/api v1.23.3
Loading
Loading