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

Sync manifests with kubeadm (#3383)

Browse source
This commit is contained in:
Andreas Krüger 2018-09-24 11:17:18 +02:00 committed by k8s-ci-robot
parent 02de35cfc3
commit d6ebe8c3e7
5 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/kubernetes/master/defaults/main.yml
View file

@ -61,6 +61,7 @@ kube_controller_cpu_requests: 100m
kube_controller_node_monitor_grace_period: 40s kube_controller_node_monitor_grace_period: 40s
kube_controller_node_monitor_period: 5s kube_controller_node_monitor_period: 5s
kube_controller_pod_eviction_timeout: 5m0s kube_controller_pod_eviction_timeout: 5m0s
kube_controller_terminated_pod_gc_threshold: 12500
kube_scheduler_memory_limit: 512M kube_scheduler_memory_limit: 512M
kube_scheduler_cpu_limit: 250m kube_scheduler_cpu_limit: 250m
kube_scheduler_memory_requests: 170M kube_scheduler_memory_requests: 170M
@ -69,6 +70,7 @@ kube_apiserver_memory_limit: 2000M
kube_apiserver_cpu_limit: 800m kube_apiserver_cpu_limit: 800m
kube_apiserver_memory_requests: 256M kube_apiserver_memory_requests: 256M
kube_apiserver_cpu_requests: 100m kube_apiserver_cpu_requests: 100m
kube_apiserver_request_timeout: "1m0s"
# 1.9 and below Admission control plug-ins # 1.9 and below Admission control plug-ins
kube_apiserver_admission_control: kube_apiserver_admission_control:

2
roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2
View file

@ -69,6 +69,7 @@ apiServerExtraArgs:
service-node-port-range: {{ kube_apiserver_node_port_range }} service-node-port-range: {{ kube_apiserver_node_port_range }}
kubelet-preferred-address-types: "{{ kubelet_preferred_address_types }}" kubelet-preferred-address-types: "{{ kubelet_preferred_address_types }}"
profiling: "{{ kube_profiling }}" profiling: "{{ kube_profiling }}"
request-timeout: "{{ kube_apiserver_request_timeout }}"
repair-malformed-updates: "false" repair-malformed-updates: "false"
enable-aggregator-routing: "{{ kube_api_aggregator_routing }}" enable-aggregator-routing: "{{ kube_api_aggregator_routing }}"
{% if kube_api_anonymous_auth is defined and kube_version | version_compare('v1.5', '>=') %} {% if kube_api_anonymous_auth is defined and kube_version | version_compare('v1.5', '>=') %}
@ -112,6 +113,7 @@ controllerManagerExtraArgs:
node-monitor-period: {{ kube_controller_node_monitor_period }} node-monitor-period: {{ kube_controller_node_monitor_period }}
pod-eviction-timeout: {{ kube_controller_pod_eviction_timeout }} pod-eviction-timeout: {{ kube_controller_pod_eviction_timeout }}
profiling: "{{ kube_profiling }}" profiling: "{{ kube_profiling }}"
terminated-pod-gc-threshold: "{{ kube_controller_terminated_pod_gc_threshold }}"
{% if kube_feature_gates %} {% if kube_feature_gates %}
feature-gates: {{ kube_feature_gates|join(',') }} feature-gates: {{ kube_feature_gates|join(',') }}
{% endif %} {% endif %}

2
roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2
View file

@ -61,6 +61,7 @@ apiServerExtraArgs:
service-node-port-range: {{ kube_apiserver_node_port_range }} service-node-port-range: {{ kube_apiserver_node_port_range }}
kubelet-preferred-address-types: "{{ kubelet_preferred_address_types }}" kubelet-preferred-address-types: "{{ kubelet_preferred_address_types }}"
profiling: "{{ kube_profiling }}" profiling: "{{ kube_profiling }}"
request-timeout: "{{ kube_apiserver_request_timeout }}"
repair-malformed-updates: "false" repair-malformed-updates: "false"
enable-aggregator-routing: "{{ kube_api_aggregator_routing }}" enable-aggregator-routing: "{{ kube_api_aggregator_routing }}"
{% if kube_api_anonymous_auth is defined and kube_version | version_compare('v1.5', '>=') %} {% if kube_api_anonymous_auth is defined and kube_version | version_compare('v1.5', '>=') %}
@ -111,6 +112,7 @@ controllerManagerExtraArgs:
node-monitor-period: {{ kube_controller_node_monitor_period }} node-monitor-period: {{ kube_controller_node_monitor_period }}
pod-eviction-timeout: {{ kube_controller_pod_eviction_timeout }} pod-eviction-timeout: {{ kube_controller_pod_eviction_timeout }}
profiling: "{{ kube_profiling }}" profiling: "{{ kube_profiling }}"
terminated-pod-gc-threshold: "{{ kube_controller_terminated_pod_gc_threshold }}"
{% if kube_feature_gates %} {% if kube_feature_gates %}
feature-gates: {{ kube_feature_gates|join(',') }} feature-gates: {{ kube_feature_gates|join(',') }}
{% endif %} {% endif %}

1
roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2
View file

@ -73,6 +73,7 @@ spec:
- --kubelet-client-key={{ kube_cert_dir }}/node-{{ inventory_hostname }}-key.pem - --kubelet-client-key={{ kube_cert_dir }}/node-{{ inventory_hostname }}-key.pem
- --service-account-lookup=true - --service-account-lookup=true
- --kubelet-preferred-address-types={{ kubelet_preferred_address_types }} - --kubelet-preferred-address-types={{ kubelet_preferred_address_types }}
- --request-timeout={{ kube_apiserver_request_timeout }}
{% if kube_basic_auth|default(true) %} {% if kube_basic_auth|default(true) %}
- --basic-auth-file={{ kube_users_dir }}/known_users.csv - --basic-auth-file={{ kube_users_dir }}/known_users.csv
{% endif %} {% endif %}

2
roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2
View file

@ -38,7 +38,7 @@ spec:
- --node-monitor-period={{ kube_controller_node_monitor_period }} - --node-monitor-period={{ kube_controller_node_monitor_period }}
- --pod-eviction-timeout={{ kube_controller_pod_eviction_timeout }} - --pod-eviction-timeout={{ kube_controller_pod_eviction_timeout }}
- --profiling={{ kube_profiling }} - --profiling={{ kube_profiling }}
- --terminated-pod-gc-threshold=12500 - --terminated-pod-gc-threshold={{ kube_controller_terminated_pod_gc_threshold }}
- --v={{ kube_log_level }} - --v={{ kube_log_level }}
{% if rbac_enabled %} {% if rbac_enabled %}
- --use-service-account-credentials=true - --use-service-account-credentials=true