From 038da7255fc1dad26102ce8b7ce77cbf1ab3f77b Mon Sep 17 00:00:00 2001
From: Sergey Bondarev <s.bondarev@southbridge.ru>
Date: Mon, 19 Mar 2018 12:59:38 +0300
Subject: [PATCH] check if group kube-ingress is not empty fix spelling
mistaker ingress_nginx_host_network set default value for
ingress_nginx_host_network: false
---
inventory/sample/group_vars/k8s-cluster.yml | 2 +-
.../ingress_controller/ingress_nginx/defaults/main.yml | 1 +
.../templates/ingress-nginx-controller-ds.yml.j2 | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/inventory/sample/group_vars/k8s-cluster.yml b/inventory/sample/group_vars/k8s-cluster.yml
index 19ffc8cca..1038fe376 100644
--- a/inventory/sample/group_vars/k8s-cluster.yml
+++ b/inventory/sample/group_vars/k8s-cluster.yml
@@ -189,7 +189,7 @@ cephfs_provisioner_enabled: false
# Nginx ingress controller deployment
ingress_nginx_enabled: false
-# ingres_nginx_host_network: true
+# ingress_nginx_host_network: false
# ingress_nginx_namespace: "ingress-nginx"
# ingress_nginx_insecure_port: 80
# ingress_nginx_secure_port: 443
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 dce234f6c..fc114a2ba 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_controller_image_repo: quay.io/kubernetes-ingress-controller/nginx
ingress_nginx_controller_image_tag: 0.11.0
ingress_nginx_namespace: "ingress-nginx"
+ingress_nginx_host_network: false
ingress_nginx_insecure_port: 80
ingress_nginx_secure_port: 443
ingress_nginx_configmap: {}
diff --git a/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ingress-nginx-controller-ds.yml.j2 b/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ingress-nginx-controller-ds.yml.j2
index 289119a60..b88bb9d6f 100644
--- a/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ingress-nginx-controller-ds.yml.j2
+++ b/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ingress-nginx-controller-ds.yml.j2
@@ -21,10 +21,10 @@ spec:
k8s-app: ingress-nginx
version: v{{ ingress_nginx_controller_image_tag }}
spec:
-{% if ingres_nginx_host_network is defined and ingres_nginx_host_network %}
+{% if ingress_nginx_host_network %}
hostNetwork: true
{% endif %}
-{% if 'kube-ingress' in groups %}
+{% if 'kube-ingress' in groups and groups['kube-ingress']|length > 0 %}
nodeSelector:
node-role.kubernetes.io/ingress: "true"
{% endif %}
--
GitLab