update to latest 2.26.0 kubespray version and add dns zones settings to coredns
This commit is contained in:
@@ -62,9 +62,10 @@ clusterDNS:
|
||||
{# Node reserved CPU/memory #}
|
||||
{% if kube_reserved | bool %}
|
||||
kubeReservedCgroup: {{ kube_reserved_cgroups }}
|
||||
{% endif %}
|
||||
kubeReserved:
|
||||
{% if is_kube_master | bool %}
|
||||
cpu: {{ kube_master_cpu_reserved }}
|
||||
cpu: "{{ kube_master_cpu_reserved }}"
|
||||
memory: {{ kube_master_memory_reserved }}
|
||||
{% if kube_master_ephemeral_storage_reserved is defined %}
|
||||
ephemeral-storage: {{ kube_master_ephemeral_storage_reserved }}
|
||||
@@ -73,7 +74,7 @@ kubeReserved:
|
||||
pid: "{{ kube_master_pid_reserved }}"
|
||||
{% endif %}
|
||||
{% else %}
|
||||
cpu: {{ kube_cpu_reserved }}
|
||||
cpu: "{{ kube_cpu_reserved }}"
|
||||
memory: {{ kube_memory_reserved }}
|
||||
{% if kube_ephemeral_storage_reserved is defined %}
|
||||
ephemeral-storage: {{ kube_ephemeral_storage_reserved }}
|
||||
@@ -82,12 +83,11 @@ kubeReserved:
|
||||
pid: "{{ kube_pid_reserved }}"
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% if system_reserved | bool %}
|
||||
systemReservedCgroup: {{ system_reserved_cgroups }}
|
||||
systemReserved:
|
||||
{% if is_kube_master | bool %}
|
||||
cpu: {{ system_master_cpu_reserved }}
|
||||
cpu: "{{ system_master_cpu_reserved }}"
|
||||
memory: {{ system_master_memory_reserved }}
|
||||
{% if system_master_ephemeral_storage_reserved is defined %}
|
||||
ephemeral-storage: {{ system_master_ephemeral_storage_reserved }}
|
||||
@@ -96,7 +96,7 @@ systemReserved:
|
||||
pid: "{{ system_master_pid_reserved }}"
|
||||
{% endif %}
|
||||
{% else %}
|
||||
cpu: {{ system_cpu_reserved }}
|
||||
cpu: "{{ system_cpu_reserved }}"
|
||||
memory: {{ system_memory_reserved }}
|
||||
{% if system_ephemeral_storage_reserved is defined %}
|
||||
ephemeral-storage: {{ system_ephemeral_storage_reserved }}
|
||||
@@ -160,6 +160,10 @@ seccompDefault: {{ kubelet_seccomp_default | bool }}
|
||||
{% if kubelet_cpu_manager_policy is defined %}
|
||||
cpuManagerPolicy: {{ kubelet_cpu_manager_policy }}
|
||||
{% endif %}
|
||||
{% if kubelet_cpu_manager_policy_options is defined %}
|
||||
cpuManagerPolicyOptions:
|
||||
{{ kubelet_cpu_manager_policy_options | to_nice_yaml(indent=2) }}
|
||||
{% endif %}
|
||||
{% if kubelet_topology_manager_policy is defined %}
|
||||
topologyManagerPolicy: {{ kubelet_topology_manager_policy }}
|
||||
{% endif %}
|
||||
@@ -170,4 +174,5 @@ topologyManagerScope: {{ kubelet_topology_manager_scope }}
|
||||
tracing:
|
||||
endpoint: {{ kubelet_tracing_endpoint }}
|
||||
samplingRatePerMillion: {{ kubelet_tracing_sampling_rate_per_million }}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
maxParallelImagePulls: {{ kubelet_max_parallel_image_pulls }}
|
||||
|
||||
@@ -7,6 +7,11 @@ Wants=docker.socket
|
||||
{% else %}
|
||||
Wants={{ container_manager }}.service
|
||||
{% endif %}
|
||||
{% for kubelet_dependency in kubelet_systemd_wants_dependencies|default([]) %}
|
||||
{% if kubelet_dependency|length > 0 %}
|
||||
Wants={{ kubelet_dependency }}
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
|
||||
[Service]
|
||||
EnvironmentFile=-{{ kube_config_dir }}/kubelet.env
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Inspired by https://github.com/kube-vip/kube-vip/blob/v0.5.11/pkg/kubevip/config_generator.go#L13
|
||||
# Inspired by https://github.com/kube-vip/kube-vip/blob/v0.8.0/pkg/kubevip/config_generator.go#L103
|
||||
apiVersion: v1
|
||||
kind: Pod
|
||||
metadata:
|
||||
@@ -16,6 +16,8 @@ spec:
|
||||
value: {{ kube_vip_arp_enabled | string | to_json }}
|
||||
- name: port
|
||||
value: {{ kube_apiserver_port | string | to_json }}
|
||||
- name: vip_nodename
|
||||
value: {{ inventory_hostname }}
|
||||
{% if kube_vip_interface %}
|
||||
- name: vip_interface
|
||||
value: {{ kube_vip_interface | string | to_json }}
|
||||
@@ -28,6 +30,10 @@ spec:
|
||||
- name: vip_cidr
|
||||
value: {{ kube_vip_cidr | string | to_json }}
|
||||
{% endif %}
|
||||
{% if kube_vip_dns_mode %}
|
||||
- name: dns_mode
|
||||
value: {{ kube_vip_dns_mode | string | to_json }}
|
||||
{% endif %}
|
||||
{% if kube_vip_controlplane_enabled %}
|
||||
- name: cp_enable
|
||||
value: "true"
|
||||
@@ -35,11 +41,17 @@ spec:
|
||||
value: kube-system
|
||||
- name: vip_ddns
|
||||
value: {{ kube_vip_ddns_enabled | string | to_json }}
|
||||
- name: cp_detect
|
||||
value: {{ kube_vip_cp_detect | string | to_json }}
|
||||
{% endif %}
|
||||
{% if kube_vip_services_enabled %}
|
||||
- name: svc_enable
|
||||
value: "true"
|
||||
{% endif %}
|
||||
{% if kube_vip_svc_leasename %}
|
||||
- name: svc_leasename
|
||||
value: {{ kube_vip_svc_leasename | string | to_json }}
|
||||
{% endif %}
|
||||
{% if kube_vip_enableServicesElection %}
|
||||
- name: svc_election
|
||||
value: "true"
|
||||
@@ -47,12 +59,18 @@ spec:
|
||||
{% if kube_vip_leader_election_enabled %}
|
||||
- name: vip_leaderelection
|
||||
value: "true"
|
||||
- name: vip_leasename
|
||||
value: {{ kube_vip_leasename | string | to_json }}
|
||||
- name: vip_leaseduration
|
||||
value: "5"
|
||||
value: {{ kube_vip_leaseduration | string | to_json }}
|
||||
- name: vip_renewdeadline
|
||||
value: "3"
|
||||
value: {{ kube_vip_renewdeadline | string | to_json }}
|
||||
- name: vip_retryperiod
|
||||
value: "1"
|
||||
value: {{ kube_vip_retryperiod | string | to_json }}
|
||||
{% endif %}
|
||||
{% if kube_vip_enable_node_labeling %}
|
||||
- name: enable_node_labeling
|
||||
value: {{ kube_vip_enable_node_labeling | string | to_json }}
|
||||
{% endif %}
|
||||
{% if kube_vip_bgp_enabled %}
|
||||
- name: bgp_enable
|
||||
@@ -101,6 +119,6 @@ spec:
|
||||
hostNetwork: true
|
||||
volumes:
|
||||
- hostPath:
|
||||
path: /etc/kubernetes/admin.conf
|
||||
path: /etc/kubernetes/{{kube_vip_admin_conf}}
|
||||
name: kubeconfig
|
||||
status: {}
|
||||
|
||||
Reference in New Issue
Block a user