Skip to content

Commit

Permalink
chore(deps): change go-control-plane version (#12000)
Browse files Browse the repository at this point in the history
## Motivation

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.

## Implementation information

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.

## Supporting documentation

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 <[email protected]>
  • Loading branch information
lukidzi authored Nov 12, 2024
1 parent c3d7187 commit 9565a54
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -232,4 +232,4 @@ require (
)

// remove once https://github.com/envoyproxy/go-control-plane/issues/875 is resolved
replace github.com/envoyproxy/go-control-plane => github.com/kumahq/go-control-plane v0.13.2
replace github.com/envoyproxy/go-control-plane => github.com/kumahq/go-control-plane v0.13.1-kong-1
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,8 @@ 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=
github.com/kumahq/go-control-plane v0.13.2 h1:jLRCHGsOGnY/onq82pEQbywhlg77bPOAPdr3Sq/lRcU=
github.com/kumahq/go-control-plane v0.13.2/go.mod h1:GRaKG3dwvFoTg4nj7aXdZnvMg4d7nvT/wl9WgVXn3Q8=
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=
github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
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 @@ -309,6 +309,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 9565a54

Please sign in to comment.