From 48573d1309d93da8ef233986b528c567b10cd449 Mon Sep 17 00:00:00 2001
From: zeming wang <qazwsxwzm@gmail.com>
Date: Tue, 6 Feb 2018 15:01:46 +0800
Subject: [PATCH 1/2] etcd conf update

---
 practice/etcd-cluster-installation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/practice/etcd-cluster-installation.md b/practice/etcd-cluster-installation.md
index e90b49ce9..56780540f 100644
--- a/practice/etcd-cluster-installation.md
+++ b/practice/etcd-cluster-installation.md
@@ -36,7 +36,7 @@ yum install etcd
 
 ## 创建 etcd 的 systemd unit 文件
 
-注意替换IP地址为你自己的etcd集群的主机IP。
+在/usr/lib/systemd/system/目录下创建文件etcd.service，内容如下。注意替换IP地址为你自己的etcd集群的主机IP。
 
 ``` bash
 [Unit]

From 0e4f030392275626aa0cc66ae72aa9a8c7ee8efd Mon Sep 17 00:00:00 2001
From: rootsongjc <rootsongjc@gmail.com>
Date: Tue, 6 Feb 2018 15:19:41 +0800
Subject: [PATCH 2/2] change title

---
 SUMMARY.md                          |  2 +-
 concepts/basic.md                   |  9 ---------
 concepts/pod-state-and-lifecycle.md | 11 +++++++++++
 3 files changed, 12 insertions(+), 10 deletions(-)
 delete mode 100644 concepts/basic.md
 create mode 100644 concepts/pod-state-and-lifecycle.md

diff --git a/SUMMARY.md b/SUMMARY.md
index 6d7285a5a..98afd5192 100644
--- a/SUMMARY.md
+++ b/SUMMARY.md
@@ -21,7 +21,7 @@
     - [CSI - Container Storage Interface（容器存储接口）](concepts/csi.md)
   - [Kubernetes中的网络解析——以flannel为例](concepts/networking.md)
 - [资源对象与基本概念解析](concepts/objects.md)
-  - [基本概念](concepts/basic.md)
+  - [Pod状态与生命周期管理](concepts/pod-basic.md)
     - [Pod概览](concepts/pod-overview.md)
     - [Pod解析](concepts/pod.md)
     - [Init容器](concepts/init-containers.md)
diff --git a/concepts/basic.md b/concepts/basic.md
deleted file mode 100644
index f6eed0514..000000000
--- a/concepts/basic.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# 基本概念
-
-该节将带领大家了解Kubernetes中的基本概念，尤其是作为Kubernetes中调度的最基本单位Pod。
-
-本节中包括以下内容：
-
-- 了解Pod的构成
-- Pod的生命周期
-- Pod中容器的启动顺序模板定义
\ No newline at end of file
diff --git a/concepts/pod-state-and-lifecycle.md b/concepts/pod-state-and-lifecycle.md
new file mode 100644
index 000000000..c6391d360
--- /dev/null
+++ b/concepts/pod-state-and-lifecycle.md
@@ -0,0 +1,11 @@
+# Pod状态与生命周期管理
+
+该节将带领大家了解Kubernetes中的基本概念，尤其是作为Kubernetes中调度的最基本单位Pod。
+
+本节中包括以下内容：
+
+- 了解Pod的构成
+- Pod的生命周期
+- Pod中容器的启动顺序模板定义
+
+Kubernetes中的基本组件`kube-controller-manager`就是用来控制Pod的状态和生命周期的，在了解各种controller之前我们有必要先了解下Pod本身和其生命周期。
\ No newline at end of file