C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

when ingress-nginx is deployes without a class, we need to use 'ingress-controller-leader' resource instead of the default 'ingress-controller-leader-nginx' (#9156)

Browse source
This commit is contained in:
Cristian Calin 2022-08-09 14:52:50 +03:00 committed by GitHub
parent 7e862939db
commit 8585134db4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/role-ingress-nginx.yml.j2
View file

@ -32,7 +32,7 @@ rules:
# Here: "<ingress-controller-leader>-<nginx>" # Here: "<ingress-controller-leader>-<nginx>"
# This has to be adapted if you change either parameter # This has to be adapted if you change either parameter
# when launching the nginx-ingress-controller. # when launching the nginx-ingress-controller.
resourceNames: ["ingress-controller-leader-{{ ingress_nginx_class | default('nginx') }}"] resourceNames: [{% if ingress_class is defined %}"ingress-controller-leader-{{ ingress_nginx_class | default('nginx') }}"{% else %}"ingress-controller-leader"{% endif %}]
verbs: ["get", "update"] verbs: ["get", "update"]
- apiGroups: ["coordination.k8s.io"] - apiGroups: ["coordination.k8s.io"]
resources: ["leases"] resources: ["leases"]
@ -40,7 +40,7 @@ rules:
# Here: "<ingress-controller-leader>-<nginx>" # Here: "<ingress-controller-leader>-<nginx>"
# This has to be adapted if you change either parameter # This has to be adapted if you change either parameter
# when launching the nginx-ingress-controller. # when launching the nginx-ingress-controller.
resourceNames: ["ingress-controller-leader-{{ ingress_nginx_class | default('nginx') }}"] resourceNames: [{% if ingress_class is defined %}"ingress-controller-leader-{{ ingress_nginx_class | default('nginx') }}"{% else %}"ingress-controller-leader"{% endif %}]
verbs: ["get", "update"] verbs: ["get", "update"]
- apiGroups: [""] - apiGroups: [""]
resources: ["configmaps"] resources: ["configmaps"]
@ -58,7 +58,7 @@ rules:
# Here: "<ingress-controller-leader>-<nginx>" # Here: "<ingress-controller-leader>-<nginx>"
# This has to be adapted if you change either parameter # This has to be adapted if you change either parameter
# when launching the nginx-ingress-controller. # when launching the nginx-ingress-controller.
resourceNames: ["ingress-controller-leader-{{ ingress_nginx_class | default('nginx') }}"] resourceNames: [{% if ingress_class is defined %}"ingress-controller-leader-{{ ingress_nginx_class | default('nginx') }}"{% else %}"ingress-controller-leader"{% endif %}]
verbs: ["get", "update"] verbs: ["get", "update"]
- apiGroups: ["coordination.k8s.io"] - apiGroups: ["coordination.k8s.io"]
resources: ["leases"] resources: ["leases"]