Skip to content

bug: fix merge race#2604

Merged
arkodg merged 1 commit intoenvoyproxy:mainfrom
arkodg:merge-race
Feb 13, 2024
Merged

bug: fix merge race#2604
arkodg merged 1 commit intoenvoyproxy:mainfrom
arkodg:merge-race

Conversation

@arkodg
Copy link
Copy Markdown
Contributor

@arkodg arkodg commented Feb 13, 2024

Between #2585 &
#2581

Between envoyproxy#2585
&
envoyproxy#2581

Signed-off-by: Arko Dasgupta <arko@tetrate.io>
@arkodg arkodg requested a review from a team as a code owner February 13, 2024 23:45
@codecov
Copy link
Copy Markdown

codecov bot commented Feb 13, 2024

Codecov Report

Attention: 14 lines in your changes are missing coverage. Please review.

Comparison is base (6884f8d) 63.89% compared to head (e64c185) 63.89%.
Report is 1 commits behind head on main.

Files Patch % Lines
internal/ir/zz_generated.deepcopy.go 0.00% 13 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2604      +/-   ##
==========================================
- Coverage   63.89%   63.89%   -0.01%     
==========================================
  Files         119      119              
  Lines       18828    18847      +19     
==========================================
+ Hits        12030    12042      +12     
- Misses       6004     6011       +7     
  Partials      794      794              

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

@arkodg arkodg merged commit 446997b into envoyproxy:main Feb 13, 2024
@arkodg arkodg deleted the merge-race branch February 13, 2024 23:49
yaelSchechter pushed a commit to yaelSchechter/envoy-gateway that referenced this pull request Feb 14, 2024
Between envoyproxy#2585
&
envoyproxy#2581

Signed-off-by: Arko Dasgupta <arko@tetrate.io>
Signed-off-by: Yael Shechter <yael.shechter@sap.com>
zirain added a commit that referenced this pull request Feb 18, 2024
* feat: Suppress 'X-Envoy' headers and pass-through the upstream 'Server' header by default (#2585)

* Implement and update tests for the default header transformations.

Signed-off-by: Lior Okman <lior.okman@sap.com>

* Make 'gen-check' happy

Signed-off-by: Lior Okman <lior.okman@sap.com>

---------

Signed-off-by: Lior Okman <lior.okman@sap.com>
Signed-off-by: Yael Shechter <yael.shechter@sap.com>

* bug: fix merge race (#2604)

Between #2585
&
#2581

Signed-off-by: Arko Dasgupta <arko@tetrate.io>
Signed-off-by: Yael Shechter <yael.shechter@sap.com>

* feat: downstream mTLS (#2490)

* feat: downstream mTLS

Relates to #2483

Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* configmap provider logic

Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* gatewayapi translation

Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* fix charts

Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* tests

Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* lint

Signed-off-by: Arko Dasgupta <arko@tetrate.io>

---------

Signed-off-by: Arko Dasgupta <arko@tetrate.io>
Signed-off-by: Yael Shechter <yael.shechter@sap.com>

* add timeout to clientTrafficPolicy

Signed-off-by: Yael Shechter <yael.shechter@sap.com>

* fix comment

Signed-off-by: Yael Shechter <yael.shechter@sap.com>

* add omitempty

Signed-off-by: Yael Shechter <yael.shechter@sap.com>

* add cel test for coverage

Signed-off-by: Yael Shechter <yael.shechter@sap.com>

* run make commands

Signed-off-by: Yael Shechter <yael.shechter@sap.com>

* change request timeout field name and desc

Signed-off-by: Yael Shechter <yael.shechter@sap.com>

* tidy up comment

Signed-off-by: Yael Shechter <yael.shechter@sap.com>

* fix cel test

Signed-off-by: Yael Shechter <yael.shechter@sap.com>

* fix typo

Signed-off-by: Yael Shechter <yael.shechter@sap.com>

* run generate

Signed-off-by: Yael Shechter <yael.shechter@sap.com>

---------

Signed-off-by: Lior Okman <lior.okman@sap.com>
Signed-off-by: Yael Shechter <yael.shechter@sap.com>
Signed-off-by: Arko Dasgupta <arko@tetrate.io>
Co-authored-by: Lior Okman <lior.okman@sap.com>
Co-authored-by: Arko Dasgupta <arkodg@users.noreply.github.com>
Co-authored-by: zirain <zirain2009@gmail.com>
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.

2 participants