diff --git a/roles/kubernetes-apps/ingress_controller/ingress_nginx/defaults/main.yml b/roles/kubernetes-apps/ingress_controller/ingress_nginx/defaults/main.yml index 9d7a4c402..b4f385c74 100644 --- a/roles/kubernetes-apps/ingress_controller/ingress_nginx/defaults/main.yml +++ b/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_annotations: {} ingress_publish_status_address: "" +ingress_nginx_publish_service: "{{ ingress_nginx_namespace }}/ingress-nginx" ingress_nginx_nodeselector: kubernetes.io/os: "linux" ingress_nginx_tolerations: [] diff --git a/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ds-ingress-nginx-controller.yml.j2 b/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ds-ingress-nginx-controller.yml.j2 index 8ae422006..5b11e54a2 100644 --- a/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ds-ingress-nginx-controller.yml.j2 +++ b/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ds-ingress-nginx-controller.yml.j2 @@ -79,11 +79,12 @@ spec: {% if ingress_nginx_without_class %} - --watch-ingress-without-class=true {% endif %} -{% if ingress_nginx_host_network %} - - --report-node-internal-ip-address -{% endif %} {% if 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 %} {% for extra_arg in ingress_nginx_extra_args %} - {{ extra_arg }}