Add etcd_feature_gates and restore the etcd 3.5 flag names (#13569)

Signed-off-by: Ali Afsharzadeh <afsharzadeh8@gmail.com>
This commit is contained in:
Ali Afsharzadeh
2026-10-08 03:41:59 +00:00
committed by GitHub
parent 5eae65cc2a
commit d98540de2c
2 changed files with 21 additions and 1 deletions
+16 -1
View File
@@ -52,7 +52,8 @@ 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_FEATURE_GATES=InitialCorruptCheck={{ etcd_experimental_initial_corrupt_check }}
{% if etcd_version is version('3.6.0', '>=') %}
ETCD_FEATURE_GATES={{ ({'InitialCorruptCheck': etcd_experimental_initial_corrupt_check} | combine(etcd_feature_gates)).items() | map('join', '=') | join(',') }}
{% if etcd_experimental_enable_distributed_tracing %}
ETCD_ENABLE_DISTRIBUTED_TRACING=true
@@ -63,3 +64,17 @@ ETCD_DISTRIBUTED_TRACING_INSTANCE_ID={{ etcd_member_name }}
{% endif %}
ETCD_WATCH_PROGRESS_NOTIFY_INTERVAL={{ etcd_experimental_watch_progress_notify_interval }}
{% else %}
{# etcd 3.5.x uses the experimental names #}
ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK={{ 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 }}
{% endif %}
ETCD_EXPERIMENTAL_WATCH_PROGRESS_NOTIFY_INTERVAL={{ etcd_experimental_watch_progress_notify_interval }}
{% endif %}