External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-05-07 17:37:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2571 from hswong3i/ingress-nginx-download

Browse Source 
ingress-nginx: container download related things should defined in the download role
This commit is contained in:
Andreas Krüger
2018-03-31 20:51:50 +02:00
committed by GitHub
parent 6ee3c053b7 5fe144aa0f
commit deac627dc7
5 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
roles/kubernetes-apps/ingress_controller/ingress_nginx/defaults/main.yml
View File

@@ -1,10 +1,4 @@
---
ingress_nginx_default_backend_image_repo: gcr.io/google_containers/defaultbackend
ingress_nginx_default_backend_image_tag: 1.4
ingress_nginx_controller_image_repo: quay.io/kubernetes-ingress-controller/nginx-ingress-controller
ingress_nginx_controller_image_tag: 0.11.0
ingress_nginx_namespace: "ingress-nginx"
ingress_nginx_host_network: false
ingress_nginx_insecure_port: 80

2
roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ingress-nginx-controller-ds.yml.j2
View File

@@ -27,10 +27,8 @@ spec:
{% if ingress_nginx_host_network %}
hostNetwork: true
{% endif %}
{% if 'kube-ingress' in groups and groups['kube-ingress']|length > 0 %}
nodeSelector:
node-role.kubernetes.io/ingress: "true"
{% endif %}
terminationGracePeriodSeconds: 60
containers:
- name: ingress-nginx-controller