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.

Sign up for GitHub

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

Jump to bottom

Merge more 1.14 changes that need to be in 2.0 #3873

Merged
merged 32 commits into from
Oct 9, 2021
Merged

Merge more 1.14 changes that need to be in 2.0 #3873

merged 32 commits into from
Oct 9, 2021

Conversation

LukeShu
Copy link
Contributor

@LukeShu LukeShu commented Oct 7, 2021

Description

This is on top of #3867. It is a simple git merge origin/release/v1.14, since that branch has progressed since #3867 was started. I actually did it in 2 parts, where I merged a mid-way-point first.

And then there's a final commit reverting release/v2.0 changes to the v0, v1, and v2 CRD schemas, to bring them back in-line with what's on release/v1.14.

Related Issues

List related issues.

Testing

A few sentences describing what testing you've done, e.g., manual tests, automated tests, deployed in production, etc.

Checklist

  • I made sure to update CHANGELOG.md.

    Remember, the CHANGELOG needs to mention:

    • Any new features
    • Any changes to our included version of Envoy
    • Any non-backward-compatible changes
    • Any deprecations

  • This is unlikely to impact how Ambassador performs at scale.

    Remember, things that might have an impact at scale include:

    • Any significant changes in memory use that might require adjusting the memory limits
    • Any significant changes in CPU use that might require adjusting the CPU limits
    • Anything that might change how many replicas users should use
    • Changes that impact data-plane latency/scalability

  • My change is adequately tested.

    Remember when considering testing:

    • LEGACY MODE TESTS DO NOT RUN FOR EVERY PR. If your change is affected by legacy mode, you need
      to run legacy-mode tests manually (set AMBASSADOR_LEGACY_MODE=true and run the tests).
      (This will be fixed soon.)
    • Your change needs to be specifically covered by tests.
      • Tests need to cover all the states where your change is relevant: for example, if you add a behavior that can be enabled or disabled, you'll need tests that cover the enabled case and tests that cover the disabled case. It's not sufficient just to test with the behavior enabled.
    • You also need to make sure that the entire area being changed has adequate test coverage.
      • If existing tests don't actually cover the entire area being changed, add tests.
      • This applies even for aspects of the area that you're not changing – check the test coverage, and improve it if needed!
    • We should lean on the bulk of code being covered by unit tests, but...
    • ... an end-to-end test should cover the integration points

  • I updated DEVELOPING.md with any any special dev tricks I had to use to work on this code efficiently.

w-h37 and others added 27 commits September 22, 2021 10:19
@w-h37
Update for v1.14.2
d37129d 
Signed-off-by: w-h37 <[email protected]>
@w-h37
Removed duplicate CHANGELOG.md entry
fe78354 
Signed-off-by: w-h37 <[email protected]>
@Alice-Lilith
add missing schemas
6c95954 
Signed-off-by: AliceProxy <[email protected]>
@Alice-Lilith
modify endpoint test
9cdbc6b 
Signed-off-by: AliceProxy <[email protected]>
@w-h37
Update for v1.14.2
dd84126 
Signed-off-by: w-h37 <[email protected]>
@w-h37
Merge pull request #3839 from emissary-ingress/willhardin/v1.14.2/cha…
3cdcea2 
…ngelog-updates

Willhardin/v1.14.2/changelog updates
@kflynn
Merge pull request #3822 from emissary-ingress/rel/v1.14.2
5f6fb2e 
[v1.14.2] Release Branch
@w-h37
Updating and manifest images for v1.14.2
eafeaa4 
Signed-off-by: w-h37 <[email protected]>
@kflynn
Merge pull request #3840 from emissary-ingress/willhardin/v1.14.2/cha…
6fdb7fa 
…rt-image-updates

[v1.14.2] Chart and manifest image updates
@w-h37
updated values.yaml for correct values
0e7218b 
Signed-off-by: w-h37 <[email protected]>
@kflynn
Merge pull request #3842 from emissary-ingress/whardin-valueyaml-fixes
ad61a54 
updated values.yaml for correct values
Chart version 6.9.3
a4e0c38 
The only change here is the chart version, since 6.9.2 was released incorrectly.

Signed-off-by: Flynn <[email protected]>
@kflynn
Merge pull request #3845 from emissary-ingress/flynn/dev/chart-6.9.3
1607f0d 
Chart version 6.9.3
@LukeShu
git grep -l '\s$' :python/**.py|xargs sed -E -i 's/\s+$//'
ec1d7f4 
Signed-off-by: Luke Shumaker <[email protected]>
@LukeShu
Fix the change in how we handle case-insensitive headers
8d86887 
This was originally done in the commit pair 7aa61e0 (yank deprecated
config option, 2021-08-18) and 38c7f8f (v3 api needs ignore_case
specified for ext_authz headers, 2021-08-18) by Aidan in release/v1.14,
and rebased/cherry-picked on to release/v2.0 as 041f44e and bd39b6d by
Flynn.

However, as discussed with Flynn earlier today, there are two things
wrong:

 1. It missed a few cases where it needed to add ignore_case.
 2. It left in a comment about a line of code that no longer exists; we've
    removed the code, let's remove the comment.

I did not run with KAT_RUN_MODE=envoy to update the gold files, I simply
ran

    git grep -l '"exact"' python/tests/gold/ | \
      xargs sed -ri 's/^(\s*)"exact": ".*"$/&,\n\1"ignore_case": true/'

and then rolled back the 'globalcorstest' and 'plain' econf.jsons.

Signed-off-by: Luke Shumaker <[email protected]>
@LukeShu
Merge pull request #3861 from emissary-ingress/lukeshu/1.14-fixup
9a867c9 
[1.14] Misc fixups noticed when looking at the 1.14 merge
@LukeShu
Merge commit '1607f0d3262f085c4d74929fa596cdfdae2f3ee8' into lukeshu/…
0dba986 
…merge-1.14-new

Signed-off-by: Luke Shumaker <[email protected]>
@LukeShu
make lint: Don't forget to lint the Helm chart
b6fd131 
Signed-off-by: Luke Shumaker <[email protected]>
(cherry picked from commit 1da34ce)
@LukeShu
make lint, make format: Check consistent formatting of python/schemas…
1bd176a 
…/ [ci-skip]

Signed-off-by: Luke Shumaker <[email protected]>
(cherry picked from commit 64f696b)
@LukeShu
make format
0393cf1 
Signed-off-by: Luke Shumaker <[email protected]>
@LukeShu
python/schemas/: Avoid using arrays for type; use oneOf instead […
7606ed5 
…ci-skip]

Kubernetes CRD validation can't use arrays for `type`.

(cherry picked from commit 0fcf4be)

Signed-off-by: Luke Shumaker <[email protected]>
@LukeShu
make format
9bd90c8 
Signed-off-by: Luke Shumaker <[email protected]>
@LukeShu
schema-fmt: Leverage k8s CRD schema types [ci-skip]
ba4939f 
Signed-off-by: Luke Shumaker <[email protected]>
(cherry picked from commit 839de8c)
@LukeShu
make format
b6b5a7c 
Signed-off-by: Luke Shumaker <[email protected]>
@LukeShu
CHANGELOG.md: Consistent word-wrapping for releases ≥1.13.4
c0dfb9b 
Signed-off-by: Luke Shumaker <[email protected]>
@LukeShu
Use docs/releaseNotes.yml and docs/CHANGELOG.tpl to build CHANGELOG.md
ee43afb 
Signed-off-by: Flynn <[email protected]>
(cherry picked from commit fcb95c4)

I had to fuss with the data and the template to better match what is
currently on this branch.

Signed-off-by: Luke Shumaker <[email protected]>
@LukeShu
python/schemas/: Revert things erroneously backported from v1alpha1
0e16a4f 
This brings v0, v1, and v2 to be in-sync with what is on release/v1.14.

Signed-off-by: Luke Shumaker <[email protected]>
Base automatically changed from flynn/dev/merge-1.14 to release/v2.0 October 7, 2021 22:58
@kflynn kflynn mentioned this pull request Oct 8, 2021
Closed
4 tasks
@LukeShu
Merge pull request #3874 from emissary-ingress/lukeshu/1.14-fmt
3832ea0 
[v1.14] Backport some tooling changes from v2.0
Flynn and others added 4 commits October 8, 2021 13:45
@kflynn kflynn force-pushed the lukeshu/merge-1.14-new branch from 08233ce to fc42090 Compare October 8, 2021 19:45
kflynn
kflynn approved these changes Oct 8, 2021
View reviewed changes
Copy link
Member

@kflynn kflynn left a comment

Choose a reason for hiding this comment

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

Looks good here. @LukeShu should review as well...

@kflynn kflynn merged commit c685d3c into release/v2.0 Oct 9, 2021
@kflynn kflynn deleted the lukeshu/merge-1.14-new branch October 9, 2021 13:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kflynn kflynn kflynn approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@LukeShu @kflynn @w-h37 @Alice-Lilith