External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-10-31 06:26:19 -02:30
Code Issues Packages Projects Releases Wiki Activity

Upgrade etcd to 3.7 for Kubernetes 1.37 (#13363)

Browse Source 
Signed-off-by: Ali Afsharzadeh <afsharzadeh8@gmail.com>
This commit is contained in:
Ali Afsharzadeh
2026-09-25 06:16:30 +00:00
committed by GitHub
parent 327e7fde9c
commit cc65b8d9e3
9 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
roles/etcd/tasks/check_upgrade.yml
+11
View File
@@ -0,0 +1,11 @@
---
# All members must run etcd 3.6.11 or later before the upgrade to 3.7.
# https://etcd.io/docs/v3.7/upgrades/upgrade_3_7/
- name: Ensure etcd version is >=3.6.11 before upgrade to 3.7
when:
- etcd_cluster_setup
- etcd_current_version != ''
- etcd_current_version is version('3.6.11', '<')
- etcd_version is version('3.7.0', '>=')
fail:
msg: "You need to upgrade etcd to 3.6.11 or later before upgrade to 3.7. Current version is {{ etcd_current_version }}."
roles/etcd/tasks/install_docker.yml
+3
View File
@@ -28,6 +28,9 @@
etcd_current_version: "{{ (etcd_current_docker_image.stdout | regex_search('.*:v([0-9]+\\.[0-9]+\\.[0-9]+)', '\\1'))[0] | default('') }}"
when: etcd_cluster_setup
- name: Check etcd upgrade path
import_tasks: check_upgrade.yml
- name: Cleanup v2 store data
import_tasks: clean_v2_store.yml
roles/etcd/tasks/install_host.yml
+3
View File
@@ -26,6 +26,9 @@
etcd_current_version: "{{ (etcd_current_host_version.stdout | regex_search('etcd Version: ([0-9]+\\.[0-9]+\\.[0-9]+)', '\\1'))[0] | default('') }}"
when: etcd_cluster_setup
- name: Check etcd upgrade path
import_tasks: check_upgrade.yml
- name: Cleanup v2 store data
import_tasks: clean_v2_store.yml
roles/etcd/templates/etcd-events.env.j2
-1
View File
@@ -10,7 +10,6 @@ ETCD_HEARTBEAT_INTERVAL={{ etcd_heartbeat_interval }}
ETCD_INITIAL_CLUSTER_TOKEN=k8s_events_etcd
ETCD_LISTEN_PEER_URLS=https://{{ etcd_address | ansible.utils.ipwrap }}:2382
ETCD_NAME={{ etcd_member_name }}-events
ETCD_PROXY=off
ETCD_INITIAL_CLUSTER={{ etcd_events_peer_addresses }}
ETCD_AUTO_COMPACTION_RETENTION={{ etcd_compaction_retention }}
ETCD_SNAPSHOT_COUNT={{ etcd_snapshot_count }}
roles/etcd/templates/etcd.env.j2
+7 -8
View File
@@ -16,7 +16,6 @@ ETCD_HEARTBEAT_INTERVAL={{ etcd_heartbeat_interval }}
ETCD_INITIAL_CLUSTER_TOKEN=k8s_etcd
ETCD_LISTEN_PEER_URLS=https://{{ etcd_address | ansible.utils.ipwrap }}:2380
ETCD_NAME={{ etcd_member_name }}
ETCD_PROXY=off
ETCD_INITIAL_CLUSTER={{ etcd_peer_addresses }}
ETCD_AUTO_COMPACTION_RETENTION={{ etcd_compaction_retention }}
ETCD_SNAPSHOT_COUNT={{ etcd_snapshot_count }}
@@ -53,14 +52,14 @@ ETCDCTL_CERT={{ etcd_cert_dir }}/admin-{{ inventory_hostname }}.pem
# ETCD 3.5.x issue
# https://groups.google.com/a/kubernetes.io/g/dev/c/B7gJs88XtQc/m/rSgNOzV2BwAJ?utm_medium=email&utm_source=footer
ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK={{ etcd_experimental_initial_corrupt_check }}
ETCD_FEATURE_GATES=InitialCorruptCheck={{ etcd_experimental_initial_corrupt_check }}
{% if etcd_experimental_enable_distributed_tracing %}
ETCD_EXPERIMENTAL_ENABLE_DISTRIBUTED_TRACING=true
ETCD_EXPERIMENTAL_DISTRIBUTED_TRACING_SAMPLING_RATE={{ etcd_experimental_distributed_tracing_sample_rate }}
ETCD_EXPERIMENTAL_DISTRIBUTED_TRACING_ADDRESS={{ etcd_experimental_distributed_tracing_address }}
ETCD_EXPERIMENTAL_DISTRIBUTED_TRACING_SERVICE_NAME={{ etcd_experimental_distributed_tracing_service_name }}
ETCD_EXPERIMENTAL_DISTRIBUTED_TRACING_INSTANCE_ID={{ etcd_member_name }}
ETCD_ENABLE_DISTRIBUTED_TRACING=true
ETCD_DISTRIBUTED_TRACING_SAMPLING_RATE={{ etcd_experimental_distributed_tracing_sample_rate }}
ETCD_DISTRIBUTED_TRACING_ADDRESS={{ etcd_experimental_distributed_tracing_address }}
ETCD_DISTRIBUTED_TRACING_SERVICE_NAME={{ etcd_experimental_distributed_tracing_service_name }}
ETCD_DISTRIBUTED_TRACING_INSTANCE_ID={{ etcd_member_name }}
{% endif %}
ETCD_EXPERIMENTAL_WATCH_PROGRESS_NOTIFY_INTERVAL={{ etcd_experimental_watch_progress_notify_interval }}
ETCD_WATCH_PROGRESS_NOTIFY_INTERVAL={{ etcd_experimental_watch_progress_notify_interval }}