feat(config): update config

update config Signed-off-by: mritd <mritd@linux.com>
mritd · Jul 16, 2020 · 1dc8e5c · 1dc8e5c
1 parent ec0cb88
commit 1dc8e5c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 83 deletions.
diff --git a/etc/etcd/etcd.cluster.conf b/etc/etcd/etcd.cluster.conf
@@ -3,13 +3,10 @@ ETCD_NAME=etcd1
 ETCD_DATA_DIR="/var/lib/etcd/data"
 ETCD_WAL_DIR="/var/lib/etcd/wal"
 ETCD_SNAPSHOT_COUNT="100"
-ETCD_HEARTBEAT_INTERVAL="100"
-ETCD_ELECTION_TIMEOUT="1000"
 ETCD_LISTEN_PEER_URLS="https://172.16.10.21:2380"
 ETCD_LISTEN_CLIENT_URLS="https://172.16.10.21:2379,http://127.0.0.1:2379"
-ETCD_MAX_SNAPSHOTS="5"
-ETCD_MAX_WALS="5"
-#ETCD_CORS=""
+ETCD_QUOTA_BACKEND_BYTES="8589934592"
+ETCD_MAX_REQUEST_BYTES="10485760"
 
 # [cluster]
 ETCD_INITIAL_ADVERTISE_PEER_URLS="https://172.16.10.21:2380"
@@ -18,38 +15,20 @@ ETCD_INITIAL_CLUSTER="etcd1=https://172.16.10.21:2380,etcd2=https://172.16.10.22
 ETCD_INITIAL_CLUSTER_STATE="new"
 ETCD_INITIAL_CLUSTER_TOKEN="etcd-cluster"
 ETCD_ADVERTISE_CLIENT_URLS="https://172.16.10.21:2379"
-#ETCD_DISCOVERY=""
-#ETCD_DISCOVERY_SRV=""
-#ETCD_DISCOVERY_FALLBACK="proxy"
-#ETCD_DISCOVERY_PROXY=""
-#ETCD_STRICT_RECONFIG_CHECK="false"
-ETCD_AUTO_COMPACTION_RETENTION="24"
 
-# [proxy]
-#ETCD_PROXY="off"
-#ETCD_PROXY_FAILURE_WAIT="5000"
-#ETCD_PROXY_REFRESH_INTERVAL="30000"
-#ETCD_PROXY_DIAL_TIMEOUT="1000"
-#ETCD_PROXY_WRITE_TIMEOUT="5000"
-#ETCD_PROXY_READ_TIMEOUT="0"
+ETCD_AUTO_COMPACTION_MODE="revision"
+ETCD_AUTO_COMPACTION_RETENTION="16"
+ETCD_QUOTA_BACKEND_BYTES="5368709120"
 
 # [security]
 ETCD_CERT_FILE="/etc/etcd/ssl/etcd.pem"
 ETCD_KEY_FILE="/etc/etcd/ssl/etcd-key.pem"
-ETCD_CLIENT_CERT_AUTH="true"
 ETCD_TRUSTED_CA_FILE="/etc/etcd/ssl/etcd-root-ca.pem"
+ETCD_CLIENT_CERT_AUTH="true"
 ETCD_AUTO_TLS="true"
 ETCD_PEER_CERT_FILE="/etc/etcd/ssl/etcd.pem"
 ETCD_PEER_KEY_FILE="/etc/etcd/ssl/etcd-key.pem"
 ETCD_PEER_CLIENT_CERT_AUTH="true"
 ETCD_PEER_TRUSTED_CA_FILE="/etc/etcd/ssl/etcd-root-ca.pem"
 ETCD_PEER_AUTO_TLS="true"
 
-# [logging]
-#ETCD_DEBUG="false"
-# examples for -log-package-levels etcdserver=WARNING,security=DEBUG
-#ETCD_LOG_PACKAGE_LEVELS=""
-
-# [performance]
-ETCD_QUOTA_BACKEND_BYTES="5368709120"
-ETCD_AUTO_COMPACTION_RETENTION="3"
diff --git a/etc/etcd/etcd.conf b/etc/etcd/etcd.conf
@@ -3,13 +3,10 @@ ETCD_NAME=etcd1
 ETCD_DATA_DIR="/var/lib/etcd/data"
 ETCD_WAL_DIR="/var/lib/etcd/wal"
 ETCD_SNAPSHOT_COUNT="100"
-ETCD_HEARTBEAT_INTERVAL="100"
-ETCD_ELECTION_TIMEOUT="1000"
 ETCD_LISTEN_PEER_URLS="https://172.16.10.21:2380"
 ETCD_LISTEN_CLIENT_URLS="https://172.16.10.21:2379,http://127.0.0.1:2379"
-ETCD_MAX_SNAPSHOTS="5"
-ETCD_MAX_WALS="5"
-#ETCD_CORS=""
+ETCD_QUOTA_BACKEND_BYTES="8589934592"
+ETCD_MAX_REQUEST_BYTES="10485760"
 
 # [cluster]
 ETCD_INITIAL_ADVERTISE_PEER_URLS="https://172.16.10.21:2380"
@@ -18,38 +15,20 @@ ETCD_INITIAL_CLUSTER="etcd1=https://172.16.10.21:2380,etcd2=https://172.16.10.22
 ETCD_INITIAL_CLUSTER_STATE="new"
 ETCD_INITIAL_CLUSTER_TOKEN="etcd-cluster"
 ETCD_ADVERTISE_CLIENT_URLS="https://172.16.10.21:2379"
-#ETCD_DISCOVERY=""
-#ETCD_DISCOVERY_SRV=""
-#ETCD_DISCOVERY_FALLBACK="proxy"
-#ETCD_DISCOVERY_PROXY=""
-#ETCD_STRICT_RECONFIG_CHECK="false"
-ETCD_AUTO_COMPACTION_RETENTION="24"
 
-# [proxy]
-#ETCD_PROXY="off"
-#ETCD_PROXY_FAILURE_WAIT="5000"
-#ETCD_PROXY_REFRESH_INTERVAL="30000"
-#ETCD_PROXY_DIAL_TIMEOUT="1000"
-#ETCD_PROXY_WRITE_TIMEOUT="5000"
-#ETCD_PROXY_READ_TIMEOUT="0"
+ETCD_AUTO_COMPACTION_MODE="revision"
+ETCD_AUTO_COMPACTION_RETENTION="16"
+ETCD_QUOTA_BACKEND_BYTES="5368709120"
 
 # [security]
 ETCD_CERT_FILE="/etc/etcd/ssl/etcd.pem"
 ETCD_KEY_FILE="/etc/etcd/ssl/etcd-key.pem"
-ETCD_CLIENT_CERT_AUTH="true"
 ETCD_TRUSTED_CA_FILE="/etc/etcd/ssl/etcd-root-ca.pem"
+ETCD_CLIENT_CERT_AUTH="true"
 ETCD_AUTO_TLS="true"
 ETCD_PEER_CERT_FILE="/etc/etcd/ssl/etcd.pem"
 ETCD_PEER_KEY_FILE="/etc/etcd/ssl/etcd-key.pem"
 ETCD_PEER_CLIENT_CERT_AUTH="true"
 ETCD_PEER_TRUSTED_CA_FILE="/etc/etcd/ssl/etcd-root-ca.pem"
 ETCD_PEER_AUTO_TLS="true"
 
-# [logging]
-#ETCD_DEBUG="false"
-# examples for -log-package-levels etcdserver=WARNING,security=DEBUG
-#ETCD_LOG_PACKAGE_LEVELS=""
-
-# [performance]
-ETCD_QUOTA_BACKEND_BYTES="5368709120"
-ETCD_AUTO_COMPACTION_RETENTION="3"
diff --git a/etc/etcd/etcd.single.conf b/etc/etcd/etcd.single.conf
@@ -3,35 +3,11 @@ ETCD_NAME=etcd
 ETCD_DATA_DIR="/var/lib/etcd/data"
 ETCD_WAL_DIR="/var/lib/etcd/wal"
 ETCD_SNAPSHOT_COUNT="100"
-ETCD_HEARTBEAT_INTERVAL="100"
-ETCD_ELECTION_TIMEOUT="1000"
 ETCD_LISTEN_PEER_URLS="https://172.16.10.21:2380"
 ETCD_LISTEN_CLIENT_URLS="https://172.16.10.21:2379,http://127.0.0.1:2379"
-ETCD_MAX_SNAPSHOTS="5"
-ETCD_MAX_WALS="5"
-#ETCD_CORS=""
 
 # [cluster]
-#ETCD_INITIAL_ADVERTISE_PEER_URLS="https://172.16.10.21:2380"
-# if you use different ETCD_NAME (e.g. test), set ETCD_INITIAL_CLUSTER value for this name, i.e. "test=http://..."
-#ETCD_INITIAL_CLUSTER="etcd1=https://172.16.10.21:2380,etcd2=https://172.16.10.22:2380,etcd3=https://172.16.10.23:2380"
-#ETCD_INITIAL_CLUSTER_STATE="new"
-#ETCD_INITIAL_CLUSTER_TOKEN="etcd-cluster"
 ETCD_ADVERTISE_CLIENT_URLS="https://172.16.10.21:2379"
-#ETCD_DISCOVERY=""
-#ETCD_DISCOVERY_SRV=""
-#ETCD_DISCOVERY_FALLBACK="proxy"
-#ETCD_DISCOVERY_PROXY=""
-#ETCD_STRICT_RECONFIG_CHECK="false"
-#ETCD_AUTO_COMPACTION_RETENTION="0"
-
-# [proxy]
-#ETCD_PROXY="off"
-#ETCD_PROXY_FAILURE_WAIT="5000"
-#ETCD_PROXY_REFRESH_INTERVAL="30000"
-#ETCD_PROXY_DIAL_TIMEOUT="1000"
-#ETCD_PROXY_WRITE_TIMEOUT="5000"
-#ETCD_PROXY_READ_TIMEOUT="0"
 
 # [security]
 ETCD_CERT_FILE="/etc/etcd/ssl/etcd.pem"
@@ -44,8 +20,3 @@ ETCD_PEER_KEY_FILE="/etc/etcd/ssl/etcd-key.pem"
 ETCD_PEER_CLIENT_CERT_AUTH="true"
 ETCD_PEER_TRUSTED_CA_FILE="/etc/etcd/ssl/etcd-root-ca.pem"
 ETCD_PEER_AUTO_TLS="true"
-
-# [logging]
-#ETCD_DEBUG="false"
-# examples for -log-package-levels etcdserver=WARNING,security=DEBUG
-#ETCD_LOG_PACKAGE_LEVELS=""