Skip to content

Commit ffcf13c

Browse files
revert changes to configmap resource permissions (#8959)
Signed-off-by: Jintao Zhang <[email protected]> Signed-off-by: Jintao Zhang <[email protected]>
1 parent 45f71d5 commit ffcf13c

File tree

4 files changed

+24
-3
lines changed

4 files changed

+24
-3
lines changed

build/run-in-docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ function cleanup {
3838
}
3939
trap cleanup EXIT
4040

41-
E2E_IMAGE=${E2E_IMAGE:-registry.k8s.io/ingress-nginx/e2e-test-runner:v20220819-ga98c63787@sha256:608ef1c1e5783e4a0c4fe57d8f85aa30eb0a3d25e5b1492197e8a95382d5e09d}
41+
E2E_IMAGE=${E2E_IMAGE:-registry.k8s.io/ingress-nginx/e2e-test-runner:v20220624-g3348cd71e@sha256:2a34e322b7ff89abdfa0b6202f903bf5618578b699ff609a3ddabac0aae239c8}
4242

4343
DOCKER_OPTS=${DOCKER_OPTS:-}
4444
DOCKER_IN_DOCKER_ENABLED=${DOCKER_IN_DOCKER_ENABLED:-}

charts/ingress-nginx/Chart.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: ingress-nginx
33
# When the version is modified, make sure the artifacthub.io/changes list is updated
44
# Also update CHANGELOG.md
5-
version: 4.2.2
5+
version: 4.2.3
66
appVersion: 1.3.0
77
home: https://github.com/kubernetes/ingress-nginx
88
description: Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer
@@ -27,3 +27,4 @@ annotations:
2727
# https://artifacthub.io/packages/helm/ingress-nginx/ingress-nginx?modal=changelog
2828
artifacthub.io/changes: |
2929
- "[8896](https://github.com/kubernetes/ingress-nginx/pull/8896) updated to new images built today"
30+
- "fix permissions about configmap"

charts/ingress-nginx/README.md

Lines changed: 1 addition & 1 deletion
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.2.2](https://img.shields.io/badge/Version-4.2.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.3.0](https://img.shields.io/badge/AppVersion-1.3.0-informational?style=flat-square)
5+
![Version: 4.2.3](https://img.shields.io/badge/Version-4.2.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.3.0](https://img.shields.io/badge/AppVersion-1.3.0-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

charts/ingress-nginx/templates/controller-role.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,26 @@ rules:
5858
- get
5959
- list
6060
- watch
61+
# TODO(Jintao Zhang)
62+
# Once we release a new version of the controller,
63+
# we will be able to remove the configmap related permissions
64+
# We have used the Lease API for selection
65+
# ref: https://github.com/kubernetes/ingress-nginx/pull/8921
66+
- apiGroups:
67+
- ""
68+
resources:
69+
- configmaps
70+
resourceNames:
71+
- {{ .Values.controller.electionID }}
72+
verbs:
73+
- get
74+
- update
75+
- apiGroups:
76+
- ""
77+
resources:
78+
- configmaps
79+
verbs:
80+
- create
6181
- apiGroups:
6282
- coordination.k8s.io
6383
resources:

0 commit comments

Comments
 (0)