Skip to content

Commit 77643ce

Browse files
adrianmoiseyadrianmoisey
authored
Merge branch 'main' into handle_path_types
2 parents 07eb1e0 + 57b4a14 commit 77643ce

File tree

32 files changed

+198
-159
lines changed

32 files changed

+198
-159
lines changed

‎.github/ISSUE_TEMPLATE/cve_report.md

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ title: ''
55
labels: kind/bug
66
assignees:
77
- Gacko
8-
- rikatz
98
- strongjz
109
---
1110

‎.github/workflows/ci.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102

103103
- name: Set up Go
104104
id: go
105-
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
105+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
106106
with:
107107
go-version: ${{ env.GOLANG_VERSION }}
108108
check-latest: true
@@ -124,7 +124,7 @@ jobs:
124124
run: echo "GOLANG_VERSION=$(cat GOLANG_VERSION)" >> $GITHUB_ENV
125125
- name: Set up Go
126126
id: go
127-
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
127+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
128128
with:
129129
go-version: ${{ env.GOLANG_VERSION }}
130130
check-latest: true
@@ -153,7 +153,7 @@ jobs:
153153
154154
- name: Set up Go
155155
id: go
156-
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
156+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
157157
with:
158158
go-version: ${{ steps.golangversion.outputs.version }}
159159
check-latest: true
@@ -163,7 +163,7 @@ jobs:
163163

164164
- name: Set up Docker Buildx
165165
id: buildx
166-
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
166+
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
167167
with:
168168
version: latest
169169

‎.github/workflows/golangci-lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
- name: Set up Go
2424
id: go
25-
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
25+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
2626
with:
2727
go-version: ${{ env.GOLANG_VERSION }}
2828
check-latest: true

‎.github/workflows/images.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ jobs:
145145

146146
- name: Set up Go
147147
id: go
148-
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
148+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
149149
with:
150150
go-version: ${{ env.GOLANG_VERSION }}
151151
check-latest: true
@@ -177,7 +177,7 @@ jobs:
177177
uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
178178
- name: Set up Docker Buildx
179179
id: buildx
180-
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
180+
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
181181
with:
182182
version: latest
183183
platforms: ${{ env.PLATFORMS }}

‎.github/workflows/plugin.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
run: echo "GOLANG_VERSION=$(cat GOLANG_VERSION)" >> $GITHUB_ENV
2121

2222
- name: Set up Go
23-
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
23+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
2424
with:
2525
go-version: ${{ env.GOLANG_VERSION }}
2626
check-latest: true
@@ -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@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
62+
uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
6363
with:
6464
sarif_file: results.sarif

‎.github/workflows/vulnerability-scans.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -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@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
78+
uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
7979
with:
8080
token: ${{ github.token }}
8181
# Path to SARIF file relative to the root of the repository

‎GOLANG_VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.23.3
1+
1.23.4

‎OWNERS

+1
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ emeritus_approvers:
1010
- aledbf # 2020-04-02
1111
- bowei # 2022-10-12
1212
- ElvinEfendi # 2023-04-23
13+
- rikatz # 2024-12-15

‎OWNERS_ALIASES

-3
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,19 @@ aliases:
88

99
ingress-nginx-admins:
1010
- Gacko
11-
- rikatz
1211
- strongjz
1312

1413
ingress-nginx-maintainers:
1514
- cpanato
1615
- Gacko
1716
- puerco
18-
- rikatz
1917
- strongjz
2018
- tao12345666333
2119

2220
ingress-nginx-reviewers:
2321
- cpanato
2422
- Gacko
2523
- puerco
26-
- rikatz
2724
- strongjz
2825
- tao12345666333
2926

‎SECURITY_CONTACTS

-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,4 @@
1010
# DO NOT REPORT SECURITY VULNERABILITIES DIRECTLY TO THESE NAMES, FOLLOW THE
1111
# INSTRUCTIONS AT https://kubernetes.io/security/
1212
Gacko
13-
rikatz
1413
strongjz

‎charts/ingress-nginx/Chart.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ maintainers:
1616
- name: cpanato
1717
- name: Gacko
1818
- name: puerco
19-
- name: rikatz
2019
- name: strongjz
2120
- name: tao12345666333
2221
name: ingress-nginx

‎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

+23-25
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module k8s.io/ingress-nginx
22

3-
go 1.23.3
3+
go 1.23.4
44

55
require (
66
dario.cat/mergo v1.0.1
@@ -15,33 +15,33 @@ require (
1515
github.com/moul/pb v0.0.0-20220425114252-bca18df4138c
1616
github.com/ncabatoff/process-exporter v0.8.4
1717
github.com/onsi/ginkgo/v2 v2.22.0
18-
github.com/opencontainers/runc v1.2.2
18+
github.com/opencontainers/runc v1.2.3
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
2525
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.3
34+
k8s.io/api v0.32.0
3535
k8s.io/apiextensions-apiserver v0.31.3
36-
k8s.io/apimachinery v0.31.3
36+
k8s.io/apimachinery v0.32.0
3737
k8s.io/apiserver v0.31.3
3838
k8s.io/cli-runtime v0.31.3
39-
k8s.io/client-go v0.31.3
39+
k8s.io/client-go v0.32.0
4040
k8s.io/code-generator v0.31.3
4141
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.2
44+
sigs.k8s.io/controller-runtime v0.19.3
4545
sigs.k8s.io/mdtoc v1.4.0
4646
)
4747

@@ -63,7 +63,7 @@ require (
6363
github.com/blang/semver/v4 v4.0.0 // indirect
6464
github.com/cespare/xxhash/v2 v2.3.0 // indirect
6565
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
66-
github.com/cyphar/filepath-securejoin v0.3.4 // indirect
66+
github.com/cyphar/filepath-securejoin v0.3.5 // indirect
6767
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
6868
github.com/eapache/queue v1.1.0 // indirect
6969
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
@@ -77,7 +77,6 @@ require (
7777
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
7878
github.com/godbus/dbus/v5 v5.1.0 // indirect
7979
github.com/gogo/protobuf v1.3.2 // indirect
80-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
8180
github.com/golang/protobuf v1.5.4 // indirect
8281
github.com/gomarkdown/markdown v0.0.0-20240328165702-4d01890c35c0 // indirect
8382
github.com/google/btree v1.1.2 // indirect
@@ -88,7 +87,6 @@ require (
8887
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
8988
github.com/google/uuid v1.6.0 // indirect
9089
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
91-
github.com/imdario/mergo v0.3.16 // indirect
9290
github.com/inconshreveable/mousetrap v1.1.0 // indirect
9391
github.com/josharian/intern v1.0.0 // indirect
9492
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
@@ -116,26 +114,26 @@ require (
116114
go.starlark.net v0.0.0-20240123142251-f86470692795 // indirect
117115
go.uber.org/zap v1.27.0 // indirect
118116
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
125-
golang.org/x/time v0.5.0 // indirect
117+
golang.org/x/net v0.32.0 // indirect
118+
golang.org/x/oauth2 v0.24.0 // indirect
119+
golang.org/x/sync v0.10.0 // indirect
120+
golang.org/x/sys v0.28.0 // indirect
121+
golang.org/x/term v0.27.0 // indirect
122+
golang.org/x/text v0.21.0 // indirect
123+
golang.org/x/time v0.7.0 // indirect
126124
golang.org/x/tools v0.26.0 // indirect
127125
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
128-
google.golang.org/protobuf v1.34.2 // indirect
126+
google.golang.org/protobuf v1.35.2 // indirect
129127
gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
130128
gopkg.in/inf.v0 v0.9.1 // indirect
131129
gopkg.in/yaml.v2 v2.4.0 // indirect
132130
gopkg.in/yaml.v3 v3.0.1 // indirect
133-
k8s.io/gengo/v2 v2.0.0-20240404160639-a0386bf69313 // indirect
134-
k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f // indirect
135-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
136-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
131+
k8s.io/gengo/v2 v2.0.0-20240826214909-a7b603a56eb7 // indirect
132+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
133+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
134+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
137135
sigs.k8s.io/kustomize/api v0.17.2 // indirect
138136
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
139-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
137+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
140138
sigs.k8s.io/yaml v1.4.0 // indirect
141139
)

0 commit comments

Comments
 (0)