Merge 1.14 changes that need to be in 2.0 #3867

kflynn · 2021-10-06T21:58:09Z

There are quite a few changes from 1.14 that weren't in 2.0. Here they are.

This was, roughly speaking, done by rebasing release/v1.14 onto release/v2.0,
and doing a truly massive amount of merge-conflict resolution, a lot of
rebasing to clean up history, and just a few hand edits where all else
failed.

The end result should be reviewable commit-by-commit.

Chart: CHANGELOG updates up through 1.14.1
Update release notes for dns_type
set go version on build ([1.13] set go version correctly on build #3636)
Ambex comment cleanup.
cors origins roundtrip fix (cors origins roundtrip fix #3612)
added timeout to the mapping->docs CRD
Releng: Reorder imports and add the parse_bool() function
Releng: Support ALLOW_UNTRACKED environment variable when starting a new version.
Add an AMBASSADOR_GRPC_METRICS_SINK environment variable and an example metrics sink service.
gzip fix (Ambassador needs CI #19)
fix bad IS_PRIVATE tests in makefiles
Move misplaced unit tests into python/tests/unit where they belong.
config respecting dns record ttl
Add dns_ttl_tests
Update release notes for dns_ttl
Support buffer_limit_bytes in ambassador module
Add buffer_limit_bytes tests
Update release notes for buffer_limit_bytes

Testing

I've done some checks by hand around the dns_ttl, dns_type, and buffer_limit_bytes
changes, but CI should be handling this.

Checklist

I made sure to update CHANGELOG.md.
This is unlikely to impact how Ambassador performs at scale.
My change is adequately tested.
I didn't need to update DEVELOPING.md.

Signed-off-by: Alix Cook <[email protected]>

* run envoy in docker so we can run it anywhere Signed-off-by: Alix Cook <[email protected]> * more make dependencies Signed-off-by: Alix Cook <[email protected]> * bump kat request limit Signed-off-by: Alix Cook <[email protected]> * add commit hook for dco bot Signed-off-by: Alix Cook <[email protected]> * do docker builds better Signed-off-by: Alix Cook <[email protected]> * hmm maybe dont wait on oss images Signed-off-by: Alix Cook <[email protected]>

Signed-off-by: Alix Cook <[email protected]>

* fix for wait for rc artifacts Signed-off-by: Alix Cook <[email protected]> * change chart repo in a couple places Signed-off-by: Alix Cook <[email protected]>

Signed-off-by: Alix Cook <[email protected]>

Signed-off-by: Flynn <[email protected]>

…isk for debugging Signed-off-by: Flynn <[email protected]>

Signed-off-by: Flynn <[email protected]>

…ANGELOG. Signed-off-by: Flynn <[email protected]>

* cors mapping fix Signed-off-by: Alix Cook <[email protected]> * fake test Signed-off-by: Alix Cook <[email protected]> * changelog Signed-off-by: Alix Cook <[email protected]>

Signed-off-by: Aidan Hahn <[email protected]>

Signed-off-by: Flynn <[email protected]>

Signed-off-by: Aidan Hahn <[email protected]>

Signed-off-by: Flynn <[email protected]>

…itch [1.13.10] Allow disabling Ambex ratelimiter

…nto rel/v1.13.10

Signed-off-by: Flynn <[email protected]>

* cors mapping fix Signed-off-by: Alix Cook <[email protected]> * fake test Signed-off-by: Alix Cook <[email protected]> * changelog Signed-off-by: Alix Cook <[email protected]> Signed-off-by: Luke Shumaker <[email protected]>

Signed-off-by: Aidan Hahn <[email protected]> Signed-off-by: Luke Shumaker <[email protected]>

Signed-off-by: Flynn <[email protected]> Signed-off-by: Luke Shumaker <[email protected]>

…new version. Signed-off-by: Flynn <[email protected]> Signed-off-by: Luke Shumaker <[email protected]>

…le metrics sink service. Signed-off-by: Rafael Schloming <[email protected]> Signed-off-by: Luke Shumaker <[email protected]>

(was "gzip fix (#19)") * gzip fix * update ambex * update ambex * update circle Signed-off-by: Luke Shumaker <[email protected]> Signed-off-by: Alix Cook <[email protected]>

Signed-off-by: Aidan Hahn <[email protected]> Signed-off-by: Luke Shumaker <[email protected]>

Signed-off-by: Flynn <[email protected]>

aidanhahn

send it!

LukeShu · 2021-10-07T19:41:40Z

pkg/api/getambassador.io/v3alpha1/devportal_types.go

+
+	// Timeout specifies the amount of time devportal will wait
+	// for the downstream service to report an openapi spec back
+	Timeout int `json:"timeout_ms,omitempty"`


For the final v3alpha1→v3, we should consider changing this and everything like it to

Timeout metav1.Duration `json:"timeout,omitempty"`

But that doesn't need to happen now.

LukeShu

This wants the git merge -s ours to allow for future merges to be easier. Otherwise, lgtm.

LukeShu · 2021-10-07T19:44:49Z

For later when I'm doing archeology: There's more info in #3862 which is closed in favor of this.

…v/merge-1.14 Signed-off-by: Flynn <[email protected]>

Alice-Lilith

The files with my changes LGTM!

acookin and others added 30 commits June 11, 2021 16:49

switch to using shared charts repo (#3537)

3431032

Signed-off-by: Alix Cook <[email protected]>

Update for v1.13.9

790846e

Signed-off-by: Alix Cook <[email protected]>

tcp mapping fix

2af1004

Signed-off-by: Alix Cook <[email protected]>

changelog update

5384854

Signed-off-by: Alix Cook <[email protected]>

Update for v1.13.9 (#3582)

13c52b0

Signed-off-by: Alix Cook <[email protected]>

Updating and manifest images for v1.13.9 (#3583)

148c0ce

Signed-off-by: Alix Cook <[email protected]>

dont overwrite 2.0 manifests (#3589)

e807e1b

Signed-off-by: Alix Cook <[email protected]>

fixes for 1.13 releng scripts (#3584)

0d9985a

* fix for wait for rc artifacts Signed-off-by: Alix Cook <[email protected]> * change chart repo in a couple places Signed-off-by: Alix Cook <[email protected]>

set go version on build (#3636)

3c10974

Signed-off-by: Alix Cook <[email protected]>

Update for v1.13.10

2fd606d

Signed-off-by: Flynn <[email protected]>

promote to passed works better

0c90146

Signed-off-by: Flynn <[email protected]>

Allow "make deploy" to work.

e07109e

Signed-off-by: Flynn <[email protected]>

Basic Ambex visibility: save a certain number of Ambex snapshots to d…

7115d19

…isk for debugging Signed-off-by: Flynn <[email protected]>

CHANGELOG

6f072ef

Signed-off-by: Flynn <[email protected]>

Support hotfix tags in CI

4bfad6f

Signed-off-by: Flynn <[email protected]>

Fix the docker tag for hotfixes.

70577ca

Signed-off-by: Flynn <[email protected]>

Note Edge Stack Consul certificate-rotation logging changes in the CH…

8fc4b51

…ANGELOG. Signed-off-by: Flynn <[email protected]>

cors origins roundtrip fix (#3612)

cd94125

* cors mapping fix Signed-off-by: Alix Cook <[email protected]> * fake test Signed-off-by: Alix Cook <[email protected]> * changelog Signed-off-by: Alix Cook <[email protected]>

added timeout to the mapping->docs CRD

b2a2234

add config generation test

e07dc75

Signed-off-by: Aidan Hahn <[email protected]>

Exclude hotfix tags when looking at versions.

3c53df7

Signed-off-by: Flynn <[email protected]>

fix pytest schema checks

8da6ca1

Signed-off-by: Aidan Hahn <[email protected]>

Allow switching the ambex ratelimiter off.

4f4ac2b

Signed-off-by: Flynn <[email protected]>

CHANGELOG

25eede6

Signed-off-by: Flynn <[email protected]>

Merge pull request #3631 from emissary-ingress/flynn/dev/ratelimit-sw…

9a94d25

…itch [1.13.10] Allow disabling Ambex ratelimiter

add changelog notes for devportal timeout changes

444a2b1

Merge branch 'rel/v1.13.10' of github.com:emissary-ingress/emissary i…

6136606

…nto rel/v1.13.10

Update CHANGELOG for 1.13.10

405477b

Signed-off-by: Flynn <[email protected]>

Another minor CHANGELOG tweak

17c6bb2

Signed-off-by: Flynn <[email protected]>

kflynn requested a review from aidanhahn October 6, 2021 21:58

acookin and others added 14 commits October 6, 2021 19:40

cors origins roundtrip fix (#3612)

b47a33f

* cors mapping fix Signed-off-by: Alix Cook <[email protected]> * fake test Signed-off-by: Alix Cook <[email protected]> * changelog Signed-off-by: Alix Cook <[email protected]> Signed-off-by: Luke Shumaker <[email protected]>

added timeout to the mapping->docs CRD

a6f0df7

Signed-off-by: Aidan Hahn <[email protected]> Signed-off-by: Luke Shumaker <[email protected]>

Releng: Reorder imports and add the parse_bool() function

be6fe70

Signed-off-by: Flynn <[email protected]> Signed-off-by: Luke Shumaker <[email protected]>

Releng: Support ALLOW_UNTRACKED environment variable when starting a …

1215ee6

…new version. Signed-off-by: Flynn <[email protected]> Signed-off-by: Luke Shumaker <[email protected]>

Add an AMBASSADOR_GRPC_METRICS_SINK environment variable and an examp…

c60a16a

…le metrics sink service. Signed-off-by: Rafael Schloming <[email protected]> Signed-off-by: Luke Shumaker <[email protected]>

Envoy v3 log_format fix

81ada38

(was "gzip fix (#19)") * gzip fix * update ambex * update ambex * update circle Signed-off-by: Luke Shumaker <[email protected]> Signed-off-by: Alix Cook <[email protected]>

fix bad IS_PRIVATE tests in makefiles

c1f84c0

Signed-off-by: Aidan Hahn <[email protected]> Signed-off-by: Luke Shumaker <[email protected]>

Move misplaced unit tests into python/tests/unit where they belong.

d05be68

Signed-off-by: Flynn <[email protected]>

config respecting dns record ttl

b2522da

Signed-off-by: Flynn <[email protected]>

Add dns_ttl_tests

b50c623

Signed-off-by: Flynn <[email protected]>

Update release notes for dns_ttl

80166f4

Signed-off-by: Flynn <[email protected]>

Support buffer_limit_bytes in ambassador module

9e37c18

Signed-off-by: Flynn <[email protected]>

Add buffer_limit_bytes tests

a471f6a

Signed-off-by: Flynn <[email protected]>

Update release notes for buffer_limit_bytes

bacadf3

Signed-off-by: Flynn <[email protected]>

kflynn force-pushed the flynn/dev/merge-1.14 branch from eb2c64e to bacadf3 Compare October 7, 2021 18:07

aidanhahn approved these changes Oct 7, 2021

View reviewed changes

LukeShu reviewed Oct 7, 2021

View reviewed changes

LukeShu self-requested a review October 7, 2021 19:43

LukeShu suggested changes Oct 7, 2021

View reviewed changes

LukeShu mentioned this pull request Oct 7, 2021

Merge release/v1.14 in to release/v2.0 #3862

Closed

4 tasks

Merge commit '4294fbe6528af6c37cf8332f1437186b7a5c73ce' into flynn/de…

a02bc1b

…v/merge-1.14 Signed-off-by: Flynn <[email protected]>

LukeShu self-requested a review October 7, 2021 19:54

LukeShu approved these changes Oct 7, 2021

View reviewed changes

LukeShu mentioned this pull request Oct 7, 2021

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

Closed

4 tasks

Alice-Lilith approved these changes Oct 7, 2021

View reviewed changes

LukeShu mentioned this pull request Oct 7, 2021

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

Merged

4 tasks

kflynn merged commit 9172758 into release/v2.0 Oct 7, 2021

kflynn deleted the flynn/dev/merge-1.14 branch October 7, 2021 22:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge 1.14 changes that need to be in 2.0 #3867

Merge 1.14 changes that need to be in 2.0 #3867

kflynn commented Oct 6, 2021 •

edited

Loading

aidanhahn left a comment

LukeShu Oct 7, 2021 •

edited

Loading

LukeShu left a comment

LukeShu commented Oct 7, 2021

Alice-Lilith left a comment

Merge 1.14 changes that need to be in 2.0 #3867

Merge 1.14 changes that need to be in 2.0 #3867

Conversation

kflynn commented Oct 6, 2021 • edited Loading

Testing

Checklist

aidanhahn left a comment

Choose a reason for hiding this comment

LukeShu Oct 7, 2021 • edited Loading

Choose a reason for hiding this comment

LukeShu left a comment

Choose a reason for hiding this comment

LukeShu commented Oct 7, 2021

Alice-Lilith left a comment

Choose a reason for hiding this comment

kflynn commented Oct 6, 2021 •

edited

Loading

LukeShu Oct 7, 2021 •

edited

Loading