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.

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

Use v1beta1 for DestinationRules #10424

Open
wants to merge 27 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
4b7e258
use v1beta1, add changelog
npolshakova Dec 2, 2024
2c33dbe
Adding changelog file to new location
Dec 2, 2024
16a377e
Deleting changelog file from old location
Dec 2, 2024
4cffcf8
Merge branch 'main' into npolshak/use-v1beta1-dest-rule
npolshakova Dec 4, 2024
45216fc
bump istio and register old dr version
stevenctl Dec 5, 2024
14eb248
Adding changelog file to new location
Dec 6, 2024
ffeda0d
Deleting changelog file from old location
Dec 6, 2024
6a4d50f
hack to fix race
stevenctl Dec 9, 2024
2ff9b97
bump istio, fix unit tests
npolshakova Dec 10, 2024
5a2a80a
regen
npolshakova Dec 10, 2024
18251c4
Merge branch 'main' into npolshak/use-v1beta1-dest-rule
npolshakova Dec 10, 2024
c152b23
Adding changelog file to new location
Dec 10, 2024
08df9f7
Deleting changelog file from old location
Dec 10, 2024
ff9f7a8
Adding changelog file to new location
Dec 12, 2024
7b20a4a
Deleting changelog file from old location
Dec 12, 2024
3b6fea4
Adding changelog file to new location
Dec 19, 2024
71187f2
Deleting changelog file from old location
Dec 19, 2024
daa5bbb
Adding changelog file to new location
Dec 20, 2024
5ee0b31
Deleting changelog file from old location
Dec 20, 2024
bb849e8
Adding changelog file to new location
Jan 2, 2025
6a0aa8b
Deleting changelog file from old location
Jan 2, 2025
fbacf90
Adding changelog file to new location
Jan 12, 2025
02cfccc
Deleting changelog file from old location
Jan 12, 2025
fd370d6
Adding changelog file to new location
Jan 13, 2025
04bc3fc
Deleting changelog file from old location
Jan 13, 2025
c134e47
Adding changelog file to new location
Jan 23, 2025
3708edb
Deleting changelog file from old location
Jan 23, 2025
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
7 changes: 7 additions & 0 deletions changelog/v1.18.7/use-v1beta1-dest-rule.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
changelog:
- type: FIX
issueLink: https://github.com/solo-io/gloo/issues/10399
resolvesIssue: false
description: |
Fix Istio support for versions before 1.22.0 by using the v1beta1 API for DestinationRules.

30 changes: 15 additions & 15 deletions docs/content/static/content/osa_provided.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ Name|Version|License
[census-instrumentation/opencensus-proto](https://github.com/census-instrumentation/opencensus-proto)|v0.2.0|Apache License 2.0
[xds/go](https://github.com/cncf/xds)|v0.0.0-20240905190251-b4127c9b8d78|Apache License 2.0
[cratonica/2goarray](https://github.com/cratonica/2goarray)|v0.0.0-20190331194516-514510793eaa|MIT License
[envoyproxy/go-control-plane](https://github.com/envoyproxy/go-control-plane)|v0.13.2-0.20241022220226-23b7e55d7f65|Apache License 2.0
[envoyproxy/go-control-plane](https://github.com/envoyproxy/go-control-plane)|v0.13.2-0.20241125134052-fc612d4a3afa|Apache License 2.0
[envoyproxy/protoc-gen-validate](https://github.com/envoyproxy/protoc-gen-validate)|v1.1.0|Apache License 2.0
[form3tech-oss/jwt-go](https://github.com/form3tech-oss/jwt-go)|v3.2.5+incompatible|MIT License
[fsnotify/fsnotify](https://github.com/fsnotify/fsnotify)|v1.7.0|BSD 3-clause "New" or "Revised" License
[fsnotify/fsnotify](https://github.com/fsnotify/fsnotify)|v1.8.0|BSD 3-clause "New" or "Revised" License
[ghodss/yaml](https://github.com/ghodss/yaml)|v1.0.1-0.20190212211648-25d852aebe32|MIT License
[go-logr/zapr](https://github.com/go-logr/zapr)|v1.3.0|Apache License 2.0
[go-openapi/loads](https://github.com/go-openapi/loads)|v0.19.4|Apache License 2.0
Expand All @@ -37,7 +37,7 @@ Name|Version|License
[go-httpbin/v2](https://github.com/mccutchen/go-httpbin)|v2.15.0|MIT License
[olekukonko/tablewriter](https://github.com/olekukonko/tablewriter)|v0.0.5|MIT License
[ginkgo/v2](https://github.com/onsi/ginkgo)|v2.20.2|MIT License
[onsi/gomega](https://github.com/onsi/gomega)|v1.35.0|MIT License
[onsi/gomega](https://github.com/onsi/gomega)|v1.35.1|MIT License
[pkg/browser](https://github.com/pkg/browser)|v0.0.0-20180916011732-0a3d74bf9ce4|BSD 2-clause "Simplified" License
[pkg/errors](https://github.com/pkg/errors)|v0.9.1|BSD 2-clause "Simplified" License
[go-ruleguard/dsl](https://github.com/quasilyte/go-ruleguard)|v0.3.22|BSD 3-clause "New" or "Revised" License
Expand All @@ -54,19 +54,19 @@ Name|Version|License
[go.uber.org/goleak](https://go.uber.org/goleak)|v1.3.0|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.27.0|MIT License
[x/crypto](https://golang.org/x/crypto)|v0.28.0|BSD 3-clause "New" or "Revised" License
[x/exp](https://golang.org/x/exp)|v0.0.0-20240719175910-8a7402abbf56|BSD 3-clause "New" or "Revised" License
[x/sync](https://golang.org/x/sync)|v0.8.0|BSD 3-clause "New" or "Revised" License
[x/tools](https://golang.org/x/tools)|v0.24.0|BSD 3-clause "New" or "Revised" License
[googleapis/api](https://google.golang.org/genproto/googleapis/api)|v0.0.0-20241021214115-324edc3d5d38|Apache License 2.0
[googleapis/rpc](https://google.golang.org/genproto/googleapis/rpc)|v0.0.0-20241021214115-324edc3d5d38|Apache License 2.0
[google.golang.org/grpc](https://google.golang.org/grpc)|v1.67.1|Apache License 2.0
[google.golang.org/protobuf](https://google.golang.org/protobuf)|v1.35.1|BSD 3-clause "New" or "Revised" License
[x/crypto](https://golang.org/x/crypto)|v0.29.0|BSD 3-clause "New" or "Revised" License
[x/exp](https://golang.org/x/exp)|v0.0.0-20240909161429-701f63a606c0|BSD 3-clause "New" or "Revised" License
[x/sync](https://golang.org/x/sync)|v0.9.0|BSD 3-clause "New" or "Revised" License
[x/tools](https://golang.org/x/tools)|v0.26.0|BSD 3-clause "New" or "Revised" License
[googleapis/api](https://google.golang.org/genproto/googleapis/api)|v0.0.0-20241113202542-65e8d215514f|Apache License 2.0
[googleapis/rpc](https://google.golang.org/genproto/googleapis/rpc)|v0.0.0-20241113202542-65e8d215514f|Apache License 2.0
[google.golang.org/grpc](https://google.golang.org/grpc)|v1.68.0|Apache License 2.0
[google.golang.org/protobuf](https://google.golang.org/protobuf)|v1.35.2|BSD 3-clause "New" or "Revised" License
[AlecAivazis/survey.v1](https://gopkg.in/AlecAivazis/survey.v1)|v1.8.7|MIT License
[helm/v3](https://helm.sh/helm/v3)|v3.16.2|Apache License 2.0
[istio.io/api](https://istio.io/api)|v1.24.0-alpha.0.0.20241106042855-9e26cdd3450a|Apache License 2.0
[istio.io/client-go](https://istio.io/client-go)|v1.24.0-alpha.0.0.20241106043554-b5828356941f|Apache License 2.0
[istio.io/istio](https://istio.io/istio)|v0.0.0-20241107203726-094b9e700412|Apache License 2.0
[helm/v3](https://helm.sh/helm/v3)|v3.16.3|Apache License 2.0
[istio.io/api](https://istio.io/api)|v1.24.0-alpha.0.0.20241204014820-f3e32c3b7a56|Apache License 2.0
[istio.io/client-go](https://istio.io/client-go)|v1.24.0-alpha.0.0.20241204015120-8f91b6fd01de|Apache License 2.0
[istio.io/istio](https://istio.io/istio)|v0.0.0-20241205190107-69f298c279d4|Apache License 2.0
[k8s.io/api](https://k8s.io/api)|v0.31.1|Apache License 2.0
[k8s.io/apiextensions-apiserver](https://k8s.io/apiextensions-apiserver)|v0.31.1|Apache License 2.0
[k8s.io/apimachinery](https://k8s.io/apimachinery)|v0.31.1|Apache License 2.0
Expand Down
73 changes: 38 additions & 35 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ require (
github.com/census-instrumentation/opencensus-proto v0.4.1
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78
github.com/cratonica/2goarray v0.0.0-20190331194516-514510793eaa
github.com/envoyproxy/go-control-plane v0.13.2-0.20241022220226-23b7e55d7f65
github.com/envoyproxy/go-control-plane v0.13.2-0.20241125134052-fc612d4a3afa
github.com/envoyproxy/protoc-gen-validate v1.1.0
github.com/form3tech-oss/jwt-go v3.2.5+incompatible
github.com/fsnotify/fsnotify v1.7.0
github.com/fsnotify/fsnotify v1.8.0
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
github.com/go-openapi/loads v0.19.4
github.com/go-openapi/spec v0.19.6
Expand All @@ -41,7 +41,7 @@ require (
github.com/kelseyhightower/envconfig v1.4.0
github.com/olekukonko/tablewriter v0.0.5
github.com/onsi/ginkgo/v2 v2.20.2
github.com/onsi/gomega v1.35.0
github.com/onsi/gomega v1.35.1
github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4
github.com/pkg/errors v0.9.1
github.com/rotisserie/eris v0.5.4
Expand All @@ -67,21 +67,21 @@ require (
go.uber.org/goleak v1.3.0
go.uber.org/multierr v1.11.0
go.uber.org/zap v1.27.0
golang.org/x/crypto v0.28.0
golang.org/x/sync v0.8.0
golang.org/x/tools v0.24.0
google.golang.org/grpc v1.67.1
google.golang.org/protobuf v1.35.1
golang.org/x/crypto v0.29.0
golang.org/x/sync v0.9.0
golang.org/x/tools v0.26.0
google.golang.org/grpc v1.68.0
google.golang.org/protobuf v1.35.2
gopkg.in/AlecAivazis/survey.v1 v1.8.7
helm.sh/helm/v3 v3.16.2
helm.sh/helm/v3 v3.16.3
k8s.io/api v0.31.2
k8s.io/apiextensions-apiserver v0.31.2
k8s.io/apimachinery v0.31.2
k8s.io/client-go v0.31.2
k8s.io/code-generator v0.31.1
k8s.io/component-base v0.31.2
k8s.io/kubectl v0.31.2
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6
k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078
knative.dev/networking v0.0.0-20211210083629-bace06e98aee
knative.dev/pkg v0.0.0-20211206113427-18589ac7627e
sigs.k8s.io/controller-runtime v0.19.1
Expand All @@ -101,18 +101,18 @@ require (
github.com/quasilyte/go-ruleguard/dsl v0.3.22
github.com/stoewer/go-strcase v1.3.0
github.com/stretchr/testify v1.9.0
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38
istio.io/api v1.24.0-alpha.0.0.20241106042855-9e26cdd3450a
istio.io/client-go v1.24.0-alpha.0.0.20241106043554-b5828356941f
istio.io/istio v0.0.0-20241107203726-094b9e700412
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
google.golang.org/genproto/googleapis/api v0.0.0-20241113202542-65e8d215514f
google.golang.org/genproto/googleapis/rpc v0.0.0-20241113202542-65e8d215514f
istio.io/api v1.24.0-alpha.0.0.20241204014820-f3e32c3b7a56
istio.io/client-go v1.24.0-alpha.0.0.20241204015120-8f91b6fd01de
istio.io/istio v0.0.0-20241205190107-69f298c279d4
sigs.k8s.io/controller-tools v0.16.3
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
)

require (
cel.dev/expr v0.16.0 // indirect
cel.dev/expr v0.16.1 // indirect
contrib.go.opencensus.io/exporter/prometheus v0.4.0 // indirect
cuelang.org/go v0.10.0 // indirect
dario.cat/mergo v1.0.1 // indirect
Expand Down Expand Up @@ -141,16 +141,16 @@ require (
github.com/chai2010/gettext-go v1.0.2 // indirect
github.com/cockroachdb/apd/v3 v3.2.1 // indirect
github.com/containerd/cgroups v1.1.0 // indirect
github.com/containerd/containerd v1.7.12 // indirect
github.com/containerd/containerd v1.7.23 // indirect
github.com/containerd/continuity v0.4.3 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
github.com/creack/pty v1.1.18 // indirect
github.com/cyphar/filepath-securejoin v0.3.1 // indirect
github.com/cyphar/filepath-securejoin v0.3.4 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/daviddengcn/go-colortext v1.0.0 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
github.com/distribution/reference v0.5.0 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/cli v27.3.1+incompatible // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/docker/docker v25.0.6+incompatible // indirect
Expand Down Expand Up @@ -235,7 +235,7 @@ require (
github.com/k0kubun/pp v3.0.1+incompatible // indirect
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/klauspost/compress v1.17.11 // indirect
github.com/kr/pty v1.1.8 // indirect
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
Expand Down Expand Up @@ -310,22 +310,22 @@ require (
github.com/xlab/treeprint v1.2.0 // indirect
github.com/yuin/goldmark v1.7.4 // indirect
go.mongodb.org/mongo-driver v1.1.2 // indirect
go.opentelemetry.io/otel v1.31.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.53.0 // indirect
go.opentelemetry.io/otel/metric v1.31.0 // indirect
go.opentelemetry.io/otel/sdk v1.31.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.31.0 // indirect
go.opentelemetry.io/otel/trace v1.31.0 // indirect
go.opentelemetry.io/otel v1.32.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.54.0 // indirect
go.opentelemetry.io/otel/metric v1.32.0 // indirect
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect
go.opentelemetry.io/otel/trace v1.32.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
go.starlark.net v0.0.0-20231121155337-90ade8b19d09 // indirect
go.uber.org/atomic v1.11.0 // indirect
golang.org/x/mod v0.21.0 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/term v0.25.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/time v0.7.0 // indirect
golang.org/x/net v0.31.0 // indirect
golang.org/x/oauth2 v0.24.0 // indirect
golang.org/x/sys v0.27.0 // indirect
golang.org/x/term v0.26.0 // indirect
golang.org/x/text v0.20.0 // indirect
golang.org/x/time v0.8.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
Expand Down Expand Up @@ -360,7 +360,7 @@ replace (
// using the pseudo version of github.com/form3tech-oss/[email protected] instead of the version directly,
// to avoid error about it being used for two different module paths
github.com/dgrijalva/jwt-go => github.com/form3tech-oss/jwt-go v0.0.0-20210511163231-5b2d2b5f6c34
github.com/docker/docker => github.com/moby/moby v26.0.0+incompatible
github.com/docker/docker => github.com/moby/moby v27.3.1+incompatible

// Pin this to a version compatible with protoc-gen-openapi
github.com/getkin/kin-openapi => github.com/getkin/kin-openapi v0.107.0
Expand All @@ -378,6 +378,9 @@ replace (
// Required for proper serialization of CRDs
github.com/renstrom/dedent => github.com/lithammer/dedent v1.0.0

// Pin istio to 69f298c279d4683891d092ead92f996e73fee456
istio.io/istio => istio.io/istio v0.0.0-20241205190107-69f298c279d4

// Pin Kube libraries to v0.31
// These should be upgraded collectively
k8s.io/api => k8s.io/api v0.31.1
Expand Down
Loading