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

---
 .vuepress/config.js                                 |   9 ++++++++-
 .vuepress/theme/layouts/Layout.vue                  |   2 +-
 learning/README.md                                  |   3 ++-
 .../image-20190721154650916.jpg                     | Bin
 .../image-20190722162249531.png                     | Bin
 .../image-20190723105809872.png                     | Bin
 .../image-20190731221630097.png                     | Bin
 .../image-20190731230110206.png                     | Bin
 .../image-20190809173443557.png                     | Bin
 .../image-20190809220543742.png                     | Bin
 .../overview}/kuboard-view-of-k8s.md                |   0
 overview/README.md                                  |   2 +-
 12 files changed, 12 insertions(+), 4 deletions(-)
 rename {articles/201908 => micro-service/overview}/kuboard-view-of-k8s.assets/image-20190721154650916.jpg (100%)
 rename {articles/201908 => micro-service/overview}/kuboard-view-of-k8s.assets/image-20190722162249531.png (100%)
 rename {articles/201908 => micro-service/overview}/kuboard-view-of-k8s.assets/image-20190723105809872.png (100%)
 rename {articles/201908 => micro-service/overview}/kuboard-view-of-k8s.assets/image-20190731221630097.png (100%)
 rename {articles/201908 => micro-service/overview}/kuboard-view-of-k8s.assets/image-20190731230110206.png (100%)
 rename {articles/201908 => micro-service/overview}/kuboard-view-of-k8s.assets/image-20190809173443557.png (100%)
 rename {articles/201908 => micro-service/overview}/kuboard-view-of-k8s.assets/image-20190809220543742.png (100%)
 rename {articles/201908 => micro-service/overview}/kuboard-view-of-k8s.md (100%)

diff --git a/.vuepress/config.js b/.vuepress/config.js
index 7331723..36d6ee3 100644
--- a/.vuepress/config.js
+++ b/.vuepress/config.js
@@ -67,7 +67,7 @@ module.exports = {
       { text: '安装', link: '/install/install-dashboard' },
       { text: '学习', link: '/learning/' },
       { text: '使用', link: '/guide/' },
-      { text: '微服务', link: '/micro-service/spring-cloud/' },
+      { text: '微服务', link: '/micro-service/overview/kuboard-view-of-k8s.html' },
       { text: '博客', link: 'https://blog.kuboard.cn/compaign' }
       // { text: 'DevOps', link: '/devops/' }
     ],
@@ -239,6 +239,13 @@ module.exports = {
       ],
 
       '/micro-service/': [
+        {
+          title: '概述',
+          collapsable: false,
+          children: [
+            'overview/kuboard-view-of-k8s'
+          ]
+        },
         {
           title: 'Spring Cloud',
           collapsable: false,
diff --git a/.vuepress/theme/layouts/Layout.vue b/.vuepress/theme/layouts/Layout.vue
index 42c416b..f22eec1 100644
--- a/.vuepress/theme/layouts/Layout.vue
+++ b/.vuepress/theme/layouts/Layout.vue
@@ -15,7 +15,7 @@
           <a href="/guide/" class="nav-link">使用</a>
         </div>
         <div class="side-nav-item" :style="activeLinkStyle('/micro-service/')">
-          <a href="/micro-service/spring-cloud/" class="nav-link">微服务</a>
+          <a href="/micro-service/overview/kuboard-view-of-k8s.html" 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>
diff --git a/learning/README.md b/learning/README.md
index 66e32c1..f15e003 100644
--- a/learning/README.md
+++ b/learning/README.md
@@ -14,8 +14,9 @@ description: Kubernetes 学习路径推荐
   * [6. 复习Kubernetes核心概念](/learning/k8s-basics/k8s-core-concepts.html) (10分钟)
 
 ## **Kubernetes 进阶**
-  * [从微服务视角理解 Kubernetes](/articles/201908/kuboard-view-of-k8s.html)
   * [通过互联网访问您的应用](/learning/k8s-intermediate/ingress.html)
+  * [使用 ConfigMap 配置您的应用程序](/learning/k8s-intermediate/config-map.html)
+
 
 ## **课程推荐**
 
diff --git a/articles/201908/kuboard-view-of-k8s.assets/image-20190721154650916.jpg b/micro-service/overview/kuboard-view-of-k8s.assets/image-20190721154650916.jpg
similarity index 100%
rename from articles/201908/kuboard-view-of-k8s.assets/image-20190721154650916.jpg
rename to micro-service/overview/kuboard-view-of-k8s.assets/image-20190721154650916.jpg
diff --git a/articles/201908/kuboard-view-of-k8s.assets/image-20190722162249531.png b/micro-service/overview/kuboard-view-of-k8s.assets/image-20190722162249531.png
similarity index 100%
rename from articles/201908/kuboard-view-of-k8s.assets/image-20190722162249531.png
rename to micro-service/overview/kuboard-view-of-k8s.assets/image-20190722162249531.png
diff --git a/articles/201908/kuboard-view-of-k8s.assets/image-20190723105809872.png b/micro-service/overview/kuboard-view-of-k8s.assets/image-20190723105809872.png
similarity index 100%
rename from articles/201908/kuboard-view-of-k8s.assets/image-20190723105809872.png
rename to micro-service/overview/kuboard-view-of-k8s.assets/image-20190723105809872.png
diff --git a/articles/201908/kuboard-view-of-k8s.assets/image-20190731221630097.png b/micro-service/overview/kuboard-view-of-k8s.assets/image-20190731221630097.png
similarity index 100%
rename from articles/201908/kuboard-view-of-k8s.assets/image-20190731221630097.png
rename to micro-service/overview/kuboard-view-of-k8s.assets/image-20190731221630097.png
diff --git a/articles/201908/kuboard-view-of-k8s.assets/image-20190731230110206.png b/micro-service/overview/kuboard-view-of-k8s.assets/image-20190731230110206.png
similarity index 100%
rename from articles/201908/kuboard-view-of-k8s.assets/image-20190731230110206.png
rename to micro-service/overview/kuboard-view-of-k8s.assets/image-20190731230110206.png
diff --git a/articles/201908/kuboard-view-of-k8s.assets/image-20190809173443557.png b/micro-service/overview/kuboard-view-of-k8s.assets/image-20190809173443557.png
similarity index 100%
rename from articles/201908/kuboard-view-of-k8s.assets/image-20190809173443557.png
rename to micro-service/overview/kuboard-view-of-k8s.assets/image-20190809173443557.png
diff --git a/articles/201908/kuboard-view-of-k8s.assets/image-20190809220543742.png b/micro-service/overview/kuboard-view-of-k8s.assets/image-20190809220543742.png
similarity index 100%
rename from articles/201908/kuboard-view-of-k8s.assets/image-20190809220543742.png
rename to micro-service/overview/kuboard-view-of-k8s.assets/image-20190809220543742.png
diff --git a/articles/201908/kuboard-view-of-k8s.md b/micro-service/overview/kuboard-view-of-k8s.md
similarity index 100%
rename from articles/201908/kuboard-view-of-k8s.md
rename to micro-service/overview/kuboard-view-of-k8s.md
diff --git a/overview/README.md b/overview/README.md
index e17bf0a..a95f343 100644
--- a/overview/README.md
+++ b/overview/README.md
@@ -123,8 +123,8 @@ Kuboard 为 Kubernetes 初学者设计了如下学习路径：
   * [6. 复习Kubernetes核心概念](/learning/k8s-basics/k8s-core-concepts.html) (10分钟)
 
 * **Kubernetes 进阶**
-  * [从微服务视角理解 Kubernetes](/articles/201908/kuboard-view-of-k8s.html)
   * [通过互联网访问您的应用](/learning/k8s-intermediate/ingress.html)
+  * [使用 ConfigMap 配置您的应用程序](/learning/k8s-intermediate/config-map.html)
   * 进阶路线一
     * 在实际项目中锻炼，完成各种与微服务、容器化、Kubernetes更多高级功能的学习、理解和应用
     * **适合人群：** 身边有人带路，并且技术功底比较强的人，能够自行翻阅大量 docker / kubernetes 的官网英文资料。这些人在完成上面的 Kubernetes 入门教程之后，基本上可以在项目中开始实战了。