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

pid reserved must be str (#9124)

Browse source
This commit is contained in:
Samuel Liu 2022-07-31 11:14:27 +08:00 committed by GitHub
parent b3876142d2
commit e73803c72c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
roles/kubernetes/node/defaults/main.yml
View file

@ -26,24 +26,24 @@ kubelet_fail_swap_on: true
kube_memory_reserved: 256Mi kube_memory_reserved: 256Mi
kube_cpu_reserved: 100m kube_cpu_reserved: 100m
# kube_ephemeral_storage_reserved: 2Gi # kube_ephemeral_storage_reserved: 2Gi
# kube_pid_reserved: 1000 # kube_pid_reserved: "1000"
# Reservation for master hosts # Reservation for master hosts
kube_master_memory_reserved: 512Mi kube_master_memory_reserved: 512Mi
kube_master_cpu_reserved: 200m kube_master_cpu_reserved: 200m
# kube_master_ephemeral_storage_reserved: 2Gi # kube_master_ephemeral_storage_reserved: 2Gi
# kube_master_pid_reserved: 1000 # kube_master_pid_reserved: "1000"
# Set to true to reserve resources for system daemons # Set to true to reserve resources for system daemons
system_reserved: false system_reserved: false
system_memory_reserved: 512Mi system_memory_reserved: 512Mi
system_cpu_reserved: 500m system_cpu_reserved: 500m
# system_ephemeral_storage_reserved: 2Gi # system_ephemeral_storage_reserved: 2Gi
# system_pid_reserved: 1000 # system_pid_reserved: "1000"
# Reservation for master hosts # Reservation for master hosts
system_master_memory_reserved: 256Mi system_master_memory_reserved: 256Mi
system_master_cpu_reserved: 250m system_master_cpu_reserved: 250m
# system_master_ephemeral_storage_reserved: 2Gi # system_master_ephemeral_storage_reserved: 2Gi
# system_master_pid_reserved: 1000 # system_master_pid_reserved: "1000"
## Eviction Thresholds to avoid system OOMs ## Eviction Thresholds to avoid system OOMs
# https://kubernetes.io/docs/tasks/administer-cluster/reserve-compute-resources/#eviction-thresholds # https://kubernetes.io/docs/tasks/administer-cluster/reserve-compute-resources/#eviction-thresholds

8
roles/kubernetes/node/templates/kubelet-config.v1beta1.yaml.j2
View file

@ -68,7 +68,7 @@ kubeReserved:
ephemeral-storage: {{ kube_master_ephemeral_storage_reserved }} ephemeral-storage: {{ kube_master_ephemeral_storage_reserved }}
{% endif %} {% endif %}
{% if kube_master_pid_reserved is defined %} {% if kube_master_pid_reserved is defined %}
pid: {{ kube_master_pid_reserved }} pid: "{{ kube_master_pid_reserved }}"
{% endif %} {% endif %}
{% else %} {% else %}
cpu: {{ kube_cpu_reserved }} cpu: {{ kube_cpu_reserved }}
@ -77,7 +77,7 @@ kubeReserved:
ephemeral-storage: {{ kube_ephemeral_storage_reserved }} ephemeral-storage: {{ kube_ephemeral_storage_reserved }}
{% endif %} {% endif %}
{% if kube_pid_reserved is defined %} {% if kube_pid_reserved is defined %}
pid: {{ kube_pid_reserved }} pid: "{{ kube_pid_reserved }}"
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if system_reserved is defined and system_reserved %} {% if system_reserved is defined and system_reserved %}
@ -89,7 +89,7 @@ systemReserved:
ephemeral-storage: {{ system_master_ephemeral_storage_reserved }} ephemeral-storage: {{ system_master_ephemeral_storage_reserved }}
{% endif %} {% endif %}
{% if system_master_pid_reserved is defined %} {% if system_master_pid_reserved is defined %}
pid: {{ system_master_pid_reserved }} pid: "{{ system_master_pid_reserved }}"
{% endif %} {% endif %}
{% else %} {% else %}
cpu: {{ system_cpu_reserved }} cpu: {{ system_cpu_reserved }}
@ -98,7 +98,7 @@ systemReserved:
ephemeral-storage: {{ system_ephemeral_storage_reserved }} ephemeral-storage: {{ system_ephemeral_storage_reserved }}
{% endif %} {% endif %}
{% if system_pid_reserved is defined %} {% if system_pid_reserved is defined %}
pid: {{ system_pid_reserved }} pid: "{{ system_pid_reserved }}"
{% endif %} {% endif %}
{% endif %} {% endif %}
{% endif %} {% endif %}