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

Delete kube_version v1.20- related code (#8869)

Browse source 
Current Kubespray supports the Kubernetes version 1.21 or upper with
`kube_version_min_required: v1.21.0`

Then kube_version v1.20- related code is not used at all.
This deletes those code for cleanup.
This commit is contained in:
Kenichi Omichi 2022-05-25 21:31:22 -07:00 committed by GitHub
parent dc2a18e436
commit 73fc70dbe8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/download/defaults/main.yml
View file

@ -943,7 +943,7 @@ haproxy_image_tag: 2.4.9
# bundle with kubeadm; if not 'basic' upgrade can sometimes fail # bundle with kubeadm; if not 'basic' upgrade can sometimes fail
coredns_version: "{{ 'v1.8.6' if (kube_version is version('v1.23.0','>=')) else 'v1.8.0' }}" coredns_version: "{{ 'v1.8.6' if (kube_version is version('v1.23.0','>=')) else 'v1.8.0' }}"
coredns_image_is_namespaced: "{{ (kube_version is version('v1.21.0','>=')) or (coredns_version is version('v1.7.1','>=')) }}" coredns_image_is_namespaced: "{{ (coredns_version is version('v1.7.1','>=')) }}"
coredns_image_repo: "{{ kube_image_repo }}{{'/coredns/coredns' if (coredns_image_is_namespaced | bool) else '/coredns' }}" coredns_image_repo: "{{ kube_image_repo }}{{'/coredns/coredns' if (coredns_image_is_namespaced | bool) else '/coredns' }}"
coredns_image_tag: "{{ coredns_version if (coredns_image_is_namespaced | bool) else (coredns_version | regex_replace('^v', '')) }}" coredns_image_tag: "{{ coredns_version if (coredns_image_is_namespaced | bool) else (coredns_version | regex_replace('^v', '')) }}"

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

@ -109,10 +109,8 @@ tlsCipherSuites:
{% if kubelet_event_record_qps %} {% if kubelet_event_record_qps %}
eventRecordQPS: {{ kubelet_event_record_qps }} eventRecordQPS: {{ kubelet_event_record_qps }}
{% endif %} {% endif %}
{% if kube_version is version('v1.21.0', '>=') %}
shutdownGracePeriod: {{ kubelet_shutdown_grace_period }} shutdownGracePeriod: {{ kubelet_shutdown_grace_period }}
shutdownGracePeriodCriticalPods: {{ kubelet_shutdown_grace_period_critical_pods }} shutdownGracePeriodCriticalPods: {{ kubelet_shutdown_grace_period_critical_pods }}
{% endif %}
{% if not kubelet_fail_swap_on|default(true) %} {% if not kubelet_fail_swap_on|default(true) %}
memorySwap: memorySwap:
swapBehavior: {{ kubelet_swap_behavior|default("LimitedSwap") }} swapBehavior: {{ kubelet_swap_behavior|default("LimitedSwap") }}