From 564de079636b2a95336d8f182a75953fc7db2377 Mon Sep 17 00:00:00 2001 From: Matthew Mosesohn Date: Fri, 27 Oct 2017 14:56:22 +0100 Subject: [PATCH 1/2] fix indentation for network policy option --- .../master/templates/manifests/kube-apiserver.manifest.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 b/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 index 24889a74c..42f149398 100644 --- a/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 +++ b/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 @@ -78,9 +78,9 @@ spec: {% endfor %} {% endif %} {% if enable_network_policy %} - {% if kube_version | version_compare('v1.8', '<') %} + {%- if kube_version | version_compare('v1.8', '<') -%} - --runtime-config=extensions/v1beta1/networkpolicies=true - {% endif %} + {%- endif -%} {% endif %} - --v={{ kube_log_level }} - --allow-privileged=true From 19962f6b6ac224204d58675c239de2698f727fd2 Mon Sep 17 00:00:00 2001 From: Spencer Smith Date: Tue, 31 Oct 2017 02:43:54 -0400 Subject: [PATCH 2/2] fix indentation for master template (#1906) --- .../master/templates/manifests/kube-apiserver.manifest.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 b/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 index 42f149398..5d4f6cf47 100644 --- a/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 +++ b/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 @@ -78,9 +78,9 @@ spec: {% endfor %} {% endif %} {% if enable_network_policy %} - {%- if kube_version | version_compare('v1.8', '<') -%} +{% if kube_version | version_compare('v1.8', '<') %} - --runtime-config=extensions/v1beta1/networkpolicies=true - {%- endif -%} +{% endif %} {% endif %} - --v={{ kube_log_level }} - --allow-privileged=true