Browse Source

Pass `ingress_nginx_extra_args` when deploying the nginx-ingress addon (#5321)

pull/5338/head
Julien Pervillé 5 years ago
committed by Kubernetes Prow Robot
parent
commit
0200138a5d
3 changed files with 6 additions and 0 deletions
  1. 2
      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

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

@ -98,6 +98,8 @@ ingress_publish_status_address: ""
# 9000: "default/example-go:8080" # 9000: "default/example-go:8080"
# ingress_nginx_configmap_udp_services: # ingress_nginx_configmap_udp_services:
# 53: "kube-system/coredns:53" # 53: "kube-system/coredns:53"
# ingress_nginx_extra_args:
# - --default-ssl-certificate=default/foo-tls
# Cert manager deployment # Cert manager deployment
cert_manager_enabled: false cert_manager_enabled: false

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

@ -10,3 +10,4 @@ ingress_nginx_secure_port: 443
ingress_nginx_configmap: {} ingress_nginx_configmap: {}
ingress_nginx_configmap_tcp_services: {} ingress_nginx_configmap_tcp_services: {}
ingress_nginx_configmap_udp_services: {} ingress_nginx_configmap_udp_services: {}
ingress_nginx_extra_args: []

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

@ -51,6 +51,9 @@ spec:
{% if ingress_publish_status_address != "" %} {% if ingress_publish_status_address != "" %}
- --publish-status-address={{ ingress_publish_status_address }} - --publish-status-address={{ ingress_publish_status_address }}
{% endif %} {% endif %}
{% for extra_arg in ingress_nginx_extra_args %}
- {{ extra_arg }}
{% endfor %}
securityContext: securityContext:
capabilities: capabilities:
drop: drop:

Loading…
Cancel
Save