Skip to content

Update protobuf to envoy 1.16.0 - #155

Merged
slonka merged 4 commits into
envoyproxy:masterfrom
wookieJ:update-protobuf-envoy-oct-8-2020
Dec 7, 2020
Merged

Update protobuf to envoy 1.16.0#155
slonka merged 4 commits into
envoyproxy:masterfrom
wookieJ:update-protobuf-envoy-oct-8-2020

Conversation

@wookieJ

Copy link
Copy Markdown
Contributor

No description provided.

Signed-off-by: Lukasz Jedryczka <lukasz.jedryczka@allegro.pl>
@wookieJ
wookieJforce-pushed the update-protobuf-envoy-oct-8-2020 branch from 2b97a24 to e8fdd3aCompareDecember 2, 2020 08:23
@slonkaslonka mentioned this pull request Dec 2, 2020
Signed-off-by: Lukasz Jedryczka <lukasz.jedryczka@allegro.pl>
@wookieJ
wookieJforce-pushed the update-protobuf-envoy-oct-8-2020 branch from d1ca4e6 to ee7d709CompareDecember 2, 2020 12:26
Signed-off-by: Lukasz Jedryczka <lukasz.jedryczka@allegro.pl>
@codecov-io

codecov-io commented Dec 3, 2020

Copy link
Copy Markdown

Codecov Report

Merging #155 (98c2556) into master (d71b9a2) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@ Coverage Diff @@## master #155 +/- ##
=========================================
Coverage 88.02% 88.02% Complexity 296 296 =========================================
Files 31 31 Lines 977 977 Branches 78 78 =========================================
Hits 860 860 Misses 85 85 Partials 32 32 

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 d71b9a2...98c2556. Read the comment docs.

@slonkaslonka left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Have you manually touched any files other than tools/update-api.sh, tools/API_SHAS, EnvoyContainer.java ? The diff is pretty big and quite hard to navigate.

@@ -24,7 +24,7 @@
private final Supplier<Integer> controlPlanePortSupplier;

EnvoyContainer(String config, Supplier<Integer> controlPlanePortSupplier) {
super("envoyproxy/envoy-alpine-dev:latest");
super("envoyproxy/envoy-alpine-dev:8fb3cb86082b17144a80402f5367ae65f06083bd");

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@wookieJ - please add that this needs to be updated here: https://github.com/envoyproxy/java-control-plane#bring-api-up-to-date-with-data-plane-api. Also @nezdolik I think that this is a better way to have repeatable builds and solves this #154 . In the next release of java-control-plane we will remove v2 usage and update to to 1.16.1.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

no, manual changes only to the files you specified. And README.md soon

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

added

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

nice! lmk if I could help with deprecating v2

Comment threadtools/API_SHAS Outdated
@@ -1,11 +1,11 @@
# Update the versions here and run update-api.sh

# envoy (source: SHA from https://github.com/envoyproxy/envoy)
ENVOY_SHA="38fe5e1ec115c0b2e83921211c2646f160a91681" # Feb 13, 2020
ENVOY_SHA="8fb3cb86082b17144a80402f5367ae65f06083bd" # Oct 8, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Maybe it is worth to add (v1.16.0) to the comment?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

added

Signed-off-by: wookieJ <lukaszjedryczka.biuro@gmail.com>
@wookieJ
wookieJforce-pushed the update-protobuf-envoy-oct-8-2020 branch from e68dd13 to 98c2556CompareDecember 4, 2020 09:57
@slonka
slonka merged commit 19b4b16 into envoyproxy:masterDec 7, 2020
slonka pushed a commit that referenced this pull request May 20, 2021
* Update protobuf to envoy 1.16.0
Signed-off-by: Lukasz Jedryczka <lukasz.jedryczka@allegro.pl>
* Fixing test by setting -boostrap-version 2 flag
Signed-off-by: Lukasz Jedryczka <lukasz.jedryczka@allegro.pl>
* Update protobuf to envoy 1.16.0
Signed-off-by: Lukasz Jedryczka <lukasz.jedryczka@allegro.pl>
* Information about update envoy image version in README.md
Signed-off-by: wookieJ <lukaszjedryczka.biuro@gmail.com>
Signed-off-by: slonka <slonka@users.noreply.github.com>
Ferdudas97 added a commit that referenced this pull request Sep 9, 2022
* delta xds
Signed-off-by: Sebastian Schepens <sebastian.schepens@mercadolibre.com>
Signed-off-by: slonka <slonka@users.noreply.github.com>
* fixes
Signed-off-by: Sebastian Schepens <sebastian.schepens@mercadolibre.com>
Signed-off-by: slonka <slonka@users.noreply.github.com>
* method naming
Signed-off-by: Sebastian Schepens <sebastian.schepens@mercadolibre.com>
Signed-off-by: slonka <slonka@users.noreply.github.com>
* Building version of non-breaking changes
Signed-off-by: slonka <slonka@users.noreply.github.com>
* Get integration tests passing
Signed-off-by: slonka <slonka@users.noreply.github.com>
* Add delta tests back
Signed-off-by: slonka <slonka@users.noreply.github.com>
* Rewrite V3DiscoveryServerAdsDeltaResourcesIT to have a 2 second poll delay to account for potential delays in writing to the wire (we don't want that to happen)
Signed-off-by: slonka <slonka@users.noreply.github.com>
* Add comment to trigger PR build
Signed-off-by: slonka <slonka@users.noreply.github.com>
* Get V3DiscoveryServerXdsDeltaResourcesIT passing
Signed-off-by: slonka <slonka@users.noreply.github.com>
* Update protobuf to envoy 1.16.0 (#155)
* Update protobuf to envoy 1.16.0
Signed-off-by: Lukasz Jedryczka <lukasz.jedryczka@allegro.pl>
* Fixing test by setting -boostrap-version 2 flag
Signed-off-by: Lukasz Jedryczka <lukasz.jedryczka@allegro.pl>
* Update protobuf to envoy 1.16.0
Signed-off-by: Lukasz Jedryczka <lukasz.jedryczka@allegro.pl>
* Information about update envoy image version in README.md
Signed-off-by: wookieJ <lukaszjedryczka.biuro@gmail.com>
Signed-off-by: slonka <slonka@users.noreply.github.com>
* release: prepare release v0.1.25
Signed-off-by: slonka <slonka@users.noreply.github.com>
* release: prepare for next development iteration
Signed-off-by: slonka <slonka@users.noreply.github.com>
* release: prepare release v0.1.26
Signed-off-by: slonka <slonka@users.noreply.github.com>
* release: prepare for next development iteration
Signed-off-by: slonka <slonka@users.noreply.github.com>
* Bump nexus release plugin timeout to 20 minutes (#156)
Signed-off-by: slonka <slonka@users.noreply.github.com>
* release: prepare release v0.1.27
Signed-off-by: slonka <slonka@users.noreply.github.com>
* release: prepare for next development iteration
Signed-off-by: slonka <slonka@users.noreply.github.com>
* ci: fixes javadoc and jacoco plugin issues (#158)
Signed-off-by: karthik <listaction@gmail.com>
Signed-off-by: slonka <slonka@users.noreply.github.com>
* Update api to v1 17 (#159)
* Update protobuf to envoy 1.17
Signed-off-by: Lukasz Dziedziak <lukasz.dziedziak@allegro.pl>
* Use v2 version
Signed-off-by: Lukasz Dziedziak <lukasz.dziedziak@allegro.pl>
* Support V2/V3 in Envoy - remove V2 in separate PR
Signed-off-by: Lukasz Dziedziak <lukasz.dziedziak@allegro.pl>
* UDPA download - split directory create/copy
Signed-off-by: Lukasz Dziedziak <lukasz.dziedziak@allegro.pl>
Signed-off-by: slonka <slonka@users.noreply.github.com>
* Fix references to main branch after rename (#160)
Signed-off-by: slonka <slonka@users.noreply.github.com>
* release: prepare release v0.1.28
Signed-off-by: slonka <slonka@users.noreply.github.com>
* release: prepare for next development iteration
Signed-off-by: slonka <slonka@users.noreply.github.com>
* Change version to 0.1.29-delta-xds-slonka-SNAPSHOT
Signed-off-by: slonka <slonka@users.noreply.github.com>
* Revert ads configs to main
Signed-off-by: slonka <slonka@users.noreply.github.com>
* Hash bytes array not string
Signed-off-by: slonka <slonka@users.noreply.github.com>
* Remove unused import
Signed-off-by: slonka <slonka@users.noreply.github.com>
* Revert snapshot name
Signed-off-by: slonka <slonka@users.noreply.github.com>
* Remove respondDeltaTracked since it's not used anywhere
Signed-off-by: slonka <slonka@users.noreply.github.com>
* Delta xds non breaking hash bytes refactor (#181)
* refactor delta xds
Signed-off-by: radoslaw.chrzanowski <radoslaw.chrzanowski@allegro.pl>
* refactor setDeltaWatch and remove code duplication
Signed-off-by: radoslaw.chrzanowski <radoslaw.chrzanowski@allegro.pl>
* resolve TODO in SnapshotTest
Signed-off-by: radoslaw.chrzanowski <radoslaw.chrzanowski@allegro.pl>
* Change version to 0.1.29-delta-xds-slonka-SNAPSHOT
Signed-off-by: radoslaw.chrzanowski <radoslaw.chrzanowski@allegro.pl>
* DEPLOY_BRANCH added for snapshot deploy
Signed-off-by: radoslaw.chrzanowski <radoslaw.chrzanowski@allegro.pl>
* changes after merge master with new envoy api
Signed-off-by: radoslaw.chrzanowski <radoslaw.chrzanowski@allegro.pl>
* make CacheStatusInfoAggregator public
Signed-off-by: radoslaw.chrzanowski <radoslaw.chrzanowski@allegro.pl>
* make GroupCacheStatusInfo and MutableStatusInfo public
Signed-off-by: radoslaw.chrzanowski <radoslaw.chrzanowski@allegro.pl>
* refactor SimpleCache
Signed-off-by: radoslaw.chrzanowski <radoslaw.chrzanowski@allegro.pl>
* create resources map only once
Signed-off-by: radoslaw.chrzanowski <radoslaw.chrzanowski@allegro.pl>
* build snapshot with improved performance
Signed-off-by: radoslaw.chrzanowski <radoslaw.chrzanowski@allegro.pl>
* refactor creating snapshot resources due to performance improvements
Signed-off-by: radoslaw.chrzanowski <radoslaw.chrzanowski@allegro.pl>
* create hash version from string
Signed-off-by: radoslaw.chrzanowski <radoslaw.chrzanowski@allegro.pl>
* remove custom snapshot version and deploy branch env
Signed-off-by: radoslaw.chrzanowski <radoslaw.chrzanowski@allegro.pl>
* fix test after merge
Signed-off-by: radoslaw.chrzanowski <radoslaw.chrzanowski@allegro.pl>
* fix V3DeltaDiscoveryServerCallbacks description
Signed-off-by: radoslaw.chrzanowski <radoslaw.chrzanowski@allegro.pl>
Signed-off-by: Sebastian Schepens <sebastian.schepens@mercadolibre.com>
Signed-off-by: slonka <slonka@users.noreply.github.com>
Signed-off-by: wookieJ <lukaszjedryczka.biuro@gmail.com>
Signed-off-by: karthik <listaction@gmail.com>
Signed-off-by: Lukasz Dziedziak <lukasz.dziedziak@allegro.pl>
Signed-off-by: radoslaw.chrzanowski <radoslaw.chrzanowski@allegro.pl>
Co-authored-by: Sebastian Schepens <sebastian.schepens@mercadolibre.com>
Co-authored-by: mgajda <mgajda@hubspot.com>
Co-authored-by: Łukasz Jędryczka <34069409+wookieJ@users.noreply.github.com>
Co-authored-by: envoy-bot <envoy-bot@users.noreply.github.com>
Co-authored-by: Karthik Ram <listaction@gmail.com>
Co-authored-by: Łukasz Dziedziak <lukasz.dziedziak@allegro.pl>
Co-authored-by: Radek Chrzanowski <ferdudas97@gmail.com>
Co-authored-by: radoslaw.chrzanowski <radoslaw.chrzanowski@allegro.pl>
@codecov-commenter

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 88.02%. Comparing base (d71b9a2) to head (98c2556).

Additional details and impacted files
@@ Coverage Diff @@## master #155 +/- ##
=========================================
Coverage 88.02% 88.02% Complexity 296 296 =========================================
Files 31 31 Lines 977 977 Branches 78 78 =========================================
Hits 860 860 Misses 85 85 Partials 32 32 

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Sign up for freeto 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.

6 participants

@wookieJ@codecov-io@codecov-commenter@slonka@nezdolik@MarcinFalkowski