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

[v3.0] Repatriate from v2.3 #4244

Merged
merged 43 commits into from
May 28, 2022
Merged

[v3.0] Repatriate from v2.3 #4244

merged 43 commits into from
May 28, 2022

Conversation

d6e-automaton
Copy link
Collaborator

This PR merges release/v2.3 in to master.

LukeShu added 13 commits May 19, 2022 11:11
 - Rename `actions/collect-testing-logs` -> `actions/collect-logs`
 - Rename the `name` arg to `jobname`
 - Revise the description

Signed-off-by: Luke Shumaker <[email protected]>
This was causing problems for me on my laptop.

Signed-off-by: Luke Shumaker <[email protected]>
Avoid writing repetitive rules for simple files.

Signed-off-by: Luke Shumaker <[email protected]>
… in CI [ci-skip]

This is marked [ci-skip] because (as this PR reveals) `make clobber`
is currently broken.

Signed-off-by: Luke Shumaker <[email protected]>
Get it to actually clean up all the things that it should.

Signed-off-by: Luke Shumaker <[email protected]>
Fix `make clobber`, and have CI check that it works
If there's an old PR that's already been merged, that means we should be
creating a new one, rather than assuming that pushing to the branch will
update the old one.

As seen on https://github.com/emissary-ingress/emissary/runs/6523998225

Signed-off-by: Luke Shumaker <[email protected]>
.github: Fix the repatriation logic to deal with merged/closed PRs
@LukeShu LukeShu changed the title [v2.4] Repatriate from v2.3 [v3.0] Repatriate from v2.3 May 23, 2022
Flynn and others added 16 commits May 23, 2022 18:12
…k on, and that's no good for Envoy.

Signed-off-by: Flynn <[email protected]>
… on MacOS. Sigh.

Thanks to @LukeShu for the help here!

Signed-off-by: Flynn <[email protected]>
Pin to glibc 2.34, and fix make deploy on MacOS
Signed-off-by: Flynn <[email protected]>
Swap the order of the CORS filter and the ext_authz filter.
If there are any authservices in annotation config, then add logic to whether the synthetic authservice should be injected/removed

Signed-off-by: AliceProxy <[email protected]>
Signed-off-by: Flynn <[email protected]>
Signed-off-by: AliceProxy <[email protected]>
Edge-stack does not support custom authservices so we xfail these tests when running edge-stack.
The synthetic authservice should ensure that a valid authservice is always present for edge-stack.

Signed-off-by: AliceProxy <[email protected]>
… custom authservice not compatible with the default edge-stack authservice

Signed-off-by: AliceProxy <[email protected]>
This reverts commit 09ecd8e.

Signed-off-by: AliceProxy <[email protected]>
AliceProxy and others added 14 commits May 24, 2022 20:48
This reverts commit b494d99.

Signed-off-by: AliceProxy <[email protected]>
This reverts commit dfbdc99.

Signed-off-by: AliceProxy <[email protected]>
This reverts commit adbb2b7.

Signed-off-by: AliceProxy <[email protected]>
Allow Host and TLSContext to configure a CRL (v2.3)
…ations

Synthetic AuthService annotation config
…ltiple mappings have the same name

Signed-off-by: AliceProxy <[email protected]>
…he-keyname

Cache: fix an issue where the cache key for mappings is wrong when mu…
@LanceEa LanceEa self-requested a review May 28, 2022 02:57
@LanceEa LanceEa merged commit 3fb6b2f into master May 28, 2022
@LanceEa LanceEa deleted the ci/repatriate/from-v2.3-to-v2.4 branch May 28, 2022 03:00
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.

4 participants