From f193b120592f8aeac003085497c1efd06da5f582 Mon Sep 17 00:00:00 2001
From: woopstar <andreas@kruger.nu>
Date: Wed, 7 Feb 2018 10:50:30 +0100
Subject: [PATCH] Kubeadm auto creates this
---
roles/kubernetes/master/templates/kubeadm-config.yaml.j2 | 6 ------
1 file changed, 6 deletions(-)
diff --git a/roles/kubernetes/master/templates/kubeadm-config.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.yaml.j2
index e489bb115..26e3b46a4 100644
--- a/roles/kubernetes/master/templates/kubeadm-config.yaml.j2
+++ b/roles/kubernetes/master/templates/kubeadm-config.yaml.j2
@@ -54,12 +54,6 @@ apiServerExtraArgs:
runtime-config: {{ kube_api_runtime_config | join(',') }}
{% endif %}
allow-privileged: "true"
-{% if kube_version | version_compare('1.9', '>=') %}
- requestheader-client-ca-file: "{{ kube_cert_dir }}/ca.pem"
- enable-aggregator-routing: "{{ kube_api_aggregator_routing }}"
- proxy-client-cert-file: "{{ kube_cert_dir }}/front-proxy-client.pem"
- proxy-client-key-file: "{{ kube_cert_dir }}/front-proxy-client-key.pem"
-{% endif %}
controllerManagerExtraArgs:
node-monitor-grace-period: {{ kube_controller_node_monitor_grace_period }}
node-monitor-period: {{ kube_controller_node_monitor_period }}
--
GitLab