C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

check if group kube-ingress is not empty

Browse source 
fix spelling mistaker ingress_nginx_host_network
set default value for ingress_nginx_host_network: false
This commit is contained in:
Sergey Bondarev 2018-03-19 12:59:38 +03:00
parent 1481f7d64b
commit 038da7255f
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
inventory/sample/group_vars/k8s-cluster.yml
View file

@ -189,7 +189,7 @@ cephfs_provisioner_enabled: false
# Nginx ingress controller deployment # Nginx ingress controller deployment
ingress_nginx_enabled: false ingress_nginx_enabled: false
# ingres_nginx_host_network: true # ingress_nginx_host_network: false
# ingress_nginx_namespace: "ingress-nginx" # ingress_nginx_namespace: "ingress-nginx"
# ingress_nginx_insecure_port: 80 # ingress_nginx_insecure_port: 80
# ingress_nginx_secure_port: 443 # ingress_nginx_secure_port: 443

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

@ -6,6 +6,7 @@ ingress_nginx_controller_image_repo: quay.io/kubernetes-ingress-controller/nginx
ingress_nginx_controller_image_tag: 0.11.0 ingress_nginx_controller_image_tag: 0.11.0
ingress_nginx_namespace: "ingress-nginx" ingress_nginx_namespace: "ingress-nginx"
ingress_nginx_host_network: false
ingress_nginx_insecure_port: 80 ingress_nginx_insecure_port: 80
ingress_nginx_secure_port: 443 ingress_nginx_secure_port: 443
ingress_nginx_configmap: {} ingress_nginx_configmap: {}

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

@ -21,10 +21,10 @@ spec:
k8s-app: ingress-nginx k8s-app: ingress-nginx
version: v{{ ingress_nginx_controller_image_tag }} version: v{{ ingress_nginx_controller_image_tag }}
spec: spec:
{% if ingres_nginx_host_network is defined and ingres_nginx_host_network %} {% if ingress_nginx_host_network %}
hostNetwork: true hostNetwork: true
{% endif %} {% endif %}
{% if 'kube-ingress' in groups %} {% if 'kube-ingress' in groups and groups['kube-ingress']|length > 0 %}
nodeSelector: nodeSelector:
node-role.kubernetes.io/ingress: "true" node-role.kubernetes.io/ingress: "true"
{% endif %} {% endif %}