From 08cfeba0ddcf785fe29d63875ce6a7c33a26b8fd Mon Sep 17 00:00:00 2001
From: "huanqing.shao" <shaohq@foxmail.com>
Date: Mon, 26 Aug 2019 10:01:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vuepress/config.js                           |  30 ++++++++++--------
 .vuepress/public/robots.txt                   |   2 ++
 .vuepress/theme/layouts/Layout.vue            |   7 ++--
 .../image-20190822165220992.png               | Bin
 .../image-20190822165351264.png               | Bin
 .../image-20190822165722298.png               | Bin
 .../image-20190822170407368.png               | Bin
 .../image-20190822171013606.png               | Bin
 .../deploy-app.assets/module_02_first_app.svg |   0
 .../k8s-basics/deploy-app.md                  |   0
 .../image-20190822172329141.png               | Bin
 .../image-20190822172457417.png               | Bin
 .../explore.assets/module_03_nodes.svg        |   0
 .../explore.assets/module_03_pods.svg         |   0
 .../k8s-basics/explore.md                     |   0
 .../expose.assets/image-20190822211807469.png | Bin
 .../expose.assets/module_04_labels.svg        |   0
 .../expose.assets/module_04_services.svg      |   0
 .../prepare => learning}/k8s-basics/expose.md |   0
 learning/k8s-basics/ingress.md                |  11 +++++++
 .../kubernetes-basics.assets/module_01.svg    |   0
 .../module_01_cluster.svg                     |   0
 .../k8s-basics/kubernetes-basics.md           |   0
 .../scale.assets/image-20190822213532132.png  | Bin
 .../scale.assets/image-20190822213709967.png  | Bin
 .../scale.assets/module_05_scaling1.svg       |   0
 .../scale.assets/module_05_scaling2.svg       |   0
 .../prepare => learning}/k8s-basics/scale.md  |   0
 .../update.assets/image-20190822214324429.png | Bin
 .../update.assets/image-20190822214503847.png | Bin
 .../module_06_rollingupdates1.svg             |   0
 .../module_06_rollingupdates2.svg             |   0
 .../module_06_rollingupdates3.svg             |   0
 .../module_06_rollingupdates4.svg             |   0
 .../prepare => learning}/k8s-basics/update.md |   0
 overview/README.md                            |  12 +++----
 36 files changed, 41 insertions(+), 21 deletions(-)
 create mode 100644 .vuepress/public/robots.txt
 rename {micro-service/prepare => learning}/k8s-basics/deploy-app.assets/image-20190822165220992.png (100%)
 rename {micro-service/prepare => learning}/k8s-basics/deploy-app.assets/image-20190822165351264.png (100%)
 rename {micro-service/prepare => learning}/k8s-basics/deploy-app.assets/image-20190822165722298.png (100%)
 rename {micro-service/prepare => learning}/k8s-basics/deploy-app.assets/image-20190822170407368.png (100%)
 rename {micro-service/prepare => learning}/k8s-basics/deploy-app.assets/image-20190822171013606.png (100%)
 rename {micro-service/prepare => learning}/k8s-basics/deploy-app.assets/module_02_first_app.svg (100%)
 rename {micro-service/prepare => learning}/k8s-basics/deploy-app.md (100%)
 rename {micro-service/prepare => learning}/k8s-basics/explore.assets/image-20190822172329141.png (100%)
 rename {micro-service/prepare => learning}/k8s-basics/explore.assets/image-20190822172457417.png (100%)
 rename {micro-service/prepare => learning}/k8s-basics/explore.assets/module_03_nodes.svg (100%)
 rename {micro-service/prepare => learning}/k8s-basics/explore.assets/module_03_pods.svg (100%)
 rename {micro-service/prepare => learning}/k8s-basics/explore.md (100%)
 rename {micro-service/prepare => learning}/k8s-basics/expose.assets/image-20190822211807469.png (100%)
 rename {micro-service/prepare => learning}/k8s-basics/expose.assets/module_04_labels.svg (100%)
 rename {micro-service/prepare => learning}/k8s-basics/expose.assets/module_04_services.svg (100%)
 rename {micro-service/prepare => learning}/k8s-basics/expose.md (100%)
 create mode 100644 learning/k8s-basics/ingress.md
 rename {micro-service/prepare => learning}/k8s-basics/kubernetes-basics.assets/module_01.svg (100%)
 rename {micro-service/prepare => learning}/k8s-basics/kubernetes-basics.assets/module_01_cluster.svg (100%)
 rename {micro-service/prepare => learning}/k8s-basics/kubernetes-basics.md (100%)
 rename {micro-service/prepare => learning}/k8s-basics/scale.assets/image-20190822213532132.png (100%)
 rename {micro-service/prepare => learning}/k8s-basics/scale.assets/image-20190822213709967.png (100%)
 rename {micro-service/prepare => learning}/k8s-basics/scale.assets/module_05_scaling1.svg (100%)
 rename {micro-service/prepare => learning}/k8s-basics/scale.assets/module_05_scaling2.svg (100%)
 rename {micro-service/prepare => learning}/k8s-basics/scale.md (100%)
 rename {micro-service/prepare => learning}/k8s-basics/update.assets/image-20190822214324429.png (100%)
 rename {micro-service/prepare => learning}/k8s-basics/update.assets/image-20190822214503847.png (100%)
 rename {micro-service/prepare => learning}/k8s-basics/update.assets/module_06_rollingupdates1.svg (100%)
 rename {micro-service/prepare => learning}/k8s-basics/update.assets/module_06_rollingupdates2.svg (100%)
 rename {micro-service/prepare => learning}/k8s-basics/update.assets/module_06_rollingupdates3.svg (100%)
 rename {micro-service/prepare => learning}/k8s-basics/update.assets/module_06_rollingupdates4.svg (100%)
 rename {micro-service/prepare => learning}/k8s-basics/update.md (100%)

diff --git a/.vuepress/config.js b/.vuepress/config.js
index 6a8e078..fb34862 100644
--- a/.vuepress/config.js
+++ b/.vuepress/config.js
@@ -55,9 +55,10 @@ module.exports = {
     nav: [
       { text: '简介', link: '/overview/' },
       { text: '安装', link: '/install/install-dashboard' },
+      { text: '学习', link: '/learning/k8s-basics/kubernetes-basics.html' },
       { text: '使用', link: '/guide/' },
       { text: '微服务', link: '/micro-service/spring-cloud/' },
-      { text: '有奖征文', link: 'https://blog.kuboard.cn/compaign' }
+      { text: '博客', link: 'https://blog.kuboard.cn/compaign' }
       // { text: 'DevOps', link: '/devops/' }
     ],
     displayAllHeaders: false,
@@ -146,6 +147,21 @@ module.exports = {
         }
       ],
 
+      '/learning/': [
+        {
+          title: 'Kubernetes 入门',
+          collapsable: false,
+          children: [
+            'k8s-basics/kubernetes-basics',
+            'k8s-basics/deploy-app',
+            'k8s-basics/explore',
+            'k8s-basics/expose',
+            'k8s-basics/scale',
+            'k8s-basics/update'
+          ]
+        },
+      ],
+
       '/guide/': [
         {
           title: '概述',
@@ -204,18 +220,6 @@ module.exports = {
       ],
 
       '/micro-service/': [
-        {
-          title: 'Kubernetes 入门',
-          collapsable: false,
-          children: [
-            'prepare/k8s-basics/kubernetes-basics',
-            'prepare/k8s-basics/deploy-app',
-            'prepare/k8s-basics/explore',
-            'prepare/k8s-basics/expose',
-            'prepare/k8s-basics/scale',
-            'prepare/k8s-basics/update'
-          ]
-        },
         {
           title: 'Spring Cloud',
           collapsable: false,
diff --git a/.vuepress/public/robots.txt b/.vuepress/public/robots.txt
new file mode 100644
index 0000000..c2a49f4
--- /dev/null
+++ b/.vuepress/public/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Allow: /
diff --git a/.vuepress/theme/layouts/Layout.vue b/.vuepress/theme/layouts/Layout.vue
index 8ebc0b3..89a09f1 100644
--- a/.vuepress/theme/layouts/Layout.vue
+++ b/.vuepress/theme/layouts/Layout.vue
@@ -8,6 +8,9 @@
         <div class="side-nav-item" :style="activeLinkStyle('/install/')">
           <a href="/install/install-dashboard.html" class="nav-link router-link-exact-active router-link-active">安装</a>
         </div>
+        <div class="side-nav-item" :style="activeLinkStyle('/learning/')">
+          <a href="/learning/k8s-basics/kubernetes-basics.html" class="nav-link router-link-exact-active router-link-active">学习</a>
+        </div>
         <div class="side-nav-item" :style="activeLinkStyle('/guide/')">
           <a href="/guide/" class="nav-link">使用</a>
         </div>
@@ -15,7 +18,7 @@
           <a href="/micro-service/spring-cloud/" class="nav-link">微服务</a>
         </div>
         <div class="side-nav-item" :style="activeLinkStyle('/noactive/')">
-          <a href="https://blog.kuboard.cn/compaign/" target="_blank" class="nav-link">有奖征文</a>
+          <a href="https://blog.kuboard.cn/compaign/" target="_blank" class="nav-link">博客</a>
         </div>
         <!-- <div class="side-nav-item" :style="activeLinkStyle('/support/')">
           <a href="/support/" class="nav-link">支持</a>
@@ -60,7 +63,7 @@ export default {
 }
 .side-nav-item {
   margin-bottom: -2px;
-  margin-left: 15px;
+  margin-left: 10px;
   display: inline-block;
   line-height: 1.4rem;
   white-space: nowrap;
diff --git a/micro-service/prepare/k8s-basics/deploy-app.assets/image-20190822165220992.png b/learning/k8s-basics/deploy-app.assets/image-20190822165220992.png
similarity index 100%
rename from micro-service/prepare/k8s-basics/deploy-app.assets/image-20190822165220992.png
rename to learning/k8s-basics/deploy-app.assets/image-20190822165220992.png
diff --git a/micro-service/prepare/k8s-basics/deploy-app.assets/image-20190822165351264.png b/learning/k8s-basics/deploy-app.assets/image-20190822165351264.png
similarity index 100%
rename from micro-service/prepare/k8s-basics/deploy-app.assets/image-20190822165351264.png
rename to learning/k8s-basics/deploy-app.assets/image-20190822165351264.png
diff --git a/micro-service/prepare/k8s-basics/deploy-app.assets/image-20190822165722298.png b/learning/k8s-basics/deploy-app.assets/image-20190822165722298.png
similarity index 100%
rename from micro-service/prepare/k8s-basics/deploy-app.assets/image-20190822165722298.png
rename to learning/k8s-basics/deploy-app.assets/image-20190822165722298.png
diff --git a/micro-service/prepare/k8s-basics/deploy-app.assets/image-20190822170407368.png b/learning/k8s-basics/deploy-app.assets/image-20190822170407368.png
similarity index 100%
rename from micro-service/prepare/k8s-basics/deploy-app.assets/image-20190822170407368.png
rename to learning/k8s-basics/deploy-app.assets/image-20190822170407368.png
diff --git a/micro-service/prepare/k8s-basics/deploy-app.assets/image-20190822171013606.png b/learning/k8s-basics/deploy-app.assets/image-20190822171013606.png
similarity index 100%
rename from micro-service/prepare/k8s-basics/deploy-app.assets/image-20190822171013606.png
rename to learning/k8s-basics/deploy-app.assets/image-20190822171013606.png
diff --git a/micro-service/prepare/k8s-basics/deploy-app.assets/module_02_first_app.svg b/learning/k8s-basics/deploy-app.assets/module_02_first_app.svg
similarity index 100%
rename from micro-service/prepare/k8s-basics/deploy-app.assets/module_02_first_app.svg
rename to learning/k8s-basics/deploy-app.assets/module_02_first_app.svg
diff --git a/micro-service/prepare/k8s-basics/deploy-app.md b/learning/k8s-basics/deploy-app.md
similarity index 100%
rename from micro-service/prepare/k8s-basics/deploy-app.md
rename to learning/k8s-basics/deploy-app.md
diff --git a/micro-service/prepare/k8s-basics/explore.assets/image-20190822172329141.png b/learning/k8s-basics/explore.assets/image-20190822172329141.png
similarity index 100%
rename from micro-service/prepare/k8s-basics/explore.assets/image-20190822172329141.png
rename to learning/k8s-basics/explore.assets/image-20190822172329141.png
diff --git a/micro-service/prepare/k8s-basics/explore.assets/image-20190822172457417.png b/learning/k8s-basics/explore.assets/image-20190822172457417.png
similarity index 100%
rename from micro-service/prepare/k8s-basics/explore.assets/image-20190822172457417.png
rename to learning/k8s-basics/explore.assets/image-20190822172457417.png
diff --git a/micro-service/prepare/k8s-basics/explore.assets/module_03_nodes.svg b/learning/k8s-basics/explore.assets/module_03_nodes.svg
similarity index 100%
rename from micro-service/prepare/k8s-basics/explore.assets/module_03_nodes.svg
rename to learning/k8s-basics/explore.assets/module_03_nodes.svg
diff --git a/micro-service/prepare/k8s-basics/explore.assets/module_03_pods.svg b/learning/k8s-basics/explore.assets/module_03_pods.svg
similarity index 100%
rename from micro-service/prepare/k8s-basics/explore.assets/module_03_pods.svg
rename to learning/k8s-basics/explore.assets/module_03_pods.svg
diff --git a/micro-service/prepare/k8s-basics/explore.md b/learning/k8s-basics/explore.md
similarity index 100%
rename from micro-service/prepare/k8s-basics/explore.md
rename to learning/k8s-basics/explore.md
diff --git a/micro-service/prepare/k8s-basics/expose.assets/image-20190822211807469.png b/learning/k8s-basics/expose.assets/image-20190822211807469.png
similarity index 100%
rename from micro-service/prepare/k8s-basics/expose.assets/image-20190822211807469.png
rename to learning/k8s-basics/expose.assets/image-20190822211807469.png
diff --git a/micro-service/prepare/k8s-basics/expose.assets/module_04_labels.svg b/learning/k8s-basics/expose.assets/module_04_labels.svg
similarity index 100%
rename from micro-service/prepare/k8s-basics/expose.assets/module_04_labels.svg
rename to learning/k8s-basics/expose.assets/module_04_labels.svg
diff --git a/micro-service/prepare/k8s-basics/expose.assets/module_04_services.svg b/learning/k8s-basics/expose.assets/module_04_services.svg
similarity index 100%
rename from micro-service/prepare/k8s-basics/expose.assets/module_04_services.svg
rename to learning/k8s-basics/expose.assets/module_04_services.svg
diff --git a/micro-service/prepare/k8s-basics/expose.md b/learning/k8s-basics/expose.md
similarity index 100%
rename from micro-service/prepare/k8s-basics/expose.md
rename to learning/k8s-basics/expose.md
diff --git a/learning/k8s-basics/ingress.md b/learning/k8s-basics/ingress.md
new file mode 100644
index 0000000..d44a068
--- /dev/null
+++ b/learning/k8s-basics/ingress.md
@@ -0,0 +1,11 @@
+---
+description: 本文介绍 Kubernetes Ingress 的概念，包括Ingress 基本概念、如何配置 Ingress Controller、如何使用 kubectl/Kuboard 操作 Ingress 信息
+---
+
+# 通过互联网访问您的应用
+
+参考文档：
+* Kubernetes 官网 [Ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/)
+* Kubernetes 官网 [Ingress Controllers](https://kubernetes.io/docs/concepts/services-networking/ingress-controllers/)
+* Kubernetes Nginx Ingress Controller [Bare-metal considerations](https://kubernetes.github.io/ingress-nginx/deploy/baremetal/)
+* nginxinc/kubernets-ingress [kubernetes-ingress](https://github.com/nginxinc/kubernetes-ingress)
diff --git a/micro-service/prepare/k8s-basics/kubernetes-basics.assets/module_01.svg b/learning/k8s-basics/kubernetes-basics.assets/module_01.svg
similarity index 100%
rename from micro-service/prepare/k8s-basics/kubernetes-basics.assets/module_01.svg
rename to learning/k8s-basics/kubernetes-basics.assets/module_01.svg
diff --git a/micro-service/prepare/k8s-basics/kubernetes-basics.assets/module_01_cluster.svg b/learning/k8s-basics/kubernetes-basics.assets/module_01_cluster.svg
similarity index 100%
rename from micro-service/prepare/k8s-basics/kubernetes-basics.assets/module_01_cluster.svg
rename to learning/k8s-basics/kubernetes-basics.assets/module_01_cluster.svg
diff --git a/micro-service/prepare/k8s-basics/kubernetes-basics.md b/learning/k8s-basics/kubernetes-basics.md
similarity index 100%
rename from micro-service/prepare/k8s-basics/kubernetes-basics.md
rename to learning/k8s-basics/kubernetes-basics.md
diff --git a/micro-service/prepare/k8s-basics/scale.assets/image-20190822213532132.png b/learning/k8s-basics/scale.assets/image-20190822213532132.png
similarity index 100%
rename from micro-service/prepare/k8s-basics/scale.assets/image-20190822213532132.png
rename to learning/k8s-basics/scale.assets/image-20190822213532132.png
diff --git a/micro-service/prepare/k8s-basics/scale.assets/image-20190822213709967.png b/learning/k8s-basics/scale.assets/image-20190822213709967.png
similarity index 100%
rename from micro-service/prepare/k8s-basics/scale.assets/image-20190822213709967.png
rename to learning/k8s-basics/scale.assets/image-20190822213709967.png
diff --git a/micro-service/prepare/k8s-basics/scale.assets/module_05_scaling1.svg b/learning/k8s-basics/scale.assets/module_05_scaling1.svg
similarity index 100%
rename from micro-service/prepare/k8s-basics/scale.assets/module_05_scaling1.svg
rename to learning/k8s-basics/scale.assets/module_05_scaling1.svg
diff --git a/micro-service/prepare/k8s-basics/scale.assets/module_05_scaling2.svg b/learning/k8s-basics/scale.assets/module_05_scaling2.svg
similarity index 100%
rename from micro-service/prepare/k8s-basics/scale.assets/module_05_scaling2.svg
rename to learning/k8s-basics/scale.assets/module_05_scaling2.svg
diff --git a/micro-service/prepare/k8s-basics/scale.md b/learning/k8s-basics/scale.md
similarity index 100%
rename from micro-service/prepare/k8s-basics/scale.md
rename to learning/k8s-basics/scale.md
diff --git a/micro-service/prepare/k8s-basics/update.assets/image-20190822214324429.png b/learning/k8s-basics/update.assets/image-20190822214324429.png
similarity index 100%
rename from micro-service/prepare/k8s-basics/update.assets/image-20190822214324429.png
rename to learning/k8s-basics/update.assets/image-20190822214324429.png
diff --git a/micro-service/prepare/k8s-basics/update.assets/image-20190822214503847.png b/learning/k8s-basics/update.assets/image-20190822214503847.png
similarity index 100%
rename from micro-service/prepare/k8s-basics/update.assets/image-20190822214503847.png
rename to learning/k8s-basics/update.assets/image-20190822214503847.png
diff --git a/micro-service/prepare/k8s-basics/update.assets/module_06_rollingupdates1.svg b/learning/k8s-basics/update.assets/module_06_rollingupdates1.svg
similarity index 100%
rename from micro-service/prepare/k8s-basics/update.assets/module_06_rollingupdates1.svg
rename to learning/k8s-basics/update.assets/module_06_rollingupdates1.svg
diff --git a/micro-service/prepare/k8s-basics/update.assets/module_06_rollingupdates2.svg b/learning/k8s-basics/update.assets/module_06_rollingupdates2.svg
similarity index 100%
rename from micro-service/prepare/k8s-basics/update.assets/module_06_rollingupdates2.svg
rename to learning/k8s-basics/update.assets/module_06_rollingupdates2.svg
diff --git a/micro-service/prepare/k8s-basics/update.assets/module_06_rollingupdates3.svg b/learning/k8s-basics/update.assets/module_06_rollingupdates3.svg
similarity index 100%
rename from micro-service/prepare/k8s-basics/update.assets/module_06_rollingupdates3.svg
rename to learning/k8s-basics/update.assets/module_06_rollingupdates3.svg
diff --git a/micro-service/prepare/k8s-basics/update.assets/module_06_rollingupdates4.svg b/learning/k8s-basics/update.assets/module_06_rollingupdates4.svg
similarity index 100%
rename from micro-service/prepare/k8s-basics/update.assets/module_06_rollingupdates4.svg
rename to learning/k8s-basics/update.assets/module_06_rollingupdates4.svg
diff --git a/micro-service/prepare/k8s-basics/update.md b/learning/k8s-basics/update.md
similarity index 100%
rename from micro-service/prepare/k8s-basics/update.md
rename to learning/k8s-basics/update.md
diff --git a/overview/README.md b/overview/README.md
index e57a7d0..5a75a4c 100644
--- a/overview/README.md
+++ b/overview/README.md
@@ -115,12 +115,12 @@ Kuboard 为 Kubernetes 初学者设计了如下学习路径：
 
 * **Kubernetes 入门**
   * [十分钟带你理解Kubernetes核心概念](./k8s-core-concepts.html)
-  * [学习Kubernetes基础知识](/micro-service/prepare/k8s-basics/kubernetes-basics.html) (10分钟)
-    * [部署第一个应用程序](/micro-service/prepare/k8s-basics/deploy-app.html) (5分钟)
-    * [查看 Pods / Nodes](/micro-service/prepare/k8s-basics/explore.html) (10分钟)
-    * [公布应用程序](/micro-service/prepare/k8s-basics/expose.html) (10分钟)
-    * [伸缩应用程序](/micro-service/prepare/k8s-basics/scale.html) (10分钟)
-    * [执行滚动更新](/micro-service/prepare/k8s-basics/update.html) (10分钟)
+  * [学习Kubernetes基础知识](/learning/k8s-basics/kubernetes-basics.html) (10分钟)
+    * [部署第一个应用程序](/learning/k8s-basics/deploy-app.html) (5分钟)
+    * [查看 Pods / Nodes](/learning/k8s-basics/explore.html) (10分钟)
+    * [公布应用程序](/learning/k8s-basics/expose.html) (10分钟)
+    * [伸缩应用程序](/learning/k8s-basics/scale.html) (10分钟)
+    * [执行滚动更新](/learning/k8s-basics/update.html) (10分钟)
 
 * **Kubernetes 进阶**
   * [从微服务视角理解 Kubernetes](/articles/201908/kuboard-view-of-k8s.html)