Skip to content

Commit ec1f357

Browse files
authored
Merge pull request #172 from swastik959/v1.14.5
Pulled changes for 1.14.5 from upstream
2 parents df950eb + 1a49306 commit ec1f357

51 files changed

Lines changed: 426 additions & 401 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Dockerfile.dapper

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN apt-get update && \
2323
rm -f /bin/sh && ln -s /bin/bash /bin/sh
2424
ENV GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm=armv6l GOLANG_ARCH_arm64=arm64 GOLANG_ARCH=GOLANG_ARCH_${ARCH} \
2525
GOPATH=/go PATH=/go/bin:/usr/local/go/bin:${PATH} SHELL=/bin/bash
26-
RUN wget -O - https://golang.org/dl/go1.26.1.linux-${!GOLANG_ARCH}.tar.gz | tar -xzf - -C /usr/local && \
26+
RUN wget -O - https://golang.org/dl/go1.25.6.linux-${!GOLANG_ARCH}.tar.gz | tar -xzf - -C /usr/local && \
2727
curl -sL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.41.0
2828
COPY --from=0 /usr/local/bin/docker /usr/bin/docker
2929
RUN mkdir -p /.docker/cli-plugins

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ the versions listed. Ingress-Nginx versions **may** work on older versions, but
4949

5050
| Supported | Ingress-NGINX version | k8s supported version | Alpine Version | Nginx Version | Helm Chart Version |
5151
| :-------: | --------------------- | ----------------------------- | -------------- | ------------- | ------------------ |
52+
| 🔄 | **v1.14.5** | 1.34, 1.33, 1.32, 1.31, 1.30 | 3.23.3 | 1.27.1 | 4.14.5 |
5253
| 🔄 | **v1.14.4** | 1.34, 1.33, 1.32, 1.31, 1.30 | 3.23.3 | 1.27.1 | 4.14.4 |
5354
| 🔄 | **v1.14.3** | 1.34, 1.33, 1.32, 1.31, 1.30 | 3.23.2 | 1.27.1 | 4.14.3 |
5455
| 🔄 | **v1.14.2** | 1.34, 1.33, 1.32, 1.31, 1.30 | 3.23.2 | 1.27.1 | 4.14.2 |

TAG

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.14.4
1+
v1.14.5

build/run-in-docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ function cleanup {
4141
}
4242
trap cleanup EXIT
4343

44-
E2E_IMAGE=${E2E_IMAGE:-registry.k8s.io/ingress-nginx/e2e-test-runner:v2.2.8@sha256:f1eadf65f9f9817430f25bcfbbc6fe7b96f5b9eeb2b454e8efd2e404b1613464}
44+
E2E_IMAGE=${E2E_IMAGE:-registry.k8s.io/ingress-nginx/e2e-test-runner:v2.2.9@sha256:6eda6a8d17ff65c5af647abb0714b882047b77d18161712d77daf5f610fd4020}
4545

4646
if [[ "$RUNTIME" == podman ]]; then
4747
# Podman does not support both tag and digest

changelog/controller-1.14.5.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Changelog
2+
3+
### controller-v1.14.5
4+
5+
Images:
6+
7+
* registry.k8s.io/ingress-nginx/controller:v1.14.5@sha256:af3312d040dbe8d503001a1094b248e8be372f70f317a4bc35f81fb312bff3a8
8+
* registry.k8s.io/ingress-nginx/controller-chroot:v1.14.5@sha256:4a91b68f45ace708d16193a1aa0e4860ee88c7f76b8be4144dd07d82aa9d2a13
9+
10+
### All changes:
11+
12+
* Images: Trigger controller build. (#14734)
13+
* Template: Remove path from comment. (#14730)
14+
* Images: Bump other images. (#14726)
15+
* Images: Trigger other builds (2/2). (#14722)
16+
* Images: Trigger other builds (1/2). (#14718)
17+
* Tests: Bump Test Runner to v2.2.9. (#14714)
18+
* Images: Trigger Test Runner build. (#14710)
19+
* Go: Update dependencies. (#14706)
20+
* CI: Update Kubernetes to v1.35.3. (#14702)
21+
* Images: Trigger NGINX build. (#14698)
22+
* Go: Update dependencies. (#14694)
23+
* CI: Update Helm to v4.1.3. (#14690)
24+
25+
### Dependency updates:
26+
27+
* Bump the actions group with 2 updates (#14686)
28+
* Bump the go group across 1 directory with 2 updates (#14683)
29+
30+
**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/controller-v1.14.4...controller-v1.14.5

charts/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ REPOSITORY ?= $(REGISTRY)/charts
1919

2020
.PHONY: helm
2121
helm:
22-
command -v helm || go install helm.sh/helm/v4/cmd/helm@v4.1.1
22+
command -v helm || go install helm.sh/helm/v4/cmd/helm@v4.1.3
2323

2424
.PHONY: package
2525
package: helm

charts/ingress-nginx/Chart.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
annotations:
22
artifacthub.io/changes: |
3-
- Update Ingress-Nginx version controller-v1.14.4
3+
- Update Ingress-Nginx version controller-v1.14.5
44
artifacthub.io/prerelease: "false"
55
apiVersion: v2
6-
appVersion: 1.14.4
6+
appVersion: 1.14.5
77
description: Ingress controller for Kubernetes using NGINX as a reverse proxy and
88
load balancer
99
home: https://github.com/kubernetes/ingress-nginx
@@ -20,4 +20,4 @@ maintainers:
2020
name: ingress-nginx
2121
sources:
2222
- https://github.com/kubernetes/ingress-nginx
23-
version: 4.14.4
23+
version: 4.14.5

charts/ingress-nginx/README.md

Lines changed: 6 additions & 6 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.14.4](https://img.shields.io/badge/Version-4.14.4-informational?style=flat-square) ![AppVersion: 1.14.4](https://img.shields.io/badge/AppVersion-1.14.4-informational?style=flat-square)
5+
![Version: 4.14.5](https://img.shields.io/badge/Version-4.14.5-informational?style=flat-square) ![AppVersion: 1.14.5](https://img.shields.io/badge/AppVersion-1.14.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

@@ -275,10 +275,10 @@ metadata:
275275
| controller.admissionWebhooks.namespaceSelector | object | `{}` | |
276276
| controller.admissionWebhooks.objectSelector | object | `{}` | |
277277
| controller.admissionWebhooks.patch.enabled | bool | `true` | |
278-
| controller.admissionWebhooks.patch.image.digest | string | `"sha256:d7e8257f8d8bce64b6df55f81fba92011a6a77269b3350f8b997b152af348dba"` | |
278+
| controller.admissionWebhooks.patch.image.digest | string | `"sha256:01038e7de14b78d702d2849c3aad72fd25903c4765af63cf16aa3398f5d5f2dd"` | |
279279
| controller.admissionWebhooks.patch.image.image | string | `"ingress-nginx/kube-webhook-certgen"` | |
280280
| controller.admissionWebhooks.patch.image.pullPolicy | string | `"IfNotPresent"` | |
281-
| controller.admissionWebhooks.patch.image.tag | string | `"v1.6.8"` | |
281+
| controller.admissionWebhooks.patch.image.tag | string | `"v1.6.9"` | |
282282
| controller.admissionWebhooks.patch.labels | object | `{}` | Labels to be added to patch job resources |
283283
| controller.admissionWebhooks.patch.networkPolicy.enabled | bool | `false` | Enable 'networkPolicy' or not |
284284
| controller.admissionWebhooks.patch.nodeSelector."kubernetes.io/os" | string | `"linux"` | |
@@ -349,16 +349,16 @@ metadata:
349349
| controller.hostname | object | `{}` | Optionally customize the pod hostname. |
350350
| controller.image.allowPrivilegeEscalation | bool | `false` | |
351351
| controller.image.chroot | bool | `false` | |
352-
| controller.image.digest | string | `"sha256:f8c7959ed0cc0c1dd6060f291fc50ccaf27a5497d182bbb6bc4ffed943616f23"` | |
353-
| controller.image.digestChroot | string | `"sha256:d03d78b6b3a1efa21e02d4d0e9771d07c3e8f0e4a97c5156b12f5c7bd1fc5460"` | |
352+
| controller.image.digest | string | `"sha256:af3312d040dbe8d503001a1094b248e8be372f70f317a4bc35f81fb312bff3a8"` | |
353+
| controller.image.digestChroot | string | `"sha256:4a91b68f45ace708d16193a1aa0e4860ee88c7f76b8be4144dd07d82aa9d2a13"` | |
354354
| controller.image.image | string | `"ingress-nginx/controller"` | |
355355
| controller.image.pullPolicy | string | `"IfNotPresent"` | |
356356
| controller.image.readOnlyRootFilesystem | bool | `false` | |
357357
| controller.image.runAsGroup | int | `82` | This value must not be changed using the official image. uid=101(www-data) gid=82(www-data) groups=82(www-data) |
358358
| controller.image.runAsNonRoot | bool | `true` | |
359359
| controller.image.runAsUser | int | `101` | This value must not be changed using the official image. uid=101(www-data) gid=82(www-data) groups=82(www-data) |
360360
| controller.image.seccompProfile.type | string | `"RuntimeDefault"` | |
361-
| controller.image.tag | string | `"v1.14.4"` | |
361+
| controller.image.tag | string | `"v1.14.5"` | |
362362
| 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 |
363363
| controller.ingressClassByName | bool | `false` | Process IngressClass per name (additionally as per spec.controller). |
364364
| controller.ingressClassResource | object | `{"aliases":[],"annotations":{},"controllerValue":"k8s.io/ingress-nginx","default":false,"enabled":true,"name":"nginx","parameters":{}}` | This section refers to the creation of the IngressClass resource. IngressClasses are immutable and cannot be changed after creation. We do not support namespaced IngressClasses, yet, so a ClusterRole and a ClusterRoleBinding is required. |
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Changelog
2+
3+
This file documents all notable changes to [ingress-nginx](https://github.com/kubernetes/ingress-nginx) Helm Chart. The release numbering uses [semantic versioning](http://semver.org).
4+
5+
### 4.14.5
6+
7+
* Update Ingress-Nginx version controller-v1.14.5
8+
9+
**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/helm-chart-4.14.4...helm-chart-4.14.5

charts/ingress-nginx/values.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ controller:
3030
## for backwards compatibility consider setting the full image url via the repository value below
3131
## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
3232
## repository:
33-
tag: "v1.14.4"
34-
digest: sha256:f8c7959ed0cc0c1dd6060f291fc50ccaf27a5497d182bbb6bc4ffed943616f23
35-
digestChroot: sha256:d03d78b6b3a1efa21e02d4d0e9771d07c3e8f0e4a97c5156b12f5c7bd1fc5460
33+
tag: "v1.14.5"
34+
digest: sha256:af3312d040dbe8d503001a1094b248e8be372f70f317a4bc35f81fb312bff3a8
35+
digestChroot: sha256:4a91b68f45ace708d16193a1aa0e4860ee88c7f76b8be4144dd07d82aa9d2a13
3636
pullPolicy: IfNotPresent
3737
runAsNonRoot: true
3838
# -- This value must not be changed using the official image.
@@ -853,8 +853,8 @@ controller:
853853
## for backwards compatibility consider setting the full image url via the repository value below
854854
## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
855855
## repository:
856-
tag: v1.6.8
857-
digest: sha256:d7e8257f8d8bce64b6df55f81fba92011a6a77269b3350f8b997b152af348dba
856+
tag: v1.6.9
857+
digest: sha256:01038e7de14b78d702d2849c3aad72fd25903c4765af63cf16aa3398f5d5f2dd
858858
pullPolicy: IfNotPresent
859859
# -- Provide a priority class name to the webhook patching job
860860
##

0 commit comments

Comments
 (0)