Skip to content

Commit

Permalink
chore(xds): remove back compat for old dns filter (#6226)
Browse files Browse the repository at this point in the history
This was introduced to support envoy < 1.20 which we no longer need to
support

xref #3499

---------

Signed-off-by: Charly Molter <charly.molter@konghq.com>
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
lahabana and github-actions[bot] authored Mar 8, 2023
1 parent f7643c4 commit 4ac717b
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 902 deletions.
4 changes: 2 additions & 2 deletions api/common/v1alpha1/datasource.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
package v1alpha1

import (
"github.com/golang/protobuf/ptypes/wrappers"
"google.golang.org/protobuf/types/known/wrapperspb"

system_proto "github.com/kumahq/kuma/api/system/v1alpha1"
)
Expand All @@ -22,7 +22,7 @@ func (ds *DataSource) ConvertToProto() *system_proto.DataSource {
case ds.Secret != nil:
return &system_proto.DataSource{Type: &system_proto.DataSource_Secret{Secret: *ds.Secret}}
case ds.Inline != nil:
return &system_proto.DataSource{Type: &system_proto.DataSource_Inline{Inline: &wrappers.BytesValue{Value: *ds.Inline}}}
return &system_proto.DataSource{Type: &system_proto.DataSource_Inline{Inline: &wrapperspb.BytesValue{Value: *ds.Inline}}}
case ds.InlineString != nil:
return &system_proto.DataSource{Type: &system_proto.DataSource_InlineString{InlineString: *ds.InlineString}}
}
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/Nordix/simple-ipam v1.0.0
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d
github.com/cilium/ebpf v0.10.0
github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b
github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b // indirect
github.com/containerd/cgroups v1.1.0
github.com/containernetworking/cni v1.1.2
github.com/containernetworking/plugins v1.2.0
Expand Down
Loading

0 comments on commit 4ac717b

Please sign in to comment.