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

[pull] main from envoyproxy:main #41

Merged
merged 497 commits into from
Jul 25, 2024
Merged

[pull] main from envoyproxy:main #41

merged 497 commits into from
Jul 25, 2024

Conversation

pull[bot]
Copy link

@pull pull bot commented Apr 9, 2024

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

@pull pull bot added the ⤵️ pull label Apr 9, 2024
@codecov-commenter
Copy link

codecov-commenter commented May 7, 2024

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

Attention: Patch coverage is 80.13699% with 319 lines in your changes missing coverage. Please review.

Project coverage is 67.40%. Comparing base (fc7d6bc) to head (1a7d0c6).
Report is 260 commits behind head on main.

Files Patch % Lines
internal/gatewayapi/runner/runner.go 21.27% 72 Missing and 2 partials ⚠️
internal/cmd/egctl/collect.go 0.00% 52 Missing ⚠️
internal/gatewayapi/envoyextensionpolicy.go 85.77% 24 Missing and 12 partials ⚠️
internal/gatewayapi/resource.go 42.85% 20 Missing ⚠️
internal/extension/registry/xds_hook.go 0.00% 16 Missing ⚠️
internal/gatewayapi/status/backend.go 0.00% 13 Missing ⚠️
internal/gatewayapi/extensionserverpolicy.go 88.23% 8 Missing and 4 partials ⚠️
internal/gatewayapi/clienttrafficpolicy.go 92.56% 9 Missing and 2 partials ⚠️
internal/gatewayapi/status/policy.go 0.00% 11 Missing ⚠️
internal/cmd/egctl/status.go 0.00% 9 Missing ⚠️
... and 20 more
Additional details and impacted files
@@            Coverage Diff             @@
##             main      #41      +/-   ##
==========================================
+ Coverage   63.33%   67.40%   +4.06%     
==========================================
  Files         119      183      +64     
  Lines       19211    22442    +3231     
==========================================
+ Hits        12168    15126    +2958     
+ Misses       6244     6227      -17     
- Partials      799     1089     +290     

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

liorokman and others added 28 commits May 31, 2024 15:10
* Adding extension server policy handling.

Signed-off-by: Lior Okman <[email protected]>

* added missing license header

Signed-off-by: Lior Okman <[email protected]>

* Make the linter happy

Signed-off-by: Lior Okman <[email protected]>

* Make spell-checking linter satisfied

Signed-off-by: Lior Okman <[email protected]>

* Added some clarifying comments, fixed watchable key deletion in the
runner

Signed-off-by: Lior Okman <[email protected]>

* Added tests

Signed-off-by: Lior Okman <[email protected]>

* Add tests

Signed-off-by: Lior Okman <[email protected]>

* Finishing the rebase to the latest main.

Signed-off-by: Lior Okman <[email protected]>

* Added an XDS level unit test.

Signed-off-by: Lior Okman <[email protected]>

* Made the GCI linter happy

Signed-off-by: Lior Okman <[email protected]>

* Some more unit tests.

Signed-off-by: Lior Okman <[email protected]>

* Resolved comments provided in the review.

Signed-off-by: Lior Okman <[email protected]>

* Regenerate deepcopies.

Signed-off-by: Lior Okman <[email protected]>

* Removed the logger from the Translator type.

Signed-off-by: Lior Okman <[email protected]>

* Only start the status updater for extension server policies if there is
an extension server configured.

Signed-off-by: Lior Okman <[email protected]>

* Changed the Translate function signature to return an error, and log any
returned errors in the runner.

Signed-off-by: Lior Okman <[email protected]>

---------

Signed-off-by: Lior Okman <[email protected]>
…ger gRPC server buffer (#3512)

Reduce the amount of memory used by the in-memory gRPC buffer to a
reasonable size.

Signed-off-by: Lior Okman <[email protected]>
* add more oidc configuration settings

Signed-off-by: huabing zhao <[email protected]>

* add more comments

Signed-off-by: huabing zhao <[email protected]>

* add more comments

Signed-off-by: huabing zhao <[email protected]>

* address comments

Signed-off-by: huabing zhao <[email protected]>

* minor wording

Signed-off-by: huabing zhao <[email protected]>

* change naming

Signed-off-by: huabing zhao <[email protected]>

* change naming

Signed-off-by: huabing zhao <[email protected]>

* fix gen check

Signed-off-by: huabing zhao <[email protected]>

* change naming

Signed-off-by: Huabing Zhao <[email protected]>

---------

Signed-off-by: huabing zhao <[email protected]>
Signed-off-by: Huabing Zhao <[email protected]>
* api: cookie based consistent hashing

Relates to #2624

Signed-off-by: Arko Dasgupta <[email protected]>

* tests

Signed-off-by: Arko Dasgupta <[email protected]>

* lint

Signed-off-by: Arko Dasgupta <[email protected]>

---------

Signed-off-by: Arko Dasgupta <[email protected]>
…3418)

* add generate API process with zh content update

Signed-off-by: Wilson Wu <[email protected]>

* keep all same as en

Signed-off-by: Wilson Wu <[email protected]>

* make all api gen work automatically

Signed-off-by: Wilson Wu <[email protected]>

* revert because ci not support sed

Signed-off-by: Wilson Wu <[email protected]>

* Fix all

Signed-off-by: Wilson Wu <[email protected]>

* add helm doc update for zh content

Signed-off-by: Wilson Wu <[email protected]>

* add comment for zh content update

Signed-off-by: Wilson Wu <[email protected]>

* up the zh api doc to date

Signed-off-by: Wilson Wu <[email protected]>

* sync latest update from #3492

Signed-off-by: Wilson Wu <[email protected]>

* update the latest api doc

Signed-off-by: Wilson Wu <[email protected]>

* fix broken link

Signed-off-by: Wilson Wu <[email protected]>

* fix typo

Signed-off-by: Wilson Wu <[email protected]>

* up api gen to date

Signed-off-by: Wilson Wu <[email protected]>

---------

Signed-off-by: Wilson Wu <[email protected]>
fix missing gen-check

Signed-off-by: shawnh2 <[email protected]>
add test to codecov ignore path

Signed-off-by: shawnh2 <[email protected]>
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.6 to 3.25.7.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@9fdb3e4...f079b84)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…ools/src/buf (#3517)

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

Bumps [github.com/bufbuild/buf](https://github.com/bufbuild/buf) from 1.32.1 to 1.32.2.
- [Release notes](https://github.com/bufbuild/buf/releases)
- [Changelog](https://github.com/bufbuild/buf/blob/main/CHANGELOG.md)
- [Commits](bufbuild/buf@v1.32.1...v1.32.2)

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

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [fortio.org/fortio](https://github.com/fortio/fortio) from 1.63.8 to 1.63.9.
- [Release notes](https://github.com/fortio/fortio/releases)
- [Commits](fortio/fortio@v1.63.8...v1.63.9)

---
updated-dependencies:
- dependency-name: fortio.org/fortio
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [docker/login-action](https://github.com/docker/login-action) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](docker/login-action@e92390c...0d4c9c5)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
implement additional OIDC configuration settings

Signed-off-by: Jesse Haka <[email protected]>
* ensure that whenver client backend mtls secrets are updated, the latest secrets are used

Signed-off-by: Alexander Volchok <[email protected]>

* updating

Signed-off-by: Alexander Volchok <[email protected]>

---------

Signed-off-by: Alexander Volchok <[email protected]>
#3524)

* Add the listener name to each filter chain.

Signed-off-by: Lior Okman <[email protected]>

* Update the egctl tests as well.

Signed-off-by: Lior Okman <[email protected]>

* Also add the filterchain name from TCPRoutes

Signed-off-by: Lior Okman <[email protected]>

---------

Signed-off-by: Lior Okman <[email protected]>
* Users prefer setting their own custom names for generated
k8s resources for the Envoy Proxy fleet instead of the autogenerated
resources
  * https://envoyproxy.slack.com/archives/C03E6NHLESV/p1717068088779319
  * knative-extensions/net-gateway-api#738
  * #2141

Signed-off-by: Arko Dasgupta <[email protected]>
…G control plane. (#3535)

* Enable the configuration of topologySpreadConstraints for the EnvoyProxy control plane.

* updating

Signed-off-by: Alexander Volchok <[email protected]>

---------

Signed-off-by: Alexander Volchok <[email protected]>
* implement backend

Signed-off-by: Guy Daich <[email protected]>

* fix code review comments

Signed-off-by: Guy Daich <[email protected]>

* code review fixes

Signed-off-by: Guy Daich <[email protected]>
* initial dashboard addon helm chart

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

* rename addon name and remove gateway-helm support

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

* remove /charts from .helmignore

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

* rename to gateway-addons-helm and keep one source of truth

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

* restore examples values and fix comments

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

* rewrite helm makefile

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

---------

Signed-off-by: shawnh2 <[email protected]>
* fix: ReplaceFullPath not working for root path (/)

Takes #2817 forward

Signed-off-by: Arko Dasgupta <[email protected]>
remove redundant make helm-package command

Signed-off-by: shawnh2 <[email protected]>
#3544)

chore: Remove namespace restriction for EnvoyProxy parametersRef resource
* fix doc broken links

Signed-off-by: Guy Daich <[email protected]>

* fix more links

Signed-off-by: Guy Daich <[email protected]>

---------

Signed-off-by: Guy Daich <[email protected]>
Update docs on gwapi support for backendref filters

Signed-off-by: Karol Szwaj <[email protected]>
* feat: support custom names for generated k8s resources

Relates to #3527

Signed-off-by: Arko Dasgupta <[email protected]>

* use labels instead of name and ns to get deployment and svc

Signed-off-by: Arko Dasgupta <[email protected]>
)

Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.21.0 to 0.22.0.
- [Release notes](https://github.com/aquasecurity/trivy-action/releases)
- [Commits](aquasecurity/trivy-action@fd25fed...595be6a)

---
updated-dependencies:
- dependency-name: aquasecurity/trivy-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
zirain and others added 29 commits July 19, 2024 10:39
validateEndpointSliceForReconcile should check reference from EnvoyProxy

Signed-off-by: zirain <[email protected]>
* add grafonnet lib and support for resources monitor dashboard

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

* update helm-generate to support grafonnet generate dashboards

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

* update doc

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

* fix doc-lint and osv-scan

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

* fix tools path

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

* resolve conflicts

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

* fix gen-check

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

* fix doc-lint

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

---------

Signed-off-by: shawnh2 <[email protected]>
Co-authored-by: Xunzhuo <[email protected]>
* This ensures the readinessProbe kicks in only after the container has
  started
* max startup time is 300s - 30 (failureThreshold) x 10 (periodSeconds).
After this the container is killed and the `restartPolicy` kicks in
https://kubernetes.io/docs/concepts/configuration/liveness-readiness-startup-probes/#startup-probe

Fixes: #3511

Signed-off-by: Arko Dasgupta <[email protected]>
* e2e: make sure OTel-collector is ready

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

* fix gen

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

* fix retry

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

* remove infrastructure.parametersRef from all-namespace

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

* update

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

* update

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

* lint

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

* fix bad request

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

* increase time of one cycle

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

---------

Signed-off-by: zirain <[email protected]>
add load balancing usage

Signed-off-by: shawnh2 <[email protected]>
Co-authored-by: Xunzhuo <[email protected]>
…ors without explicit targetRefs (#3904)

Fix the CEL definitions to allow policies that use target selectors
without explicit targetRefs

Signed-off-by: Lior Okman <[email protected]>
Add tlog.Logf() logger

Signed-off-by: Manoramsharma <[email protected]>
* e2e: refactor and improve lb test

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

* tlog

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

* update

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

* lint

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

* nit

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

---------

Signed-off-by: zirain <[email protected]>
* release v1.1.0

Signed-off-by: Guy Daich <[email protected]>

* update release notes with delta from v1.1.0-rc.1

Signed-off-by: Guy Daich <[email protected]>

* fix lint

Signed-off-by: Guy Daich <[email protected]>

---------

Signed-off-by: Guy Daich <[email protected]>
…to 0.20.1 (#3924)

build(deps): bump github.com/google/go-containerregistry

Bumps [github.com/google/go-containerregistry](https://github.com/google/go-containerregistry) from 0.19.2 to 0.20.1.
- [Release notes](https://github.com/google/go-containerregistry/releases)
- [Changelog](https://github.com/google/go-containerregistry/blob/main/.goreleaser.yml)
- [Commits](google/go-containerregistry@v0.19.2...v0.20.1)

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

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: zirain <[email protected]>
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.12 to 3.25.13.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@4fa2a79...2d79040)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Huabing Zhao <[email protected]>
)

Bumps [softprops/action-gh-release](https://github.com/softprops/action-gh-release) from 2.0.6 to 2.0.8.
- [Release notes](https://github.com/softprops/action-gh-release/releases)
- [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md)
- [Commits](softprops/action-gh-release@a74c6b7...c062e08)

---
updated-dependencies:
- dependency-name: softprops/action-gh-release
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Huabing Zhao <[email protected]>
Bumps [fortio.org/log](https://github.com/fortio/log) from 1.14.0 to 1.15.0.
- [Release notes](https://github.com/fortio/log/releases)
- [Commits](fortio/log@v1.14.0...v1.15.0)

---
updated-dependencies:
- dependency-name: fortio.org/log
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Xunzhuo <[email protected]>
…20240707233129-f5f02f5a807c to 0.95.1 (#3925)

build(deps): bump github.com/replicatedhq/troubleshoot

Bumps [github.com/replicatedhq/troubleshoot](https://github.com/replicatedhq/troubleshoot) from 0.95.1-0.20240707233129-f5f02f5a807c to 0.95.1.
- [Release notes](https://github.com/replicatedhq/troubleshoot/releases)
- [Commits](https://github.com/replicatedhq/troubleshoot/commits/v0.95.1)

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

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: zirain <[email protected]>
Co-authored-by: Huabing Zhao <[email protected]>
* utilize hugo boilerplates for docs

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

* fix doc-lint

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

* fix boilerplates link

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

---------

Signed-off-by: shawnh2 <[email protected]>
Co-authored-by: zirain <[email protected]>
* docs: add helm-version shortcode

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

* update v1.1 and release doc

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

* fix yaml-version

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

* lint

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

---------

Signed-off-by: zirain <[email protected]>
authorization api doc

Signed-off-by: Huabing Zhao <[email protected]>
* build(deps): bump the k8s-io group with 6 updates

Bumps the k8s-io group with 6 updates:

| Package | From | To |
| --- | --- | --- |
| [k8s.io/api](https://github.com/kubernetes/api) | `0.30.2` | `0.30.3` |
| [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) | `0.30.2` | `0.30.3` |
| [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) | `0.30.2` | `0.30.3` |
| [k8s.io/cli-runtime](https://github.com/kubernetes/cli-runtime) | `0.30.2` | `0.30.3` |
| [k8s.io/client-go](https://github.com/kubernetes/client-go) | `0.30.2` | `0.30.3` |
| [k8s.io/kubectl](https://github.com/kubernetes/kubectl) | `0.30.2` | `0.30.3` |


Updates `k8s.io/api` from 0.30.2 to 0.30.3
- [Commits](kubernetes/api@v0.30.2...v0.30.3)

Updates `k8s.io/apiextensions-apiserver` from 0.30.2 to 0.30.3
- [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases)
- [Commits](kubernetes/apiextensions-apiserver@v0.30.2...v0.30.3)

Updates `k8s.io/apimachinery` from 0.30.2 to 0.30.3
- [Commits](kubernetes/apimachinery@v0.30.2...v0.30.3)

Updates `k8s.io/cli-runtime` from 0.30.2 to 0.30.3
- [Commits](kubernetes/cli-runtime@v0.30.2...v0.30.3)

Updates `k8s.io/client-go` from 0.30.2 to 0.30.3
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](kubernetes/client-go@v0.30.2...v0.30.3)

Updates `k8s.io/kubectl` from 0.30.2 to 0.30.3
- [Commits](kubernetes/kubectl@v0.30.2...v0.30.3)

---
updated-dependencies:
- dependency-name: k8s.io/api
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
- dependency-name: k8s.io/apiextensions-apiserver
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
- dependency-name: k8s.io/apimachinery
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
- dependency-name: k8s.io/cli-runtime
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
- dependency-name: k8s.io/client-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
- dependency-name: k8s.io/kubectl
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
...

Signed-off-by: dependabot[bot] <[email protected]>

* fix gen

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

---------

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: zirain <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* add new types to the EnvoyFilter type validation rule

Signed-off-by: Huabing Zhao <[email protected]>

* clean up EnvoyFilter consts in the xds translator

Signed-off-by: Huabing Zhao <[email protected]>

* add missing envoy filter in the api doc

Signed-off-by: Huabing Zhao <[email protected]>

* fix typo

Signed-off-by: Huabing Zhao <[email protected]>

* fix v1.1 doc

Signed-off-by: Huabing Zhao <[email protected]>

---------

Signed-off-by: Huabing Zhao <[email protected]>
* printing name of the target when a policy fails to attach

Signed-off-by: Viktor Sadovnikov <[email protected]>

* printing name of the target when a policy fails to attach

Signed-off-by: Viktor Sadovnikov <[email protected]>

* printing name of the target when a policy fails to attach

Signed-off-by: Viktor Sadovnikov <[email protected]>

---------

Signed-off-by: Viktor Sadovnikov <[email protected]>
@pull pull bot merged commit 1a7d0c6 into zhaohuabing:main Jul 25, 2024
26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.