Browse Source

Publish the ingress-nginx service address if manual address not defined and not using host network (#11879)

pull/11923/head
Qasim Mehmood 4 months ago
committed by GitHub
parent
commit
e107022b4b
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 3 deletions
  1. 1
      roles/kubernetes-apps/ingress_controller/ingress_nginx/defaults/main.yml
  2. 7
      roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ds-ingress-nginx-controller.yml.j2

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

@ -6,6 +6,7 @@ ingress_nginx_service_nodeport_http: ""
ingress_nginx_service_nodeport_https: "" ingress_nginx_service_nodeport_https: ""
ingress_nginx_service_annotations: {} ingress_nginx_service_annotations: {}
ingress_publish_status_address: "" ingress_publish_status_address: ""
ingress_nginx_publish_service: "{{ ingress_nginx_namespace }}/ingress-nginx"
ingress_nginx_nodeselector: ingress_nginx_nodeselector:
kubernetes.io/os: "linux" kubernetes.io/os: "linux"
ingress_nginx_tolerations: [] ingress_nginx_tolerations: []

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

@ -79,11 +79,12 @@ spec:
{% if ingress_nginx_without_class %} {% if ingress_nginx_without_class %}
- --watch-ingress-without-class=true - --watch-ingress-without-class=true
{% endif %} {% endif %}
{% if ingress_nginx_host_network %}
- --report-node-internal-ip-address
{% endif %}
{% if ingress_publish_status_address != "" %} {% if ingress_publish_status_address != "" %}
- --publish-status-address={{ ingress_publish_status_address }} - --publish-status-address={{ ingress_publish_status_address }}
{% elif ingress_nginx_host_network %}
- --report-node-internal-ip-address
{% elif ingress_nginx_publish_service != "" %}
- --publish-service={{ ingress_nginx_publish_service }}
{% endif %} {% endif %}
{% for extra_arg in ingress_nginx_extra_args %} {% for extra_arg in ingress_nginx_extra_args %}
- {{ extra_arg }} - {{ extra_arg }}

Loading…
Cancel
Save