Skip to content

Maistra 2.3.2 2#234

Merged
twghu merged 38 commits intomaistra:maistra-2.3from
twghu:maistra-2.3.2-2
Mar 1, 2023
Merged

Maistra 2.3.2 2#234
twghu merged 38 commits intomaistra:maistra-2.3from
twghu:maistra-2.3.2-2

Conversation

@twghu
Copy link
Contributor

@twghu twghu commented Feb 28, 2023

Update on PR 225 to address use of cherry-picks.

soulxu and others added 30 commits August 11, 2022 16:23
Signed-off-by: Ryan Northey <ryan@synca.io>
ci: disable non-RBE cache for release branches

Signed-off-by: Lizan Zhou <lizan@tetrate.io>
Signed-off-by: Ryan Northey <ryan@synca.io>
Previously `/var/run/docker.sock` is readable/writable inside docker run because group ID of `envoygroup` coincidentally matches host docker group, while it is no longer true during rolling out new image. Fixing that by forcing `envoygroup` has host docker group ID.

Risk Level: Low
Testing: CI
Docs Changes:
Release Notes:
Platform Specific Features:

Signed-off-by: Lizan Zhou <lizan@tetrate.io>
Signed-off-by: Dario Cillerai <dcillera@redhat.com>

Signed-off-by: Ryan Northey <ryan@synca.io>
Signed-off-by: Xie Zhihao <zhihao.xie@intel.com>
Signed-off-by: Ryan Northey <ryan@synca.io>
Signed-off-by: Ryan Northey <ryan@synca.io>
Signed-off-by: wbpcode <wangbaiping@corp.netease.com>

Signed-off-by: Ryan Northey <ryan@synca.io>
Signed-off-by: Ryan Northey <ryan@synca.io>
As noted in #21060, building with gcc in "opt" mode results in a compilation error:
```
ERROR: /workspaces/envoy/source/common/config/BUILD:414:17: Compiling source/common/config/watch_map.cc failed: (Exit 1): gcc failed: error executing command /usr/bin/gcc -U_FORTIFY_SOURCE -fstack-protector -Wall -Wunused-but-set-parameter -Wno-free-nonheap-object -fno-omit-frame-pointer -g0 -O2 '-D_FORTIFY_SOURCE=1' -DNDEBUG -ffunction-sections ... (remaining 154 arguments skipped)

Use --sandbox_debug to see verbose messages from the sandbox
source/common/config/watch_map.cc: In member function 'virtual void Envoy::Config::WatchMap::onConfigUpdate(const google::protobuf::RepeatedPtrField<envoy::service::discovery::v3::Resource>&, const google::protobuf::RepeatedPtrField<std::__cxx11::basic_string<char> >&, const string&)':
source/common/config/watch_map.cc:215:69: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
  215 |       type_url_, reinterpret_cast<std::vector<DecodedResourcePtr>&>(decoded_resources),
      |                                                                     ^~~~~~~~~~~~~~~~~
cc1plus: all warnings being treated as errors
```
This PR changes the type of the original vector to be the base class type.

Risk Level: Low-Medium (no features changes, but updates config-plane code).
Testing: N/A
Docs Changes: N/A
Release Notes: N/A
Platform Specific Features: N/A

Signed-off-by: Adi Suissa-Peleg <adip@google.com>
Signed-off-by: Ryan Northey <ryan@synca.io>
…(#20843)

Signed-off-by: johnlanni ztywto@qq.com

Commit Message: Handle null plugins handle when skipping config canarying for duplicate filters and also when the remote code fetch is in progress or fails.
Risk Level: low
Testing: ok

Signed-off-by: 澄潭 <ztywto@qq.com>

Signed-off-by: Ryan Northey <ryan@synca.io>
Signed-off-by: Ingwon Song <igsong@google.com>

Signed-off-by: Ingwon Song <102102227+ingwonsong@users.noreply.github.com>

Signed-off-by: Ryan Northey <ryan@synca.io>
Signed-off-by: Piotr Sikora <piotrsikora@google.com>

Signed-off-by: Ryan Northey <ryan@synca.io>
Signed-off-by: Piotr Sikora <piotrsikora@google.com>

Signed-off-by: Ryan Northey <ryan@synca.io>
…2117)

Signed-off-by: Piotr Sikora <piotrsikora@google.com>

Signed-off-by: Ryan Northey <ryan@synca.io>
Signed-off-by: Piotr Sikora <piotrsikora@google.com>
…izer for 12 fields) (#21414)

Signed-off-by: Adam Kotwasinski <adam.kotwasinski@gmail.com>
Signed-off-by: Ryan Northey <ryan@synca.io>
Signed-off-by: Adam Kotwasinski <adam.kotwasinski@gmail.com>
Signed-off-by: Ryan Northey <ryan@synca.io>
Signed-off-by: Adam Kotwasinski <adam.kotwasinski@gmail.com>
Signed-off-by: Ryan Northey <ryan@synca.io>
Signed-off-by: Ryan Northey <ryan@synca.io>
Signed-off-by: He Jie Xu <hejie.xu@intel.com>

Signed-off-by: Ryan Northey <ryan@synca.io>
Fix #23685

Signed-off-by: Ryan Northey <ryan@synca.io>

Signed-off-by: phlax <phlax@users.noreply.github.com>
The HeaderEvaluatorConfigUpdate test needs to wait for a listener to be replaced. Its previous attempt to achieve that did not account for the intermediate warming state of new listeners, which could lead to the test continuing prematurely and failing.

Signed-off-by: Benjamin Peterson <benjamin@engflow.com>
Signed-off-by: Ryan Northey <ryan@synca.io>
Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
Signed-off-by: Ryan Northey <ryan@synca.io>
…24089)

* deps: bump `com_github_wasmtime` -> 1.0.0 (#23232)

Signed-off-by: river phillips <riverphillips1@gmail.com>
Signed-off-by: Ryan Northey <ryan@synca.io>

* wasm: update WAVM to nightly/2022-05-14. (#22491)


Signed-off-by: Piotr Sikora <piotrsikora@google.com>
Signed-off-by: Ryan Northey <ryan@synca.io>

* wasm: update Proxy-Wasm C++ Host to latest. (#22575)

Signed-off-by: Piotr Sikora <piotrsikora@google.com>

Signed-off-by: Ryan Northey <ryan@synca.io>

* deps: Bump `com_github_wasmtime` -> 1.0.2 (#24086)

Fix:

- CVE-2022-39392
- CVE-2022-39393
- CVE-2022-39394

Signed-off-by: Ryan Northey <ryan@synca.io>

* bazel: update rules_rust

This gets us on rust 1.60

Signed-off-by: Keith Smiley <keithbsmiley@gmail.com>

Signed-off-by: Ryan Northey <ryan@synca.io>

* deps: Bump `rules_rust` -> 0.8.1 (#22253)

Fix #22073

Signed-off-by: Ryan Northey <ryan@synca.io>

* wasm: fix V8 build on older versions of Linux. (#22228)

wasm: fix build on older versions of Linux.

Signed-off-by: Piotr Sikora <piotrsikora@google.com>
Signed-off-by: Ryan Northey <ryan@synca.io>

* backport: macOS: Allow to load .wasm on Apple silicon (#23299)

backport: macOS: Enable wasm and allow to load .wasm on Apple silicon

This applies https://chromium-review.googlesource.com/c/v8/v8/+/3700352 as a fix for
MemoryAllocator::PartialFreeMemory() which shouldn't try to change permissions of RWX pages.

This mainly affects macOS > 11.2 due to mprotect behavior changes (#23243)
on Apple silicon.

This is cherry-picked from: envoyproxy/envoy@63f27a6

Signed-off-by: Dhi Aurrahman <dio@rockybars.com>

Signed-off-by: Dhi Aurrahman <dio@rockybars.com>
Signed-off-by: Ryan Northey <ryan@synca.io>

* deps: Bump `v8` to 10.7.193.13 and `proxy_wasm_cpp_host` to b0a0594 (#23434)

Signed-off-by: Dhi Aurrahman <dio@rockybars.com>

* ci: Disable wasm coverage tests (#24169)

and adjust-coverage-total

Signed-off-by: Ryan Northey <ryan@synca.io>

Signed-off-by: phlax <phlax@users.noreply.github.com>

* deps: Bump `com_github_wasmtime` -> 2.0.2 (+related) (#24150)

deps: Bump `com_github_wasmtime` -> 2.0.2

- `proxy_wasm_cpp_host`
- `proxy_wasm_rust_sdk`

Signed-off-by: Ryan Northey <ryan@synca.io>

Signed-off-by: river phillips <riverphillips1@gmail.com>
Signed-off-by: Ryan Northey <ryan@synca.io>
Signed-off-by: Piotr Sikora <piotrsikora@google.com>
Signed-off-by: Dhi Aurrahman <dio@rockybars.com>
Signed-off-by: phlax <phlax@users.noreply.github.com>
Co-authored-by: River <6375745+RiverPhillips@users.noreply.github.com>
Co-authored-by: Piotr Sikora <piotrsikora@google.com>
Co-authored-by: Keith Smiley <keithbsmiley@gmail.com>
Co-authored-by: Dhi Aurrahman <dio@rockybars.com>
Signed-off-by: Ryan Northey <ryan@synca.io>
Signed-off-by: Ryan Northey <ryan@synca.io>
Signed-off-by: Ryan Northey <ryan@synca.io>
Signed-off-by: Ryan Northey <ryan@synca.io>
…ian11:nonroot) (#24647)

Signed-off-by: Michael Kaufmann <michael.kaufmann@ergon.ch>

Signed-off-by: Michael Kaufmann <mkauf@users.noreply.github.com>
dependabot bot and others added 8 commits January 4, 2023 16:32
…0562a7` in /ci (#24736)

build(deps): bump distroless/base-nossl-debian11 in /ci

Bumps distroless/base-nossl-debian11 from `036581b` to `50562a7`.

---
updated-dependencies:
- dependency-name: distroless/base-nossl-debian11
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Ryan Northey <ryan@synca.io>
…ee458a` in /ci (#24830)

build(deps): bump distroless/base-nossl-debian11 in /ci

Bumps distroless/base-nossl-debian11 from `6f20a31` to `3ee458a`.

---
updated-dependencies:
- dependency-name: distroless/base-nossl-debian11
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Signed-off-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…d7fe70` in /ci (#25153)

build(deps): bump distroless/base-nossl-debian11 in /ci

Bumps distroless/base-nossl-debian11 from `3ee458a` to `cd7fe70`.

---
updated-dependencies:
- dependency-name: distroless/base-nossl-debian11
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Ryan Northey <ryan@synca.io>
…f61596` in /ci (#25291)

build(deps): bump distroless/base-nossl-debian11 in /ci

Bumps distroless/base-nossl-debian11 from `cd7fe70` to `bf61596`.

---
updated-dependencies:
- dependency-name: distroless/base-nossl-debian11
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Ryan Northey <ryan@synca.io>
Recently CI saw errors like this:
```
bazel-out/k8-fastbuild/bin/external/org_llvm_releases_compiler_rt/_virtual_includes/fuzzed_data_provider/fuzzer/FuzzedDataProvider.h:194:38: error: no member named 'numeric_limits' in namespace 'std'
  return ConsumeIntegralInRange(std::numeric_limits<T>::min(),
                                ~~~~~^
```

Apparently this is due to a incompatibility between the `compiler-rt`
dependency and the clang version we use (14.0).

This is fixed by updating `compiler-rt` to match clang 14. Actually This commit
cherry-picks the relevant changes done in upstream a while ago: envoyproxy/envoy#21135
Upstream PR proxy-wasm/proxy-wasm-cpp-host#282 has been merged and maistra-2.4 branch includes these changes

Signed-off-by: Konstantin Maksimov <konstantin.maksimov@ibm.com>
It's always failing in our environment.
Upstream bug: envoyproxy/envoy#24330
@twghu twghu changed the base branch from maistra-2.4 to maistra-2.3 February 28, 2023 14:27
@twghu twghu requested a review from tedjpoole February 28, 2023 14:27
@maistra-bot
Copy link

@twghu: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
envoy-unit-2.4 1f915d5 link true /test unit
Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@twghu
Copy link
Contributor Author

twghu commented Feb 28, 2023

/retest

@jwendell
Copy link
Member

@twghu It looks like there are newer commits on Envoy 1.22 (1.22.8 tag). Do you want to bring them too?

@twghu twghu mentioned this pull request Feb 28, 2023
Copy link
Contributor

@tedjpoole tedjpoole left a comment

Choose a reason for hiding this comment

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

LGTM

@twghu twghu removed the do-not-merge label Mar 1, 2023
@twghu twghu merged commit f1a60f4 into maistra:maistra-2.3 Mar 1, 2023
@twghu twghu deleted the maistra-2.3.2-2 branch March 28, 2023 03:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.