Skip to content

Commit

Permalink
chore(deps): change go-control-plane version (#12000)
Browse files Browse the repository at this point in the history
We aim to keep our fork of go-control-plane synchronized with the
upstream repository. We’ve documented our proposed steps in a
[MADR](https://docs.google.com/document/d/1n9hQkTubtODIJl_NThF0uvhcqXJo5OU-lU3X3N81hW4/edit?tab=t.0#heading=h.n6cmlf1eel2z),
which outlines the process we plan to follow.

I've created a release `v0.13.1-kong-1`, diverging from `v0.13.1`, so we
can use a version that includes our custom changes. The goal is to keep
our tags distinct from the upstream, so I plan to remove `v0.13.2` from
our fork to avoid confusion.

https://docs.google.com/document/d/1n9hQkTubtODIJl_NThF0uvhcqXJo5OU-lU3X3N81hW4/edit?tab=t.0#heading=h.n6cmlf1eel2z

Fix #XX

<!--
> Changelog: skip
-->
<!--
Uncomment the above section to explicitly set a [`> Changelog:` entry
here](https://github.com/kumahq/kuma/blob/master/CONTRIBUTING.md#submitting-a-patch)?
-->

Signed-off-by: Lukasz Dziedziak <lukidzi@gmail.com>
  • Loading branch information
lukidzi authored and kumahq[bot] committed Nov 12, 2024
1 parent dbfa484 commit aeee4fb
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 0 deletions.
4 changes: 4 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -228,4 +228,8 @@ require (
)

// remove once https://github.com/envoyproxy/go-control-plane/issues/875 is resolved
<<<<<<< HEAD
replace github.com/envoyproxy/go-control-plane v0.12.0 => github.com/envoyproxy/go-control-plane v0.11.2-0.20231010133108-1dfbe83bcebc
=======
replace github.com/envoyproxy/go-control-plane => github.com/kumahq/go-control-plane v0.13.1-kong-1
>>>>>>> 9565a54ef (chore(deps): change go-control-plane version (#12000))
7 changes: 7 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,13 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
<<<<<<< HEAD
=======
github.com/kumahq/go-control-plane v0.13.1-kong-1 h1:y4VBsyImRrxfVA1/8Fk8QtDI18uo8upc0agVfg6x5qU=
github.com/kumahq/go-control-plane v0.13.1-kong-1/go.mod h1:X45hY0mufo6Fd0KW3rqsGvQMw58jvjymeCzBU3mWyHw=
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
>>>>>>> 9565a54ef (chore(deps): change go-control-plane version (#12000))
github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
Expand Down
1 change: 1 addition & 0 deletions pkg/xds/envoy/imports.go
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@ import (
_ "github.com/envoyproxy/go-control-plane/envoy/extensions/rbac/matchers/upstream_ip_port/v3"
_ "github.com/envoyproxy/go-control-plane/envoy/extensions/regex_engines/v3"
_ "github.com/envoyproxy/go-control-plane/envoy/extensions/request_id/uuid/v3"
_ "github.com/envoyproxy/go-control-plane/envoy/extensions/resource_monitors/cpu_utilization/v3"
_ "github.com/envoyproxy/go-control-plane/envoy/extensions/resource_monitors/downstream_connections/v3"
_ "github.com/envoyproxy/go-control-plane/envoy/extensions/resource_monitors/fixed_heap/v3"
_ "github.com/envoyproxy/go-control-plane/envoy/extensions/resource_monitors/injected_resource/v3"
Expand Down

0 comments on commit aeee4fb

Please sign in to comment.