Skip to content
This repository was archived by the owner on Jan 29, 2025. It is now read-only.

Commit 3f69fe9

Browse files
strongjzstrongjz
authored
Merge branch 'main' into main
2 parents 6cfd223 + 8ad3ddc commit 3f69fe9

File tree

30 files changed

+208
-106
lines changed

30 files changed

+208
-106
lines changed

‎.github/workflows/depreview.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ jobs:
1111
- name: 'Checkout Repository'
1212
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1313
- name: 'Dependency Review'
14-
uses: actions/dependency-review-action@4081bf99e2866ebe428fc0477b69eb4fcda7220a # v4.4.0
14+
uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4.5.0

‎.github/workflows/plugin.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
if: ${{ ! startsWith(github.ref, 'refs/tags/') }}
3030
uses: goreleaser/goreleaser-action@9ed2f89a662bf1735a48bc8557fd212fa902bebf # v6.1.0
3131
with:
32-
version: latest
32+
version: "~> v2"
3333
args: release --snapshot --clean
3434
env:
3535
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -38,7 +38,7 @@ jobs:
3838
if: ${{ startsWith(github.ref, 'refs/tags/') }}
3939
uses: goreleaser/goreleaser-action@9ed2f89a662bf1735a48bc8557fd212fa902bebf # v6.1.0
4040
with:
41-
version: latest
41+
version: "~> v2"
4242
args: release --clean
4343
env:
4444
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/scorecards.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@ jobs:
5959

6060
# Upload the results to GitHub's code scanning dashboard.
6161
- name: "Upload to code-scanning"
62-
uses: github/codeql-action/upload-sarif@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
62+
uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
6363
with:
6464
sarif_file: results.sarif

‎.github/workflows/vulnerability-scans.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060

6161
- name: Scan image with AquaSec/Trivy
6262
id: scan
63-
uses: aquasecurity/trivy-action@915b19bbe73b92a6cf82a1bc12b087c9a19a5fe2 # v0.28.0
63+
uses: aquasecurity/trivy-action@18f2510ee396bbf400402947b394f2dd8c87dbb0 # v0.29.0
6464
with:
6565
image-ref: registry.k8s.io/ingress-nginx/controller:${{ matrix.versions }}
6666
format: 'sarif'
@@ -75,7 +75,7 @@ jobs:
7575

7676
# This step checks out a copy of your repository.
7777
- name: Upload SARIF file
78-
uses: github/codeql-action/upload-sarif@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
78+
uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
7979
with:
8080
token: ${{ github.token }}
8181
# Path to SARIF file relative to the root of the repository

‎build/run-in-docker.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ if [[ "$DOCKER_IN_DOCKER_ENABLED" == "true" ]]; then
8282
echo "..reached DIND check TRUE block, inside run-in-docker.sh"
8383
echo "FLAGS=$FLAGS"
8484
#go env
85-
go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo@v2.21.0
85+
go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo@v2.22.0
8686
find / -type f -name ginkgo 2>/dev/null
8787
which ginkgo
8888
/bin/bash -c "${FLAGS}"

‎docs/user-guide/nginx-configuration/annotations-risk.md

+1
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
| Proxy | proxy-buffer-size | Low | location |
7474
| Proxy | proxy-buffering | Low | location |
7575
| Proxy | proxy-buffers-number | Low | location |
76+
| Proxy | proxy-busy-buffers-size | Low | location |
7677
| Proxy | proxy-connect-timeout | Low | location |
7778
| Proxy | proxy-cookie-domain | Medium | location |
7879
| Proxy | proxy-cookie-path | Medium | location |

‎docs/user-guide/nginx-configuration/annotations.md

+13
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ You can add these Kubernetes annotations to specific Ingress objects to customiz
116116
|[nginx.ingress.kubernetes.io/proxy-buffering](#proxy-buffering)|string|
117117
|[nginx.ingress.kubernetes.io/proxy-buffers-number](#proxy-buffers-number)|number|
118118
|[nginx.ingress.kubernetes.io/proxy-buffer-size](#proxy-buffer-size)|string|
119+
|[nginx.ingress.kubernetes.io/proxy-busy-buffers-size](#proxy-busy-buffers-size)|string|
119120
|[nginx.ingress.kubernetes.io/proxy-max-temp-file-size](#proxy-max-temp-file-size)|string|
120121
|[nginx.ingress.kubernetes.io/ssl-ciphers](#ssl-ciphers)|string|
121122
|[nginx.ingress.kubernetes.io/ssl-prefer-server-ciphers](#ssl-ciphers)|"true" or "false"|
@@ -742,6 +743,18 @@ To configure this setting globally, set `proxy-buffer-size` in [NGINX ConfigMap]
742743
nginx.ingress.kubernetes.io/proxy-buffer-size: "8k"
743744
```
744745

746+
### Proxy busy buffers size
747+
748+
[Limits the total size of buffers that can be busy](https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_busy_buffers_size) sending a response to the client while the response is not yet fully read.
749+
750+
By default proxy busy buffers size is set as "8k".
751+
752+
To configure this setting globally, set `proxy-busy-buffers-size` in the [ConfigMap](./configmap.md#proxy-busy-buffers-size). To use custom values in an Ingress rule, define this annotation:
753+
754+
```yaml
755+
nginx.ingress.kubernetes.io/proxy-busy-buffers-size: "16k"
756+
```
757+
745758
### Proxy max temp file size
746759

747760
When [`buffering`](https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_buffering) of responses from the proxied server is enabled, and the whole response does not fit into the buffers set by the [`proxy_buffer_size`](https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_buffer_size) and [`proxy_buffers`](https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_buffers) directives, a part of the response can be saved to a temporary file. This directive sets the maximum `size` of the temporary file setting the [`proxy_max_temp_file_size`](https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_max_temp_file_size). The size of data written to the temporary file at a time is set by the [`proxy_temp_file_write_size`](https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_temp_file_write_size) directive.

‎docs/user-guide/nginx-configuration/configmap.md

+5
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ The following table shows a configuration option's name, type, and the default v
179179
| [proxy-send-timeout](#proxy-send-timeout) | int | 60 | |
180180
| [proxy-buffers-number](#proxy-buffers-number) | int | 4 | |
181181
| [proxy-buffer-size](#proxy-buffer-size) | string | "4k" | |
182+
| [proxy-busy-buffers-size](#proxy-busy-buffers-size) | string | "8k" | |
182183
| [proxy-cookie-path](#proxy-cookie-path) | string | "off" | |
183184
| [proxy-cookie-domain](#proxy-cookie-domain) | string | "off" | |
184185
| [proxy-next-upstream](#proxy-next-upstream) | string | "error timeout" | |
@@ -1109,6 +1110,10 @@ Sets the number of the buffer used for [reading the first part of the response](
11091110

11101111
Sets the size of the buffer used for [reading the first part of the response](https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_buffer_size) received from the proxied server. This part usually contains a small response header.
11111112

1113+
## proxy-busy-buffers-size
1114+
1115+
[Limits the total size of buffers that can be busy](https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_busy_buffers_size) sending a response to the client while the response is not yet fully read.
1116+
11121117
## proxy-cookie-path
11131118

11141119
Sets a text that [should be changed in the path attribute](https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_cookie_path) of the “Set-Cookie” header fields of a proxied server response.

‎go.mod

+21-21
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,34 @@ require (
1414
github.com/mitchellh/mapstructure v1.5.0
1515
github.com/moul/pb v0.0.0-20220425114252-bca18df4138c
1616
github.com/ncabatoff/process-exporter v0.8.4
17-
github.com/onsi/ginkgo/v2 v2.21.0
17+
github.com/onsi/ginkgo/v2 v2.22.0
1818
github.com/opencontainers/runc v1.2.2
1919
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
2020
github.com/prometheus/client_golang v1.20.5
2121
github.com/prometheus/client_model v0.6.1
22-
github.com/prometheus/common v0.60.1
22+
github.com/prometheus/common v0.61.0
2323
github.com/spf13/cobra v1.8.1
2424
github.com/spf13/pflag v1.0.5
25-
github.com/stretchr/testify v1.9.0
25+
github.com/stretchr/testify v1.10.0
2626
github.com/yudai/gojsondiff v1.0.0
2727
github.com/zakjan/cert-chain-resolver v0.0.0-20221221105603-fcedb00c5b30
28-
golang.org/x/crypto v0.29.0
28+
golang.org/x/crypto v0.31.0
2929
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
30-
google.golang.org/grpc v1.68.0
30+
google.golang.org/grpc v1.68.1
3131
google.golang.org/grpc/examples v0.0.0-20240223204917-5ccf176a08ab
3232
gopkg.in/go-playground/pool.v3 v3.1.1
3333
gopkg.in/mcuadros/go-syslog.v2 v2.3.0
34-
k8s.io/api v0.31.2
35-
k8s.io/apiextensions-apiserver v0.31.2
36-
k8s.io/apimachinery v0.31.2
37-
k8s.io/apiserver v0.31.2
38-
k8s.io/cli-runtime v0.31.2
39-
k8s.io/client-go v0.31.2
40-
k8s.io/code-generator v0.31.2
41-
k8s.io/component-base v0.31.2
34+
k8s.io/api v0.31.3
35+
k8s.io/apiextensions-apiserver v0.31.3
36+
k8s.io/apimachinery v0.31.3
37+
k8s.io/apiserver v0.31.3
38+
k8s.io/cli-runtime v0.31.3
39+
k8s.io/client-go v0.31.3
40+
k8s.io/code-generator v0.31.3
41+
k8s.io/component-base v0.31.3
4242
k8s.io/klog/v2 v2.130.1
4343
pault.ag/go/sniff v0.0.0-20200207005214-cf7e4d167732
44-
sigs.k8s.io/controller-runtime v0.19.1
44+
sigs.k8s.io/controller-runtime v0.19.3
4545
sigs.k8s.io/mdtoc v1.4.0
4646
)
4747

@@ -116,16 +116,16 @@ require (
116116
go.starlark.net v0.0.0-20240123142251-f86470692795 // indirect
117117
go.uber.org/zap v1.27.0 // indirect
118118
golang.org/x/mod v0.21.0 // indirect
119-
golang.org/x/net v0.30.0 // indirect
120-
golang.org/x/oauth2 v0.23.0 // indirect
121-
golang.org/x/sync v0.9.0 // indirect
122-
golang.org/x/sys v0.27.0 // indirect
123-
golang.org/x/term v0.26.0 // indirect
124-
golang.org/x/text v0.20.0 // indirect
119+
golang.org/x/net v0.32.0 // indirect
120+
golang.org/x/oauth2 v0.24.0 // indirect
121+
golang.org/x/sync v0.10.0 // indirect
122+
golang.org/x/sys v0.28.0 // indirect
123+
golang.org/x/term v0.27.0 // indirect
124+
golang.org/x/text v0.21.0 // indirect
125125
golang.org/x/time v0.5.0 // indirect
126126
golang.org/x/tools v0.26.0 // indirect
127127
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
128-
google.golang.org/protobuf v1.34.2 // indirect
128+
google.golang.org/protobuf v1.35.2 // indirect
129129
gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
130130
gopkg.in/inf.v0 v0.9.1 // indirect
131131
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)