From 20d99886cab523febe89bbceab791206d758dcf9 Mon Sep 17 00:00:00 2001
From: ERIK <bo.jiang@daocloud.io>
Date: Mon, 5 Dec 2022 17:05:03 +0800
Subject: [PATCH] Update etcd log-level parameter name (#9540)
Signed-off-by: bo.jiang <bo.jiang@daocloud.io>
Signed-off-by: bo.jiang <bo.jiang@daocloud.io>
---
roles/etcd/templates/etcd.env.j2 | 4 ++--
.../control-plane/templates/kubeadm-config.v1beta3.yaml.j2 | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/roles/etcd/templates/etcd.env.j2 b/roles/etcd/templates/etcd.env.j2
index ec02dd1bb..18395c9b6 100644
--- a/roles/etcd/templates/etcd.env.j2
+++ b/roles/etcd/templates/etcd.env.j2
@@ -26,8 +26,8 @@ ETCD_QUOTA_BACKEND_BYTES={{ etcd_quota_backend_bytes }}
{% if etcd_max_request_bytes is defined %}
ETCD_MAX_REQUEST_BYTES={{ etcd_max_request_bytes }}
{% endif %}
-{% if etcd_log_package_levels is defined %}
-ETCD_LOG_PACKAGE_LEVELS={{ etcd_log_package_levels }}
+{% if etcd_log_level is defined %}
+ETCD_LOG_LEVEL={{ etcd_log_level }}
{% endif %}
{% if etcd_max_snapshots is defined %}
ETCD_MAX_SNAPSHOTS={{ etcd_max_snapshots }}
diff --git a/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2 b/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2
index 9f4168cf6..75ed363bb 100644
--- a/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2
+++ b/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2
@@ -65,8 +65,8 @@ etcd:
{% if etcd_max_request_bytes is defined %}
max-request-bytes: "{{ etcd_max_request_bytes }}"
{% endif %}
-{% if etcd_log_package_levels is defined %}
- log-package-levels: "{{ etcd_log_package_levels }}"
+{% if etcd_log_level is defined %}
+ log-level: "{{ etcd_log_level }}"
{% endif %}
{% for key, value in etcd_extra_vars.items() %}
{{ key }}: "{{ value }}"
--
GitLab