Skip to content

Commit 9ec9b3a

Browse files
authored
[ingress-nginx] upgrade to 1.12.0 (#11846)
1 parent 0222a2a commit 9ec9b3a

File tree

5 files changed

+14
-10
lines changed

5 files changed

+14
-10
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Note: Upstart/SysV init based OS types are not supported.
112112
- Application
113113
- [cert-manager](https://github.com/jetstack/cert-manager) v1.15.3
114114
- [coredns](https://github.com/coredns/coredns) v1.11.3
115-
- [ingress-nginx](https://github.com/kubernetes/ingress-nginx) v1.11.2
115+
- [ingress-nginx](https://github.com/kubernetes/ingress-nginx) v1.12.0
116116
- [krew](https://github.com/kubernetes-sigs/krew) v0.4.4
117117
- [argocd](https://argoproj.github.io/) v2.11.0
118118
- [helm](https://helm.sh/) v3.16.4

docs/ingress/ingress_nginx.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ kubectl create clusterrolebinding cluster-admin-binding \
3535
The following **Mandatory Command** is required for all deployments except for AWS. See below for the AWS version.
3636

3737
```console
38-
kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.11.2/deploy/static/provider/cloud/deploy.yaml
38+
kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.12.0/deploy/static/provider/cloud/deploy.yaml
3939
```
4040

4141
### Provider Specific Steps

roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/admission-webhook-configuration.yml.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ webhooks:
1313
name: ingress-nginx-controller-admission
1414
namespace: {{ ingress_nginx_namespace }}
1515
path: /networking/v1/ingresses
16+
port: 443
1617
failurePolicy: Fail
1718
matchPolicy: Equivalent
1819
name: validate.nginx.ingress.kubernetes.io

roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ds-ingress-nginx-controller.yml.j2

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,18 @@ spec:
3030
- /init_module
3131
image: {{ ingress_nginx_opentelemetry_image_repo }}:{{ ingress_nginx_opentelemetry_image_tag }}
3232
securityContext:
33-
runAsNonRoot: true
34-
runAsUser: 65532
3533
allowPrivilegeEscalation: false
36-
seccompProfile:
37-
type: RuntimeDefault
3834
capabilities:
35+
add:
36+
- NET_BIND_SERVICE
3937
drop:
40-
- ALL
41-
readOnlyRootFilesystem: true
38+
- ALL
39+
readOnlyRootFilesystem: false
40+
runAsGroup: 82
41+
runAsNonRoot: true
42+
runAsUser: 101
43+
seccompProfile:
44+
type: RuntimeDefault
4245
volumeMounts:
4346
- mountPath: /modules_mount
4447
name: modules

roles/kubespray-defaults/defaults/main/download.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,13 +329,13 @@ rbd_provisioner_image_tag: "{{ rbd_provisioner_version }}"
329329
local_path_provisioner_version: "v0.0.24"
330330
local_path_provisioner_image_repo: "{{ docker_image_repo }}/rancher/local-path-provisioner"
331331
local_path_provisioner_image_tag: "{{ local_path_provisioner_version }}"
332-
ingress_nginx_version: "v1.11.2"
332+
ingress_nginx_version: "v1.12.0"
333333
ingress_nginx_controller_image_repo: "{{ kube_image_repo }}/ingress-nginx/controller"
334334
ingress_nginx_opentelemetry_image_repo: "{{ kube_image_repo }}/ingress-nginx/opentelemetry"
335335
ingress_nginx_controller_image_tag: "{{ ingress_nginx_version }}"
336336
ingress_nginx_opentelemetry_image_tag: "v20230721-3e2062ee5"
337337
ingress_nginx_kube_webhook_certgen_image_repo: "{{ kube_image_repo }}/ingress-nginx/kube-webhook-certgen"
338-
ingress_nginx_kube_webhook_certgen_image_tag: "v1.4.3"
338+
ingress_nginx_kube_webhook_certgen_image_tag: "v1.5.0"
339339
alb_ingress_image_repo: "{{ docker_image_repo }}/amazon/aws-alb-ingress-controller"
340340
alb_ingress_image_tag: "v1.1.9"
341341
cert_manager_version: "v1.15.3"

0 commit comments

Comments
 (0)