Skip to content

Commit c525936

Browse files
izanami-01izanami-01
committed
Merge branch 'kubernetes:main' into fix-non-tls-ingress
2 parents e0ee1c1 + be46124 commit c525936

34 files changed

+576
-780
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ kubectl exec -it $POD_NAME -n $POD_NAMESPACE -- /nginx-ingress-controller --vers
6060

6161
- **How was the ingress-nginx-controller installed**:
6262
- If helm was used then please show output of `helm ls -A | grep -i ingress`
63-
- If helm was used then please show output of `helm -n <ingresscontrollernamepspace> get values <helmreleasename>`
63+
- If helm was used then please show output of `helm -n <ingresscontrollernamespace> get values <helmreleasename>`
6464
- If helm was not used, then copy/paste the complete precise command used to install the controller, along with the flags and options used
6565
- if you have more than one instance of the ingress-nginx-controller installed in the same cluster, please provide details for all the instances
6666

@@ -71,7 +71,7 @@ kubectl exec -it $POD_NAME -n $POD_NAMESPACE -- /nginx-ingress-controller --vers
7171
- `kubectl -n <ingresscontrollernamespace> describe svc <ingresscontrollerservicename>`
7272

7373
- **Current state of ingress object, if applicable**:
74-
- `kubectl -n <appnnamespace> get all,ing -o wide`
74+
- `kubectl -n <appnamespace> get all,ing -o wide`
7575
- `kubectl -n <appnamespace> describe ing <ingressname>`
7676
- If applicable, then, your complete and exact curl/grpcurl command (redacted if required) and the reponse to the curl/grpcurl command with the -v flag
7777

‎.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ jobs:
403403
output: 'trivy-results.sarif'
404404
- name: Upload Trivy scan results to GitHub Security tab
405405
if: ${{ steps.filter-images.outputs.nginx-base == 'true' && always() }}
406-
uses: github/codeql-action/upload-sarif@v2
406+
uses: github/codeql-action/upload-sarif@v3
407407
with:
408408
sarif_file: 'trivy-results.sarif'
409409

‎.github/workflows/plugin.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
name: kubectl plugin
22

33
on:
4-
push:
5-
branches:
6-
- "main"
7-
tags:
8-
- 'v*.*.*\+plugin'
4+
release:
5+
types: [published]
96

107
permissions:
118
contents: write # for goreleaser/goreleaser-action

‎.github/workflows/scorecards.yml

Lines changed: 1 addition & 1 deletion
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@896079047b4bb059ba6f150a5d87d47dde99e6e5 # v2.1.37
62+
uses: github/codeql-action/upload-sarif@03e7845b7bfcd5e7fb63d1ae8c61b0e791134fab # v2.1.37
6363
with:
6464
sarif_file: results.sarif

‎.github/workflows/stale.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
pull-requests: write
1414

1515
steps:
16-
- uses: actions/stale@1160a2240286f5da8ec72b1c0816ce2481aabf84 # v8.0.0
16+
- uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9.0.0
1717
with:
1818
stale-issue-message: "This is stale, but we won't close it automatically, just bare in mind the maintainers may be busy with other tasks and will reach your issue ASAP. If you have any question or request to prioritize this, please reach `#ingress-nginx-dev` on Kubernetes Slack."
1919
stale-pr-message: "This is stale, but we won't close it automatically, just bare in mind the maintainers may be busy with other tasks and will reach your issue ASAP. If you have any question or request to prioritize this, please reach `#ingress-nginx-dev` on Kubernetes Slack."

‎.github/workflows/vulnerability-scans.yaml

Lines changed: 1 addition & 1 deletion
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@896079047b4bb059ba6f150a5d87d47dde99e6e5 # v2.1.37
78+
uses: github/codeql-action/upload-sarif@03e7845b7bfcd5e7fb63d1ae8c61b0e791134fab # v2.1.37
7979
with:
8080
token: ${{ github.token }}
8181
# Path to SARIF file relative to the root of the repository

‎README.md

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,16 @@ the versions listed. Ingress-Nginx versions **may** work on older versions, but
3838

3939
| Supported | Ingress-NGINX version | k8s supported version | Alpine Version | Nginx Version | Helm Chart Version |
4040
|:--:|-----------------------|------------------------------|----------------|---------------|------------------------------|
41-
| 🔄 | **v1.9.4** | 1.28, 1.27,1.26, 1.25 | 3.18.4 | 1.21.6 | 4.8.3* |
42-
| 🔄 | **v1.9.3** | 1.28, 1.27,1.26, 1.25 | 3.18.4 | 1.21.6 | 4.8.* |
43-
| 🔄 | **v1.9.1** | 1.28, 1.27,1.26, 1.25 | 3.18.4 | 1.21.6 | 4.8.* |
44-
| 🔄 | **v1.9.0** | 1.28, 1.27,1.26, 1.25 | 3.18.2 | 1.21.6 | 4.8.* |
45-
| 🔄 | **v1.8.4** | 1.27,1.26, 1.25, 1.24 | 3.18.2 | 1.21.6 | 4.7.* |
46-
| 🔄 | **v1.8.2** | 1.27,1.26, 1.25, 1.24 | 3.18.2 | 1.21.6 | 4.7.* |
47-
| 🔄 | **v1.8.1** | 1.27,1.26, 1.25, 1.24 | 3.18.2 | 1.21.6 | 4.7.* |
48-
| 🔄 | **v1.8.0** | 1.27,1.26, 1.25, 1.24 | 3.18.0 | 1.21.6 | 4.7.* |
49-
| 🔄 | **v1.7.1** | 1.27,1.26, 1.25, 1.24 | 3.17.2 | 1.21.6 | 4.6.* |
41+
| 🔄 | **v1.9.5** | 1.28, 1.27, 1.26, 1.25 | 3.18.4 | 1.21.6 | 4.9.0* |
42+
| 🔄 | **v1.9.4** | 1.28, 1.27, 1.26, 1.25 | 3.18.4 | 1.21.6 | 4.8.3 |
43+
| 🔄 | **v1.9.3** | 1.28, 1.27, 1.26, 1.25 | 3.18.4 | 1.21.6 | 4.8.* |
44+
| 🔄 | **v1.9.1** | 1.28, 1.27, 1.26, 1.25 | 3.18.4 | 1.21.6 | 4.8.* |
45+
| 🔄 | **v1.9.0** | 1.28, 1.27, 1.26, 1.25 | 3.18.2 | 1.21.6 | 4.8.* |
46+
| 🔄 | **v1.8.4** | 1.27, 1.26, 1.25, 1.24 | 3.18.2 | 1.21.6 | 4.7.* |
47+
| 🔄 | **v1.8.2** | 1.27, 1.26, 1.25, 1.24 | 3.18.2 | 1.21.6 | 4.7.* |
48+
| 🔄 | **v1.8.1** | 1.27, 1.26, 1.25, 1.24 | 3.18.2 | 1.21.6 | 4.7.* |
49+
| 🔄 | **v1.8.0** | 1.27, 1.26, 1.25, 1.24 | 3.18.0 | 1.21.6 | 4.7.* |
50+
| 🔄 | **v1.7.1** | 1.27, 1.26, 1.25, 1.24 | 3.17.2 | 1.21.6 | 4.6.* |
5051
| 🔄 | **v1.7.0** | 1.26, 1.25, 1.24 | 3.17.2 | 1.21.6 | 4.6.* |
5152
| | v1.6.4 | 1.26, 1.25, 1.24, 1.23 | 3.17.0 | 1.21.6 | 4.5.* |
5253
| | v1.5.1 | 1.25, 1.24, 1.23 | 3.16.2 | 1.21.6 | 4.4.* |

‎changelog/controller-1.9.5.md

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Changelog
2+
3+
### controller-v1.9.5
4+
5+
Images:
6+
7+
* registry.k8s.io/ingress-nginx/controller:v1.9.5@sha256:b3aba22b1da80e7acfc52b115cae1d4c687172cbf2b742d5b502419c25ff340e
8+
* registry.k8s.io/ingress-nginx/controller-chroot:v1.9.5@sha256:9a8d7b25a846a6461cd044b9aea9cf6cad972bcf2e64d9fd246c0279979aad2d
9+
10+
### All changes:
11+
12+
* update nginx build (#10781)
13+
* update images from golang upgrade (#10762)
14+
* fix: remove tcpproxy copy error handling (#10715)
15+
* Ignore fake certificate for NGINXCertificateExpiry (#10694)
16+
* Comment NGINXCertificateExpiry alert label matcher (#10692)
17+
* chart: allow setting allocateLoadBalancerNodePorts (#10693)
18+
* [release-1.9] feat(helm): add documentation about metric args (#10695)
19+
* chore(dep): change lua-resty-cookie's repo (#10691)
20+
* annotation validation - extended URLWithNginxVariableRegex from alphaNumericChars to extendedAlphaNumeric (#10656)
21+
* fix: adjust unfulfillable validation check for session-cookie-samesite annotation (#10604)
22+
* fix: Validate x-forwarded-prefix annotation with RegexPathWithCapture (#10603)
23+
* Increase HSTS max-age to default to one year (#10580)
24+
* [release-1.9] update nginx base, httpbun, e2e, helm webhook cert gen (#10507)
25+
* [release-1.9] add upstream patch for CVE-2023-44487 (#10499)
26+
* fix brotli build issues (#10468)
27+
* upgrade owasp modsecurity core rule set to v3.3.5 (#10437)
28+
* Accept backend protocol on any case (#10461)
29+
* Chart: Rework network policies. (#10438)
30+
* Rework mage (#10418)
31+
32+
### Dependency updates:
33+
34+
* Bump x/net (#10517)
35+
* Bump google.golang.org/grpc from 1.58.0 to 1.58.1 (#10436)
36+
37+
**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/controller-v1.9.4...controller-v1.9.5

‎charts/ingress-nginx/Chart.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
annotations:
22
artifacthub.io/changes: |-
3-
- "Update Ingress-Nginx version controller-v1.9.4"
3+
- "Add controller.metrics.serviceMonitor.annotations in Helm chart"
4+
- "fix(labels): use complete labels variable on default-backend deployment"
5+
- "chart: allow setting allocateLoadBalancerNodePorts (#10693)"
6+
- "[release-1.9] feat(helm): add documentation about metric args (#10695)"
7+
- "Update Ingress-Nginx version controller-v1.9.5"
48
artifacthub.io/prerelease: "false"
59
apiVersion: v2
6-
appVersion: 1.9.4
10+
appVersion: 1.9.5
711
description: Ingress controller for Kubernetes using NGINX as a reverse proxy and
812
load balancer
913
home: https://github.com/kubernetes/ingress-nginx
@@ -19,4 +23,4 @@ maintainers:
1923
name: ingress-nginx
2024
sources:
2125
- https://github.com/kubernetes/ingress-nginx
22-
version: 4.8.4
26+
version: 4.9.0

‎charts/ingress-nginx/README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[ingress-nginx](https://github.com/kubernetes/ingress-nginx) Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer
44

5-
![Version: 4.8.4](https://img.shields.io/badge/Version-4.8.4-informational?style=flat-square) ![AppVersion: 1.9.4](https://img.shields.io/badge/AppVersion-1.9.4-informational?style=flat-square)
5+
![Version: 4.9.0](https://img.shields.io/badge/Version-4.9.0-informational?style=flat-square) ![AppVersion: 1.9.5](https://img.shields.io/badge/AppVersion-1.9.5-informational?style=flat-square)
66

77
To use, add `ingressClassName: nginx` spec field or the `kubernetes.io/ingress.class: nginx` annotation to your Ingress resources.
88

@@ -317,16 +317,16 @@ As of version `1.26.0` of this chart, by simply not providing any clusterIP valu
317317
| controller.hostname | object | `{}` | Optionally customize the pod hostname. |
318318
| controller.image.allowPrivilegeEscalation | bool | `false` | |
319319
| controller.image.chroot | bool | `false` | |
320-
| controller.image.digest | string | `"sha256:5b161f051d017e55d358435f295f5e9a297e66158f136321d9b04520ec6c48a3"` | |
321-
| controller.image.digestChroot | string | `"sha256:5976b1067cfbca8a21d0ba53d71f83543a73316a61ea7f7e436d6cf84ddf9b26"` | |
320+
| controller.image.digest | string | `"sha256:b3aba22b1da80e7acfc52b115cae1d4c687172cbf2b742d5b502419c25ff340e"` | |
321+
| controller.image.digestChroot | string | `"sha256:9a8d7b25a846a6461cd044b9aea9cf6cad972bcf2e64d9fd246c0279979aad2d"` | |
322322
| controller.image.image | string | `"ingress-nginx/controller"` | |
323323
| controller.image.pullPolicy | string | `"IfNotPresent"` | |
324324
| controller.image.readOnlyRootFilesystem | bool | `false` | |
325325
| controller.image.registry | string | `"registry.k8s.io"` | |
326326
| controller.image.runAsNonRoot | bool | `true` | |
327327
| controller.image.runAsUser | int | `101` | |
328328
| controller.image.seccompProfile.type | string | `"RuntimeDefault"` | |
329-
| controller.image.tag | string | `"v1.9.4"` | |
329+
| controller.image.tag | string | `"v1.9.5"` | |
330330
| controller.ingressClass | string | `"nginx"` | For backwards compatibility with ingress.class annotation, use ingressClass. Algorithm is as follows, first ingressClassName is considered, if not present, controller looks for ingress.class annotation |
331331
| controller.ingressClassByName | bool | `false` | Process IngressClass per name (additionally as per spec.controller). |
332332
| controller.ingressClassResource.controllerValue | string | `"k8s.io/ingress-nginx"` | Controller-value of the controller that is processing this ingressClass |
@@ -369,6 +369,7 @@ As of version `1.26.0` of this chart, by simply not providing any clusterIP valu
369369
| controller.metrics.service.servicePort | int | `10254` | |
370370
| controller.metrics.service.type | string | `"ClusterIP"` | |
371371
| controller.metrics.serviceMonitor.additionalLabels | object | `{}` | |
372+
| controller.metrics.serviceMonitor.annotations | object | `{}` | |
372373
| controller.metrics.serviceMonitor.enabled | bool | `false` | |
373374
| controller.metrics.serviceMonitor.metricRelabelings | list | `[]` | |
374375
| controller.metrics.serviceMonitor.namespace | string | `""` | |

0 commit comments

Comments
 (0)