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

chore(*) update Envoy to 1.20 #2967

Merged
merged 28 commits into from
Nov 24, 2021
Merged

chore(*) update Envoy to 1.20 #2967

merged 28 commits into from
Nov 24, 2021

Conversation

lobkovilya
Copy link
Contributor

Summary

based on #2965

Since Envoy renamed v3alpha to v3, we have to vendor the old DNS filter proto:

  • pkg/xds/envoy/listeners/v3/compatibility/v3alpha/dns_filter.pb.go

Full changelog

  • Update Envoy to 1.20
  • Update go-control-plane github.com/envoyproxy/go-control-plane v0.9.10-0.20211007073556-ab721e93c590

Issues resolved

Fix #2713

Documentation

Testing

  • Unit tests
  • E2E tests
  • Manual testing on Universal
  • Manual testing on Kubernetes

Backwards compatibility

  • Add backport-to-stable label if the code is backwards compatible. Otherwise, list breaking changes.

Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
@codecov-commenter
Copy link

codecov-commenter commented Oct 18, 2021

Codecov Report

Merging #2967 (e0b2ba9) into master (40260e2) will decrease coverage by 0.05%.
The diff coverage is 34.82%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2967      +/-   ##
==========================================
- Coverage   52.30%   52.25%   -0.06%     
==========================================
  Files         927      929       +2     
  Lines       54066    54429     +363     
==========================================
+ Hits        28281    28440     +159     
- Misses      23573    23763     +190     
- Partials     2212     2226      +14     
Impacted Files Coverage Δ
pkg/hds/server/server.go 5.26% <0.00%> (+0.05%) ⬆️
pkg/kds/server/status_tracker.go 0.00% <0.00%> (ø)
pkg/test/xds/client/main.go 0.00% <ø> (ø)
...v3/compatibility/v3alpha/dns_filter.pb.validate.go 0.00% <0.00%> (ø)
pkg/xds/envoy/listeners/v3/kafka_configurer.go 0.00% <ø> (ø)
pkg/xds/server/v3/resource_warming_forcer.go 14.63% <0.00%> (ø)
pkg/util/xds/v3/callbacks_chain.go 55.55% <10.00%> (-37.04%) ⬇️
pkg/util/xds/v3/noop_callbacks.go 46.66% <14.28%> (-31.12%) ⬇️
...isteners/v3/compatibility/v3alpha/dns_filter.pb.go 33.33% <33.33%> (ø)
pkg/util/xds/v3/cache.go 63.21% <76.92%> (-0.74%) ⬇️
... and 25 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 40260e2...e0b2ba9. Read the comment docs.

Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Base automatically changed from chore/delete-bootstrap-version to master October 21, 2021 15:25
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>

# Conflicts:
#	app/kuma-dp/cmd/run.go
#	app/kuma-dp/pkg/dataplane/envoy/remote_bootstrap.go
#	app/kuma-dp/pkg/dataplane/envoy/remote_bootstrap_test.go
#	pkg/config/xds/bootstrap/config.go
#	pkg/xds/bootstrap/types/bootstrap_request.go
@lobkovilya lobkovilya marked this pull request as ready for review October 21, 2021 21:06
@lobkovilya lobkovilya requested a review from a team as a code owner October 21, 2021 21:06
go.mod Show resolved Hide resolved
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Copy link
Contributor

@jpeach jpeach left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks pretty good overall. Just a few minor comments.

test/dockerfiles/Dockerfile.universal Outdated Show resolved Hide resolved
tools/releases/dockerfiles/Dockerfile.kuma-dp Outdated Show resolved Hide resolved
pkg/xds/envoy/listeners/v3/dns_configurer.go Show resolved Hide resolved
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
@jpeach
Copy link
Contributor

jpeach commented Oct 27, 2021

@lobkovilya I'm not sure that this should be backported. Do we really want to churn an Envoy version in a stable release train?

@lobkovilya
Copy link
Contributor Author

@jpeach yeah, probably we don't want

Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>

# Conflicts:
#	go.mod
#	go.sum
#	mk/test.mk
#	tools/releases/dockerfiles/Dockerfile.kuma-dp
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
@jpeach
Copy link
Contributor

jpeach commented Nov 22, 2021

@lobkovilya Does this need another review pass?

@lobkovilya
Copy link
Contributor Author

lobkovilya commented Nov 23, 2021

@jpeach yes please, it'd be great :)

Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>

# Conflicts:
#	pkg/xds/server/v3/reconcile_test.go
Copy link
Contributor

@jpeach jpeach left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Quick, merge this before it needs another rebase!

.golangci.yml Show resolved Hide resolved
@jpeach jpeach mentioned this pull request Nov 24, 2021
9 tasks
@lobkovilya lobkovilya merged commit 9a7dc1e into master Nov 24, 2021
@lobkovilya lobkovilya deleted the chore/update-envoy-1.20 branch November 24, 2021 09:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade to Envoy 1.20.x
3 participants