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

[release/v0.6] Cherry-pick fixes into v0.6 #2150

Merged
merged 29 commits into from
Nov 1, 2023

Conversation

arkodg
Copy link
Contributor

@arkodg arkodg commented Nov 1, 2023

Here are the commits being brought in f301527...35c4fea

zhaohuabing and others added 29 commits November 1, 2023 10:40
* Revert "Skip RateLimitBasedJwtClaimsTest test (envoyproxy#2096)"

This reverts commit ef7a2a4.

fix e2e test

Signed-off-by: huabing zhao <zhaohuabing@gmail.com>

* fix XValidation

Signed-off-by: huabing zhao <zhaohuabing@gmail.com>

---------

Signed-off-by: huabing zhao <zhaohuabing@gmail.com>
(cherry picked from commit f301527)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>
Signed-off-by: Arko Dasgupta <arko@tetrate.io>
(cherry picked from commit fae8cd8)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>
Signed-off-by: bitliu <bitliu@tencent.com>
(cherry picked from commit 77445de)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>
All the translations and assignments now happen in the policy
translators

Signed-off-by: Arko Dasgupta <arko@tetrate.io>
(cherry picked from commit d65ab59)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>
(cherry picked from commit ef5e450)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>
(cherry picked from commit 4047268)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>
Bumps [sigs.k8s.io/yaml](https://github.com/kubernetes-sigs/yaml) from 1.3.0 to 1.4.0.
- [Release notes](https://github.com/kubernetes-sigs/yaml/releases)
- [Changelog](https://github.com/kubernetes-sigs/yaml/blob/master/RELEASE.md)
- [Commits](kubernetes-sigs/yaml@v1.3.0...v1.4.0)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/yaml
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit bf93a4e)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>
…ools/src/buf (envoyproxy#2121)

build(deps): bump github.com/bufbuild/buf in /tools/src/buf

Bumps [github.com/bufbuild/buf](https://github.com/bufbuild/buf) from 1.27.1 to 1.27.2.
- [Release notes](https://github.com/bufbuild/buf/releases)
- [Changelog](https://github.com/bufbuild/buf/blob/main/CHANGELOG.md)
- [Commits](bufbuild/buf@v1.27.1...v1.27.2)

---
updated-dependencies:
- dependency-name: github.com/bufbuild/buf
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 58146ff)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>
…roxy#2117)

Bumps [github.com/go-logr/logr](https://github.com/go-logr/logr) from 1.2.4 to 1.3.0.
- [Release notes](https://github.com/go-logr/logr/releases)
- [Changelog](https://github.com/go-logr/logr/blob/master/CHANGELOG.md)
- [Commits](go-logr/logr@v1.2.4...v1.3.0)

---
updated-dependencies:
- dependency-name: github.com/go-logr/logr
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit d1cbf5e)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>
…nvoyproxy#2116)

Bumps [envoyproxy/toolshed](https://github.com/envoyproxy/toolshed) from actions-v0.0.25 to 0.1.2. This release includes the previously tagged commit.
- [Release notes](https://github.com/envoyproxy/toolshed/releases)
- [Commits](envoyproxy/toolshed@actions-v0.0.25...actions-v0.1.2)

---
updated-dependencies:
- dependency-name: envoyproxy/toolshed
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 7b6344d)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3 to 4.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](actions/setup-node@v3...v4)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 5523099)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>
Signed-off-by: zirain <zirain2009@gmail.com>
(cherry picked from commit 268a6ef)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>
…55.1 in /tools/src/golangci-lint (envoyproxy#2119)

build(deps): bump github.com/golangci/golangci-lint

Bumps [github.com/golangci/golangci-lint](https://github.com/golangci/golangci-lint) from 1.55.0 to 1.55.1.
- [Release notes](https://github.com/golangci/golangci-lint/releases)
- [Changelog](https://github.com/golangci/golangci-lint/blob/master/CHANGELOG.md)
- [Commits](golangci/golangci-lint@v1.55.0...v1.55.1)

---
updated-dependencies:
- dependency-name: github.com/golangci/golangci-lint
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit be86295)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>
* feat: CEL Validation in BackendTrafficPolicy

Signed-off-by: slayer321 <sachin.maurya7666@gmail.com>

* leastRequest with consistentHash nil test

Signed-off-by: slayer321 <sachin.maurya7666@gmail.com>

---------

Signed-off-by: slayer321 <sachin.maurya7666@gmail.com>
(cherry picked from commit b45ae24)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>
* e2e: eg controlplane metrics

Signed-off-by: zirain <zirain2009@gmail.com>

* update

Signed-off-by: zirain <zirain2009@gmail.com>

* update

Signed-off-by: zirain <zirain2009@gmail.com>

* update name

Signed-off-by: zirain <zirain2009@gmail.com>

* rename

Signed-off-by: zirain <zirain2009@gmail.com>

* wait more

Signed-off-by: zirain <zirain2009@gmail.com>

* add comment

Signed-off-by: zirain <zirain2009@gmail.com>

* update

Signed-off-by: zirain <zirain2009@gmail.com>

---------

Signed-off-by: zirain <zirain2009@gmail.com>
(cherry picked from commit 046a593)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>
chore:fix http2_protocol_options warning message

Signed-off-by: zhaonan <zhaonan06@corp.netease.com>
(cherry picked from commit 179d265)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>
fix envoyproxy#2127

Signed-off-by: Huabing Zhao <zhaohuabing@gmail.com>
(cherry picked from commit 57e1aec)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>
(cherry picked from commit 71c09f2)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>
Signed-off-by: huabing zhao <zhaohuabing@gmail.com>
(cherry picked from commit df1e209)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>
(cherry picked from commit 3dd0ee7)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>
* Enable HTTPRouteRewritePath test

Fixes: envoyproxy#2004

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

* fix prefix match

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

* make testdata

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

* fix path match

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

* rm trailing /

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

* sort on path match type

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

* make testdata

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

* temp var

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

* fix url rewrite

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

---------

Signed-off-by: Arko Dasgupta <arko@tetrate.io>
(cherry picked from commit 2b3bc9f)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>
)

(cherry picked from commit 0c5b054)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>
* cors docs

Signed-off-by: huabing zhao <zhaohuabing@gmail.com>

* address comments

Signed-off-by: huabing zhao <zhaohuabing@gmail.com>

---------

Signed-off-by: huabing zhao <zhaohuabing@gmail.com>
(cherry picked from commit d0dc987)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>
* fix(ci): bump go version to 1.21

Signed-off-by: bitliu <bitliu@tencent.com>

* update

Signed-off-by: bitliu <bitliu@tencent.com>

---------

Signed-off-by: bitliu <bitliu@tencent.com>
(cherry picked from commit 6e81fb3)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>
…oyproxy#2136)

* nit

Signed-off-by: zirain <zirain2009@gmail.com>

* build Cluster depends on route type and service appProtocol

Signed-off-by: zirain <zirain2009@gmail.com>

* enable HTTPRouteBackendProtocolH2C conformance test

Signed-off-by: zirain <zirain2009@gmail.com>

* lint

Signed-off-by: zirain <zirain2009@gmail.com>

* fix

Signed-off-by: zirain <zirain2009@gmail.com>

* address comment

Signed-off-by: zirain <zirain2009@gmail.com>

* move to package internal/ir

Signed-off-by: zirain <zirain2009@gmail.com>

---------

Signed-off-by: zirain <zirain2009@gmail.com>
(cherry picked from commit 6d532c1)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>
* Fix attachedRoutes computation

* Fixes: envoyproxy#2077
* Fixes: envoyproxy#1916

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

* make testdata

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

---------

Signed-off-by: Arko Dasgupta <arko@tetrate.io>
(cherry picked from commit 93a12e7)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>
Signed-off-by: zhaonan <zhaonan06@corp.netease.com>
(cherry picked from commit 77bcb3c)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>
Signed-off-by: bitliu <bitliu@tencent.com>
(cherry picked from commit defed57)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>
fix nullpointer

Signed-off-by: huabing zhao <zhaohuabing@gmail.com>
Signed-off-by: Huabing Zhao <zhaohuabing@gmail.com>
(cherry picked from commit 35c4fea)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>
@arkodg arkodg requested a review from a team as a code owner November 1, 2023 17:48
Copy link

codecov bot commented Nov 1, 2023

Codecov Report

Merging #2150 (4ee83d2) into release/v0.6 (a77eabc) will decrease coverage by 0.08%.
The diff coverage is 77.87%.

@@               Coverage Diff                @@
##           release/v0.6    #2150      +/-   ##
================================================
- Coverage         64.36%   64.29%   -0.08%     
================================================
  Files               107      107              
  Lines             14626    14664      +38     
================================================
+ Hits               9414     9428      +14     
- Misses             4650     4669      +19     
- Partials            562      567       +5     
Files Coverage Δ
internal/gatewayapi/securitypolicy.go 78.60% <100.00%> (ø)
internal/xds/translator/accesslog.go 98.22% <100.00%> (ø)
internal/xds/translator/cluster.go 100.00% <100.00%> (ø)
internal/xds/translator/cors.go 66.32% <100.00%> (+0.34%) ⬆️
internal/xds/translator/jwt_authn.go 73.25% <ø> (-0.11%) ⬇️
internal/xds/translator/ratelimit.go 86.34% <100.00%> (ø)
internal/xds/translator/tracing.go 95.19% <100.00%> (ø)
internal/xds/translator/translator.go 79.78% <ø> (-0.57%) ⬇️
internal/xds/translator/httpfilters.go 78.26% <0.00%> (ø)
internal/xds/translator/route.go 92.51% <95.65%> (+0.37%) ⬆️
... and 4 more

... and 2 files with indirect coverage changes

@arkodg arkodg merged commit c62a470 into envoyproxy:release/v0.6 Nov 1, 2023
18 checks passed
@arkodg arkodg deleted the v0.6-cp branch November 1, 2023 19:08
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.

6 participants