Browse Source

add ingress controller class (#7522)

pull/7538/head
Samuel Liu 4 years ago
committed by GitHub
parent
commit
8c7b90ebbf
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 1 deletions
  1. 1
      inventory/sample/group_vars/k8s-cluster/addons.yml
  2. 1
      roles/kubernetes-apps/ingress_controller/ingress_nginx/defaults/main.yml
  3. 3
      roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ds-ingress-nginx-controller.yml.j2
  4. 2
      roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/role-ingress-nginx.yml.j2

1
inventory/sample/group_vars/k8s-cluster/addons.yml

@ -110,6 +110,7 @@ ingress_publish_status_address: ""
# 53: "kube-system/coredns:53"
# ingress_nginx_extra_args:
# - --default-ssl-certificate=default/foo-tls
# ingress_nginx_class: nginx
# ambassador ingress controller deployment
ingress_ambassador_enabled: false

1
roles/kubernetes-apps/ingress_controller/ingress_nginx/defaults/main.yml

@ -12,3 +12,4 @@ ingress_nginx_configmap: {}
ingress_nginx_configmap_tcp_services: {}
ingress_nginx_configmap_udp_services: {}
ingress_nginx_extra_args: []
# ingress_nginx_class: nginx

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

@ -50,6 +50,9 @@ spec:
- --tcp-services-configmap=$(POD_NAMESPACE)/tcp-services
- --udp-services-configmap=$(POD_NAMESPACE)/udp-services
- --annotations-prefix=nginx.ingress.kubernetes.io
{% if ingress_nginx_class is defined %}
- --ingress-class={{ ingress_nginx_class }}
{% endif %}
{% if ingress_nginx_host_network %}
- --report-node-internal-ip-address
{% endif %}

2
roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/role-ingress-nginx.yml.j2

@ -32,7 +32,7 @@ rules:
# 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-nginx"]
resourceNames: ["ingress-controller-leader-{{ ingress_nginx_class | default('nginx') }}"]
verbs: ["get", "update"]
- apiGroups: [""]
resources: ["configmaps"]

Loading…
Cancel
Save