Browse Source
[ingress-nginx] Fix nginx controller leader election RBAC permissions (#10569) (#11219)
Co-authored-by: Mohamed Omar Zaian <mohamedzaian@gmail.com>
pull/11287/head
Keita Mochizuki
9 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
7 additions and
12 deletions
-
roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ds-ingress-nginx-controller.yml.j2
-
roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/role-ingress-nginx.yml.j2
|
|
@ -48,6 +48,7 @@ spec: |
|
|
|
args: |
|
|
|
- /nginx-ingress-controller |
|
|
|
- --configmap=$(POD_NAMESPACE)/ingress-nginx |
|
|
|
- --election-id=ingress-controller-leader-{{ ingress_nginx_class }} |
|
|
|
- --tcp-services-configmap=$(POD_NAMESPACE)/tcp-services |
|
|
|
- --udp-services-configmap=$(POD_NAMESPACE)/udp-services |
|
|
|
- --annotations-prefix=nginx.ingress.kubernetes.io |
|
|
|
|
|
@ -28,23 +28,17 @@ rules: |
|
|
|
verbs: ["get", "list", "watch"] |
|
|
|
- apiGroups: ["coordination.k8s.io"] |
|
|
|
resources: ["leases"] |
|
|
|
# Defaults to "<election-id>-<ingress-class>" |
|
|
|
# Here: "<ingress-controller-leader>-<nginx>" |
|
|
|
# This has to be adapted if you change either parameter |
|
|
|
# when launching the nginx-ingress-controller. |
|
|
|
# Defaults to "<election-id>", defined in |
|
|
|
# ds-ingress-nginx-controller.yml.js |
|
|
|
# by a command-line argument. |
|
|
|
# |
|
|
|
# This is the correct behaviour for ingress-controller |
|
|
|
# version 1.8.1 |
|
|
|
resourceNames: ["ingress-controller-leader-{{ ingress_nginx_class }}"] |
|
|
|
verbs: ["get", "update"] |
|
|
|
- apiGroups: [""] |
|
|
|
resources: ["events"] |
|
|
|
verbs: ["create", "patch"] |
|
|
|
- apiGroups: ["coordination.k8s.io"] |
|
|
|
resources: ["leases"] |
|
|
|
# Defaults to "<election-id>-<ingress-class>" |
|
|
|
# Here: "<ingress-controller-leader>-<nginx>" |
|
|
|
# This has to be adapted if you change either parameter |
|
|
|
# when launching the nginx-ingress-controller. |
|
|
|
resourceNames: ["ingress-controller-leader-{{ ingress_nginx_class }}"] |
|
|
|
verbs: ["get", "update"] |
|
|
|
- apiGroups: ["coordination.k8s.io"] |
|
|
|
resources: ["leases"] |
|
|
|
verbs: ["create"] |
|
|
|