From b41530ba5dcc21cf299a06deed07d01d65418746 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Kr=C3=BCger?= <ak@patientsky.com>
Date: Tue, 28 May 2019 12:57:52 +0200
Subject: [PATCH] Add missing extraArgs to kubeadm-config (#4814)
---
.../master/templates/kubeadm-config.v1alpha3.yaml.j2 | 5 +++++
.../master/templates/kubeadm-config.v1beta1.yaml.j2 | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2
index 686f7656a..691834fea 100644
--- a/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2
+++ b/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2
@@ -78,6 +78,8 @@ apiServerExtraArgs:
{% endif %}
service-node-port-range: {{ kube_apiserver_node_port_range }}
kubelet-preferred-address-types: "{{ kubelet_preferred_address_types }}"
+ profiling: "{{ kube_profiling }}"
+ request-timeout: "{{ kube_apiserver_request_timeout }}"
{% if kube_basic_auth|default(true) %}
basic-auth-file: {{ kube_users_dir }}/known_users.csv
{% endif %}
@@ -138,6 +140,9 @@ controllerManagerExtraArgs:
node-monitor-period: {{ kube_controller_node_monitor_period }}
pod-eviction-timeout: {{ kube_controller_pod_eviction_timeout }}
node-cidr-mask-size: "{{ kube_network_node_prefix }}"
+ profiling: "{{ kube_profiling }}"
+ terminated-pod-gc-threshold: "{{ kube_controller_terminated_pod_gc_threshold }}"
+ enable-aggregator-routing: "{{ kube_api_aggregator_routing }}"
{% if kube_version is version('v1.14', '<') %}
address: {{ kube_controller_manager_bind_address }}
{% else %}
diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2
index acf93f70b..ae30993a5 100644
--- a/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2
+++ b/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2
@@ -75,6 +75,9 @@ apiServer:
{% endif %}
service-node-port-range: {{ kube_apiserver_node_port_range }}
kubelet-preferred-address-types: "{{ kubelet_preferred_address_types }}"
+ profiling: "{{ kube_profiling }}"
+ request-timeout: "{{ kube_apiserver_request_timeout }}"
+ enable-aggregator-routing: "{{ kube_api_aggregator_routing }}"
{% if kube_basic_auth|default(true) %}
basic-auth-file: {{ kube_users_dir }}/known_users.csv
{% endif %}
@@ -189,6 +192,8 @@ controllerManager:
node-monitor-period: {{ kube_controller_node_monitor_period }}
pod-eviction-timeout: {{ kube_controller_pod_eviction_timeout }}
node-cidr-mask-size: "{{ kube_network_node_prefix }}"
+ profiling: "{{ kube_profiling }}"
+ terminated-pod-gc-threshold: "{{ kube_controller_terminated_pod_gc_threshold }}"
{% if kube_version is version('v1.14', '<') %}
address: {{ kube_controller_manager_bind_address }}
{% else %}
--
GitLab