diff --git a/.vuepress/components/InstallBanner.vue b/.vuepress/components/InstallBanner.vue index 12d171c..449125c 100644 --- a/.vuepress/components/InstallBanner.vue +++ b/.vuepress/components/InstallBanner.vue @@ -1,30 +1,21 @@ @@ -87,7 +84,11 @@ export default { }, envOk () { if (this.envOk) { - this.$message.success(`如果您符合刚才 ${ENV_COUNT} 个条件，请继续安装`) + this.$bvToast.toast(`如果您符合刚才 ${ENV_COUNT} 个条件，请继续安装`, { + title: '完成环境检查', + variant: 'success', + autoHideDelay: 5000, + }) this.$sendGaEvent('install-' + this.type, 'envOk-' + this.type, '已确认环境符合条件-' + this.type) } } diff --git a/.vuepress/components/PageVssue.vue b/.vuepress/components/PageVssue.vue index c111fa5..d4f1d75 100644 --- a/.vuepress/components/PageVssue.vue +++ b/.vuepress/components/PageVssue.vue @@ -3,10 +3,10 @@
- 请创建 VssueId + 请创建 VssueId
- 请填写 vusseId - {{refreshId}} + 请填写 vusseId - {{refreshId}}
diff --git a/.vuepress/components/Promotion.vue b/.vuepress/components/Promotion.vue deleted file mode 100644 index 55e7901..0000000 --- a/.vuepress/components/Promotion.vue +++ /dev/null @@ -1,72 +0,0 @@ - - - - - diff --git a/.vuepress/components/SpecialHomePage.vue b/.vuepress/components/SpecialHomePage.vue index a9354c2..30a3c52 100644 --- a/.vuepress/components/SpecialHomePage.vue +++ b/.vuepress/components/SpecialHomePage.vue @@ -67,7 +67,7 @@
- +

Kuboard

@@ -78,7 +78,7 @@
  • 无需手写 YAML
  • 安装Kuboard

    • -     +
    Kubernetes教程：Kuboard在线演示 diff --git a/.vuepress/components/StarGazer.vue b/.vuepress/components/StarGazer.vue index bf98f6c..dd4ab68 100644 --- a/.vuepress/components/StarGazer.vue +++ b/.vuepress/components/StarGazer.vue @@ -1,11 +1,13 @@ - // ['script', { type: 'text/javascript', async: true, src: "https://bot.4paradigm.com/web/assets/ics-web-sdk-js.js" }], - // ['script', { type: 'text/javascript' }, ` - // window.onload = function() { - // if (window.innerWidth > 1360) { - // console.log('init-wechat') - // IcsWebSdkJs.init('https://bot.4paradigm.com/web/chat/15516/bbc69136-e42c-4299-ba85-c57685c8417d') - // } else { - // console.log('窗口太小，不显示机器人') - // } - // }`], + ['script', { type: 'text/javascript', async: true, src: "https://bot.4paradigm.com/web/assets/ics-web-sdk-js.js" }], + ['script', { type: 'text/javascript' }, ` + window.onload = function() { + if (window.innerWidth > 1360) { + console.log('init-wechat') + IcsWebSdkJs.init('https://bot.4paradigm.com/web/chat/15516/bbc69136-e42c-4299-ba85-c57685c8417d') + } else { + console.log('窗口太小，不显示机器人') + } + }`], // diff --git a/.vuepress/enhanceApp.js b/.vuepress/enhanceApp.js index 26db5a7..6421fc3 100644 --- a/.vuepress/enhanceApp.js +++ b/.vuepress/enhanceApp.js @@ -1,8 +1,3 @@ -// import 'swiper/dist/css/swiper.css' -import 'element-ui/lib/theme-chalk/index.css' - -import Element from 'element-ui' - import 'bootstrap/dist/css/bootstrap.css' import 'bootstrap-vue/dist/bootstrap-vue.css' @@ -28,7 +23,7 @@ export default ({ router, // 当前应用的路由实例 siteData // 站点元数据 }) => { - Vue.use(Element) + Vue.use(BootstrapVue) Vue.use(VueFractionGrid, { approach: 'desktop-first', diff --git a/.vuepress/styles/index.styl b/.vuepress/styles/index.styl index 290438d..fea53f2 100644 --- a/.vuepress/styles/index.styl +++ b/.vuepress/styles/index.styl @@ -44,3 +44,25 @@ p code { box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.42); background-color: rgba(0, 0, 0, 0.25); } + +/*Bootstrap*/ +p { + margin-bottom: 0; + margin-top: 1rem; +} +a:hover { + text-decoration: none !important; +} +h4 { + font-size: 1.25rem; +} +label { + line-height: normal; +} + +.nav-item a { + padding: 0px; +} +.side-nav-item a { + padding: 2px; +} diff --git a/.vuepress/theme/components/JoinCommunity.vue b/.vuepress/theme/components/JoinCommunity.vue index 40760d8..a27f7d1 100644 --- a/.vuepress/theme/components/JoinCommunity.vue +++ b/.vuepress/theme/components/JoinCommunity.vue @@ -1,9 +1,9 @@ diff --git a/install/history-k8s/install-k8s-1.15.2.md b/install/history-k8s/install-k8s-1.15.2.md index 2a1a51f..3f5b54e 100644 --- a/install/history-k8s/install-k8s-1.15.2.md +++ b/install/history-k8s/install-k8s-1.15.2.md @@ -91,8 +91,10 @@ lscpu - kubectl / kubeadm / kubelet - - + + + + ``` sh # 在 master 节点和 worker 节点都要执行 @@ -101,8 +103,8 @@ curl -sSL https://kuboard.cn/install-script/v1.15.2/install-kubelet.sh | sh ``` - - + + 手动执行以下代码，效果与快速安装完全相同。 @@ -112,8 +114,9 @@ curl -sSL https://kuboard.cn/install-script/v1.15.2/install-kubelet.sh | sh 如果此时执行 `service status kubelet` 命令，将得到 kubelet 启动失败的错误提示，请忽略此错误，因为必须完成后续步骤中 kubeadm init 的操作，kubelet 才能正常启动 ::: - - + + + ## 初始化 master 节点 @@ -126,9 +129,9 @@ curl -sSL https://kuboard.cn/install-script/v1.15.2/install-kubelet.sh | sh * POD_SUBNET 所使用的网段不能与 ***master节点/worker节点*** 所在的网段重叠。该字段的取值为一个 CIDR 值，如果您对 CIDR 这个概念还不熟悉，请不要修改这个字段的取值 10.100.0.1/20 ::: - - - + + + ``` sh # 只在 master 节点执行 @@ -142,8 +145,8 @@ echo "${MASTER_IP} ${APISERVER_NAME}" >> /etc/hosts curl -sSL https://kuboard.cn/install-script/v1.15.2/init-master.sh | sh ``` - - + + ``` sh # 只在 master 节点执行 @@ -158,8 +161,10 @@ echo "${MASTER_IP} ${APISERVER_NAME}" >> /etc/hosts <<< @/.vuepress/public/install-script/v1.15.2/init-master.sh - - + + + + **检查 master 初始化结果** @@ -265,8 +270,9 @@ kubectl delete node demo-worker-x-x > kubernetes支持多种Ingress Controllers (traefic / Kong / Istio / Nginx 等)，本文推荐使用 https://github.com/nginxinc/kubernetes-ingress - - + + + **在 master 节点上执行** @@ -275,13 +281,15 @@ kubectl delete node demo-worker-x-x kubectl apply -f https://kuboard.cn/install-script/v1.15.2/nginx-ingress.yaml ``` - - + + + <<< @/.vuepress/public/install-script/v1.15.2/nginx-ingress.yaml - - + + + **配置域名解析** diff --git a/install/history-k8s/install-k8s-1.15.3.md b/install/history-k8s/install-k8s-1.15.3.md index 05c921b..c87966a 100644 --- a/install/history-k8s/install-k8s-1.15.3.md +++ b/install/history-k8s/install-k8s-1.15.3.md @@ -1,26 +1,26 @@ --- # layout: StepLayout description: Kubernetes 最新稳定版 v1.15.3 的快速安装文档。该文档由众多网友验证并在线提出修改意见、持续不断地更新和完善、并且通过 QQ 群提供免费在线答疑的服务。 -storyBook: - title: '使用 kubeadm 安装 kubernetes v1.15.3（单Master节点）' - initial: StoryBook - pages: - - name: introduction - title: 文档特点 - - name: overview - title: 配置要求 - - name: step1 - title: 检查环境 - - name: step2 - title: 安装 docker/kubelet - - name: step3 - title: 初始化 master 节点 - - name: step4 - title: 初始化 worker 节点 - - name: step5 - title: 安装 Ingress Controller - - name: step6 - title: 总结 +# storyBook: +# title: '使用 kubeadm 安装 kubernetes v1.15.3（单Master节点）' +# initial: StoryBook +# pages: +# - name: introduction +# title: 文档特点 +# - name: overview +# title: 配置要求 +# - name: step1 +# title: 检查环境 +# - name: step2 +# title: 安装 docker/kubelet +# - name: step3 +# title: 初始化 master 节点 +# - name: step4 +# title: 初始化 worker 节点 +# - name: step5 +# title: 安装 Ingress Controller +# - name: step6 +# title: 总结 --- # 使用 kubeadm 安装 kubernetes v1.15.3 @@ -84,8 +84,6 @@ export default { } - -
    ## 文档特点 @@ -116,8 +114,8 @@ export default {
    --> -
    -
    + ## 配置要求 @@ -153,8 +151,8 @@ export default { ::: -
    -
    + ## 检查 centos / hostname @@ -194,22 +192,6 @@ echo "127.0.0.1 $(hostname)" >> /etc/hosts ``` ::: -
    -
    - - - -
  • 我的任意节点 centos 版本在兼容列表中
    • -
  • 我的任意节点 hostname 不是 localhost
    • -
  • 我的任意节点 CPU 内核数量大于等于 2
    • -     -     -     -
    - -
    - -
    ## 安装 docker / kubelet @@ -218,8 +200,11 @@ echo "127.0.0.1 $(hostname)" >> /etc/hosts - nfs-utils - kubectl / kubeadm / kubelet - - + + + + + ``` sh # 在 master 节点和 worker 节点都要执行 @@ -228,8 +213,8 @@ curl -sSL https://kuboard.cn/install-script/v1.15.3/install-kubelet.sh | sh ``` - - + + 手动执行以下代码，效果与快速安装完全相同。 @@ -239,12 +224,13 @@ curl -sSL https://kuboard.cn/install-script/v1.15.3/install-kubelet.sh | sh 如果此时执行 `service status kubelet` 命令，将得到 kubelet 启动失败的错误提示，请忽略此错误，因为必须完成后续步骤中 kubeadm init 的操作，kubelet 才能正常启动 ::: - - + + + -
    + ## 初始化 master 节点 @@ -257,9 +243,9 @@ curl -sSL https://kuboard.cn/install-script/v1.15.3/install-kubelet.sh | sh * POD_SUBNET 所使用的网段不能与 ***master节点/worker节点*** 所在的网段重叠。该字段的取值为一个 CIDR 值，如果您对 CIDR 这个概念还不熟悉，请不要修改这个字段的取值 10.100.0.1/20 ::: - - - + + + ``` sh # 只在 master 节点执行 @@ -274,8 +260,8 @@ echo "${MASTER_IP} ${APISERVER_NAME}" >> /etc/hosts curl -sSL https://kuboard.cn/install-script/v1.15.3/init-master.sh | sh ``` - - + + ``` sh # 只在 master 节点执行 @@ -293,10 +279,9 @@ echo "${MASTER_IP} ${APISERVER_NAME}" >> /etc/hosts ::: - - - - + + + **检查 master 初始化结果** @@ -310,9 +295,9 @@ watch kubectl get pod -n kube-system -o wide kubectl get nodes ``` - + ## 初始化 worker节点 @@ -391,15 +376,15 @@ kubectl delete node demo-worker-x-x * worker 节点的名字可以通过在节点 demo-master-a-1 上执行 kubectl get nodes 命令获得 ::: - + ## 安装 Ingress Controller - - - + + + **在 master 节点上执行** @@ -408,8 +393,8 @@ kubectl delete node demo-worker-x-x kubectl apply -f https://kuboard.cn/install-script/v1.15.3/nginx-ingress.yaml ``` - - + + **在 master 节点上执行** @@ -422,14 +407,15 @@ kubectl delete -f https://kuboard.cn/install-script/v1.15.3/nginx-ingress.yaml ``` - - + + <<< @/.vuepress/public/install-script/v1.15.3/nginx-ingress.yaml - - + + + **配置域名解析** @@ -451,9 +437,9 @@ kubectl delete -f https://kuboard.cn/install-script/v1.15.3/nginx-ingress.yaml ::: - + ## 下一步 @@ -473,5 +459,5 @@ kubectl delete -f https://kuboard.cn/install-script/v1.15.3/nginx-ingress.yaml ::: - - + diff --git a/install/history-k8s/install-k8s-1.15.4.md b/install/history-k8s/install-k8s-1.15.4.md index 8904c0f..2b572cc 100644 --- a/install/history-k8s/install-k8s-1.15.4.md +++ b/install/history-k8s/install-k8s-1.15.4.md @@ -2,26 +2,26 @@ vssueId: 93 # layout: StepLayout description: Kubernetes 最新稳定版 v1.15.4 的快速安装文档。该文档由众多网友验证并在线提出修改意见、持续不断地更新和完善、并且通过 QQ 群提供免费在线答疑的服务。 -storyBook: - title: '使用 kubeadm 安装 kubernetes v1.15.4（单Master节点）' - initial: StoryBook - pages: - - name: introduction - title: 文档特点 - - name: overview - title: 配置要求 - - name: step1 - title: 检查环境 - - name: step2 - title: 安装 docker/kubelet - - name: step3 - title: 初始化 master 节点 - - name: step4 - title: 初始化 worker 节点 - - name: step5 - title: 安装 Ingress Controller - - name: step6 - title: 总结 +# storyBook: +# title: '使用 kubeadm 安装 kubernetes v1.15.4（单Master节点）' +# initial: StoryBook +# pages: +# - name: introduction +# title: 文档特点 +# - name: overview +# title: 配置要求 +# - name: step1 +# title: 检查环境 +# - name: step2 +# title: 安装 docker/kubelet +# - name: step3 +# title: 初始化 master 节点 +# - name: step4 +# title: 初始化 worker 节点 +# - name: step5 +# title: 安装 Ingress Controller +# - name: step6 +# title: 总结 --- # 使用 kubeadm 安装 kubernetes v1.15.4 @@ -85,8 +85,6 @@ export default { } - -
    ## 文档特点 @@ -117,8 +115,8 @@ export default {
    --> - -
    + ## 配置要求 @@ -155,8 +153,8 @@ export default { ::: -
    -
    + ## 检查 centos / hostname @@ -196,22 +194,6 @@ echo "127.0.0.1 $(hostname)" >> /etc/hosts ``` ::: -
    -
    - - - -
  • 我的任意节点 centos 版本在兼容列表中
    • -
  • 我的任意节点 hostname 不是 localhost
    • -
  • 我的任意节点 CPU 内核数量大于等于 2
    • -     -     -     -
    - -
    - -
    ## 安装 docker / kubelet @@ -220,8 +202,11 @@ echo "127.0.0.1 $(hostname)" >> /etc/hosts - nfs-utils - kubectl / kubeadm / kubelet - - + + + + + ``` sh # 在 master 节点和 worker 节点都要执行 @@ -230,8 +215,8 @@ curl -sSL https://kuboard.cn/install-script/v1.15.4/install-kubelet.sh | sh ``` - - + + 手动执行以下代码，效果与快速安装完全相同。 @@ -241,12 +226,13 @@ curl -sSL https://kuboard.cn/install-script/v1.15.4/install-kubelet.sh | sh 如果此时执行 `service status kubelet` 命令，将得到 kubelet 启动失败的错误提示，请忽略此错误，因为必须完成后续步骤中 kubeadm init 的操作，kubelet 才能正常启动 ::: - - + + + -
    + ## 初始化 master 节点 @@ -259,8 +245,9 @@ curl -sSL https://kuboard.cn/install-script/v1.15.4/install-kubelet.sh | sh * POD_SUBNET 所使用的网段不能与 ***master节点/worker节点*** 所在的网段重叠。该字段的取值为一个 CIDR 值，如果您对 CIDR 这个概念还不熟悉，请不要修改这个字段的取值 10.100.0.1/20 ::: - - + + + ``` sh # 只在 master 节点执行 @@ -275,8 +262,8 @@ echo "${MASTER_IP} ${APISERVER_NAME}" >> /etc/hosts curl -sSL https://kuboard.cn/install-script/v1.15.4/init-master.sh | sh ``` - - + + ``` sh # 只在 master 节点执行 @@ -292,9 +279,9 @@ echo "${MASTER_IP} ${APISERVER_NAME}" >> /etc/hosts <<< @/.vuepress/public/install-script/v1.15.4/init-master.sh - - - + + + **检查 master 初始化结果** @@ -308,9 +295,9 @@ watch kubectl get pod -n kube-system -o wide kubectl get nodes -o wide ``` - + ## 初始化 worker节点 @@ -389,14 +376,15 @@ kubectl delete node demo-worker-x-x * worker 节点的名字可以通过在节点 demo-master-a-1 上执行 kubectl get nodes 命令获得 ::: - + ## 安装 Ingress Controller - - + + + **在 master 节点上执行** @@ -405,8 +393,9 @@ kubectl delete node demo-worker-x-x kubectl apply -f https://kuboard.cn/install-script/v1.15.4/nginx-ingress.yaml ``` - - + + + **在 master 节点上执行** @@ -417,13 +406,15 @@ kubectl apply -f https://kuboard.cn/install-script/v1.15.4/nginx-ingress.yaml kubectl delete -f https://kuboard.cn/install-script/v1.15.4/nginx-ingress.yaml ``` - - + + <<< @/.vuepress/public/install-script/v1.15.4/nginx-ingress.yaml - - + + + + **配置域名解析** @@ -445,9 +436,9 @@ kubectl delete -f https://kuboard.cn/install-script/v1.15.4/nginx-ingress.yaml ::: - + ## 下一步 @@ -467,5 +458,5 @@ kubectl delete -f https://kuboard.cn/install-script/v1.15.4/nginx-ingress.yaml ::: - -     + diff --git a/install/history-k8s/install-k8s-1.16.0.md b/install/history-k8s/install-k8s-1.16.0.md index 941387a..a40c2b3 100644 --- a/install/history-k8s/install-k8s-1.16.0.md +++ b/install/history-k8s/install-k8s-1.16.0.md @@ -29,87 +29,6 @@ meta: # 使用kubeadm安装kubernetes_v1.16.0 - - - @@ -262,42 +181,7 @@ echo "127.0.0.1 $(hostname)" >> /etc/hosts ## 安装 docker / kubelet - -
    - - - - -
    - -::: danger 必须选中下面的四个勾选框才能继续 -* 选中后显示 **安装 docker/kubelet 的文档** - -
    - - - -
  • 我的任意节点 centos 版本在兼容列表中
    • -
  • 我的任意节点 hostname 不是 localhost，且不包含下划线
    • -
  • 我的任意节点 CPU 内核数量大于等于 2
    • -
  • 我的任意节点不会直接使用 docker run 或 docker-compose 运行容器
    • -     -     -     -
    -::: - -
    - -     - - - -     - -
    - -
    + 使用 root 身份在所有节点执行如下代码，以安装软件： - docker @@ -305,8 +189,10 @@ echo "127.0.0.1 $(hostname)" >> /etc/hosts - kubectl / kubeadm / kubelet - - + + + + ``` sh # 在 master 节点和 worker 节点都要执行 @@ -315,8 +201,8 @@ curl -sSL https://kuboard.cn/install-script/v1.16.0/install_kubelet.sh | sh ``` - - + + 手动执行以下代码，效果与快速安装完全相同。 @@ -326,11 +212,11 @@ curl -sSL https://kuboard.cn/install-script/v1.16.0/install_kubelet.sh | sh 如果此时执行 `service status kubelet` 命令，将得到 kubelet 启动失败的错误提示，请忽略此错误，因为必须完成后续步骤中 kubeadm init 的操作，kubelet 才能正常启动 ::: - - + + + -
    -     + @@ -348,8 +234,9 @@ curl -sSL https://kuboard.cn/install-script/v1.16.0/install_kubelet.sh | sh * **POD_SUBNET** 所使用的网段不能与 ***master节点/worker节点*** 所在的网段重叠。该字段的取值为一个 CIDR 值，如果您对 CIDR 这个概念还不熟悉，请仍然执行 export POD_SUBNET=10.100.0.1/16 命令，不做修改 ::: - - + + + ``` sh # 只在 master 节点执行 @@ -363,8 +250,9 @@ export POD_SUBNET=10.100.0.1/16 echo "${MASTER_IP} ${APISERVER_NAME}" >> /etc/hosts curl -sSL https://kuboard.cn/install-script/v1.16.0/init_master.sh | sh ``` - - + + + ``` sh # 只在 master 节点执行 @@ -380,8 +268,9 @@ echo "${MASTER_IP} ${APISERVER_NAME}" >> /etc/hosts <<< @/.vuepress/public/install-script/v1.16.0/init_master.sh - - + + + **检查 master 初始化结果** @@ -484,9 +373,9 @@ kubectl delete node demo-worker-x-x ## 安装 Ingress Controller - - - + + + **在 master 节点上执行** @@ -495,8 +384,9 @@ kubectl delete node demo-worker-x-x kubectl apply -f https://kuboard.cn/install-script/v1.16.0/nginx-ingress.yaml ``` - - + + + **在 master 节点上执行** @@ -507,14 +397,15 @@ kubectl apply -f https://kuboard.cn/install-script/v1.16.0/nginx-ingress.yaml kubectl delete -f https://kuboard.cn/install-script/v1.16.0/nginx-ingress.yaml ``` - - + + <<< @/.vuepress/public/install-script/v1.16.0/nginx-ingress.yaml - - + + + **配置域名解析** diff --git a/install/history-k8s/install-k8s-1.16.1.md b/install/history-k8s/install-k8s-1.16.1.md index 56fba7e..69552e7 100644 --- a/install/history-k8s/install-k8s-1.16.1.md +++ b/install/history-k8s/install-k8s-1.16.1.md @@ -197,8 +197,10 @@ echo "127.0.0.1 $(hostname)" >> /etc/hosts - kubectl / kubeadm / kubelet - - + + + + ``` sh # 在 master 节点和 worker 节点都要执行 @@ -207,8 +209,8 @@ curl -sSL https://kuboard.cn/install-script/v1.16.1/install_kubelet.sh | sh ``` - - + + 手动执行以下代码，效果与快速安装完全相同。 @@ -218,8 +220,9 @@ curl -sSL https://kuboard.cn/install-script/v1.16.1/install_kubelet.sh | sh 如果此时执行 `service status kubelet` 命令，将得到 kubelet 启动失败的错误提示，请忽略此错误，因为必须完成后续步骤中 kubeadm init 的操作，kubelet 才能正常启动 ::: - - + + + Nginx部署*** @@ -193,8 +194,9 @@ curl <任意节点的 IP>:32600 在浏览器打开 `http://<任意节点的 IP>:32601` - - + + + ~~到目前为止，我们已经成功部署好项目，并能够对其进行访问， diff --git a/learning/k8s-basics/scale.md b/learning/k8s-basics/scale.md index 1a70445..9d357e1 100644 --- a/learning/k8s-basics/scale.md +++ b/learning/k8s-basics/scale.md @@ -46,8 +46,9 @@ spec: - - + + + **修改 nginx-deployment.yaml 文件** @@ -89,8 +90,8 @@ kubectl apply -f nginx-deployment.yaml watch kubectl get pods -o wide ``` - - + + * 在 default 名称空间 点击 ***展现层 --> Nginx部署*** @@ -108,8 +109,9 @@ watch kubectl get pods -o wide ![Kubernetes教程：伸缩应用-Scaling](./scale.assets/image-20190822213709967.png) - - + + + ~~一旦运行了多个应用程序实例，就可以在不停机的情况下执行滚动更新了， diff --git a/learning/k8s-basics/update.md b/learning/k8s-basics/update.md index 2313c52..bb4365f 100644 --- a/learning/k8s-basics/update.md +++ b/learning/k8s-basics/update.md @@ -55,8 +55,9 @@ meta: - - + + + **修改 nginx-deployment.yaml 文件** @@ -99,8 +100,8 @@ kubectl apply -f nginx-deployment.yaml watch kubectl get pods -l app=nginx ``` - - + + * **进入 default 名称空间** @@ -124,8 +125,9 @@ watch kubectl get pods -l app=nginx ![Kubernetes教程：执行滚动更新-过程](./update.assets/image-20190822214503847.png) - - + + + ~~呱唧呱唧，恭喜您，即将成为k8s的大神的您，已经迈进了您k8s的最重要的一步了--入门，那么接下来请再接再厉，继续征服k8s的高峰！！！ diff --git a/learning/k8s-intermediate/service/ingress.md b/learning/k8s-intermediate/service/ingress.md index 1142b13..31e0876 100644 --- a/learning/k8s-intermediate/service/ingress.md +++ b/learning/k8s-intermediate/service/ingress.md @@ -132,8 +132,9 @@ spec: * 假设您已经将 Ingress 融入到您的网络拓扑中，并且将 `*.demo.kuboard.cn` （请使用您自己的域名）解析到对应的外网 IP 地址 ::: - - + + + **创建文件 nginx-deployment.yaml** ``` sh @@ -237,8 +238,8 @@ kubectl get ingress -o wide curl a.demo.kuboard.cn ``` - - + + * 在 default 名称空间 点击 ***创建工作负载*** @@ -273,8 +274,9 @@ Kuboard 工作负载编辑器将 kubernetes 中三个主要对象 Deployment/Ser 在浏览器打开 `http://a.demo.kuboard.cn` （请使用您自己的域名） - - + + + diff --git a/learning/k8s-intermediate/workload/wl-deployment/canary.md b/learning/k8s-intermediate/workload/wl-deployment/canary.md index a86d0a3..6bbfe0a 100644 --- a/learning/k8s-intermediate/workload/wl-deployment/canary.md +++ b/learning/k8s-intermediate/workload/wl-deployment/canary.md @@ -15,9 +15,9 @@ meta: 如果您想使用 Deployment 将最新的应用程序版本发布给一部分用户（或服务器），您可以为每个版本创建一个 Deployment，此时，应用程序的新旧两个版本都可以同时获得生产上的流量。 - - - + + + * 部署第一个版本 @@ -95,9 +95,8 @@ meta: * 当您确定新的版本没有问题之后，可以将 `nginx-deployment` 的镜像标签修改为新版本的镜像标签，并在完成对 `nginx-deployment` 的滚动更新之后，删除 `nginx-deployment-canary` 这个 Deployment - - - + + 在 Kuboard 执行金丝雀发布的过程，与使用 kubectl 的过程相同，此处特别说明的一点是，当使用 Kuboard 创建 `web-nginx-canary` Deployment时，如何解决其Pod 的标签被 `web-nginx` 的Service包含的问题： @@ -108,9 +107,9 @@ meta: ![Kubernetes教程_在Kuboard中执行金丝雀发布](./canary.assets/image-20191013204426338.png) - - - + + + ::: danger 局限性 按照 Kubernetes 默认支持的这种方式进行金丝雀发布，有一定的局限性： diff --git a/learning/k8s-intermediate/workload/wl-deployment/create.md b/learning/k8s-intermediate/workload/wl-deployment/create.md index 0fe20f0..a910f97 100644 --- a/learning/k8s-intermediate/workload/wl-deployment/create.md +++ b/learning/k8s-intermediate/workload/wl-deployment/create.md @@ -15,9 +15,9 @@ meta: 本文描述了如何创建一个 Deployment，如何理解 Deployment 各个字段，以及如何查看 Deployment 的创建结果。 - - - + + + 下面的 yaml 文件定义了一个 Deployment，该 Deployment 将创建一个有 3 个 nginx Pod 副本的 ReplicaSet（副本集）： @@ -131,15 +131,14 @@ spec: pod-template-hash 标签时 Deployment 创建 ReplicaSet 时添加到 ReplicaSet 上的，ReplicaSet 进而将此标签添加到 Pod 上。这个标签用于区分 Deployment 中哪个 ReplicaSet 创建了哪些 Pod。该标签的值是 `.spec.template` 的 hash 值。 - - - + + 正在撰写 - - - + + + [返回 Deployment](./#deployment-概述) diff --git a/learning/k8s-intermediate/workload/wl-deployment/pause.md b/learning/k8s-intermediate/workload/wl-deployment/pause.md index b0b7fd1..5db9656 100644 --- a/learning/k8s-intermediate/workload/wl-deployment/pause.md +++ b/learning/k8s-intermediate/workload/wl-deployment/pause.md @@ -17,9 +17,9 @@ meta: 以我们在 [创建Deployment](./create.html) 中创建的 Deployment 为例。 - - - + + + * 执行命令 `kubectl get deployment`，查看 Deployment 信息，输出结果如下所示： @@ -102,14 +102,15 @@ meta: 您不能回滚（rollback）一个已暂停的 Deployment，除非您继续（resume）该 Deployment。 ::: - + + + - 正在撰写中 - - - + + + [返回 Deployment](./#deployment-概述) diff --git a/learning/k8s-intermediate/workload/wl-deployment/rollback.md b/learning/k8s-intermediate/workload/wl-deployment/rollback.md index a25cab1..087d8f1 100644 --- a/learning/k8s-intermediate/workload/wl-deployment/rollback.md +++ b/learning/k8s-intermediate/workload/wl-deployment/rollback.md @@ -20,9 +20,9 @@ meta: ::: - - - + + +

    模拟更新错误

    @@ -218,14 +218,13 @@ meta: Normal ScalingReplicaSet 15s deployment-controller Scaled down replica set nginx-deployment-595696685f to 0 ``` -     - - + + 正在撰写中 - - -     + + + [返回 Deployment](./#deployment-概述) diff --git a/learning/k8s-intermediate/workload/wl-deployment/scale.md b/learning/k8s-intermediate/workload/wl-deployment/scale.md index 5c6a804..b33ed33 100644 --- a/learning/k8s-intermediate/workload/wl-deployment/scale.md +++ b/learning/k8s-intermediate/workload/wl-deployment/scale.md @@ -15,9 +15,9 @@ meta: 伸缩（Scaling） Deployment，是指改变 Deployment 中 Pod 的副本数量，以应对实际业务流量的变化。 - - - + + +

    执行伸缩

    @@ -82,13 +82,14 @@ meta: nginx-deployment-618515232 11 11 11 7m ``` -     + + + - 正在撰写中 - - -     + + + [返回 Deployment](./#deployment-概述) diff --git a/learning/k8s-intermediate/workload/wl-deployment/status.md b/learning/k8s-intermediate/workload/wl-deployment/status.md index 50d4364..7833e94 100644 --- a/learning/k8s-intermediate/workload/wl-deployment/status.md +++ b/learning/k8s-intermediate/workload/wl-deployment/status.md @@ -18,9 +18,9 @@ Deployment 的生命周期中，将会进入不同的状态，这些状态可能 * complete * fail to progress - - - + + +

    Progressing 状态

    @@ -161,13 +161,14 @@ $ echo $? * 回滚到前一个版本 * 暂停（pause）Deployment，以对 Deployment 的 Pod template 执行多处更新 -     + + + - 正在撰写中 - - -     + + + [返回 Deployment](./#deployment-概述) diff --git a/learning/k8s-intermediate/workload/wl-deployment/update.md b/learning/k8s-intermediate/workload/wl-deployment/update.md index 90e17fa..e1dffef 100644 --- a/learning/k8s-intermediate/workload/wl-deployment/update.md +++ b/learning/k8s-intermediate/workload/wl-deployment/update.md @@ -23,9 +23,10 @@ meta: * 使用 kubectl 更新 Deployment * 使用 Kuboard 更新 Deployment - + + + - **使用下述步骤更新您的 Deployment** @@ -143,14 +144,14 @@ meta: * 当您更新 Deployment 时，Deployment Controller 先创建一个新的 ReplicaSet (nginx-deployment-1564180365) 并将其 scale up 到 1 个副本，然后 scale down 旧的 ReplicaSet 到 2。 * Deployment Controller 继续 scale up 新的 ReplicaSet 并 scale down 旧的 ReplicaSet，直到最后，新旧两个 ReplicaSet，一个副本数为 3，另一个副本数为 0。 - + + - 正在撰写中 - - - + + + ## 覆盖更新 Rollover （更新过程中再更新） diff --git a/overview/README.md b/overview/README.md index be9600f..214e181 100644 --- a/overview/README.md +++ b/overview/README.md @@ -36,7 +36,7 @@ Kuboard，是一款免费的 Kubernetes 图形化管理工具，Kuboard 力图 align-content: stretch; justify-content: space-between;">
    - +

    Kubernetes安装文档

    @@ -49,11 +49,11 @@ Kuboard，是一款免费的 Kubernetes 图形化管理工具，Kuboard 力图
  • 碰到问题可QQ在线答疑
    • -     +
    - +

    Kubernetes免费教程

    @@ -63,11 +63,11 @@ Kuboard，是一款免费的 Kubernetes 图形化管理工具，Kuboard 力图
  • 活跃的QQ社群，与网友共同学习进步
    • -     +
    - +

    Kubernetes管理界面

    @@ -77,18 +77,18 @@ Kuboard，是一款免费的 Kubernetes 图形化管理工具，Kuboard 力图
  • 免费
    • -     +
    - +

    Kubernetes + SpringCloud实战

  • 参考文档，一步一步完成Spring Cloud微服务架构在Kubernetes上的部署和管理
    • -     +
    @@ -98,7 +98,7 @@ Kuboard，是一款免费的 Kubernetes 图形化管理工具，Kuboard 力图 - +

    Kuboard 在线体验 @@ -107,16 +107,16 @@ Kuboard，是一款免费的 Kubernetes 图形化管理工具，Kuboard 力图

    为保证环境的稳定性，在线 Demo 中只提供只读权限。（请在PC浏览器中打开）

    -     +     - +

    Kubernetes教程：Kuboard 在线Demo

    - +     diff --git a/package-lock.json b/package-lock.json index b6178c9..e1c600c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1673,14 +1673,6 @@ "resolved": "https://registry.npm.taobao.org/async-limiter/download/async-limiter-1.0.1.tgz", "integrity": "sha1-3TeelPDbgxCwgpH51kwyCXZmF/0=" }, - "async-validator": { - "version": "1.8.5", - "resolved": "https://registry.npm.taobao.org/async-validator/download/async-validator-1.8.5.tgz?cache=0&sync_timestamp=1571196860077&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fasync-validator%2Fdownload%2Fasync-validator-1.8.5.tgz", - "integrity": "sha1-3D4I7B/Q3dtn5ghC8CwM0c7G1/A=", - "requires": { - "babel-runtime": "6.x" - } - }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npm.taobao.org/asynckit/download/asynckit-0.4.0.tgz", @@ -1774,11 +1766,6 @@ "babylon": "^6.18.0" } }, - "babel-helper-vue-jsx-merge-props": { - "version": "2.0.3", - "resolved": "https://registry.npm.taobao.org/babel-helper-vue-jsx-merge-props/download/babel-helper-vue-jsx-merge-props-2.0.3.tgz", - "integrity": "sha1-Iq69OzOQIyjlEyk6jkmSs4T58bY=" - }, "babel-loader": { "version": "8.0.6", "resolved": "https://registry.npm.taobao.org/babel-loader/download/babel-loader-8.0.6.tgz", @@ -3307,19 +3294,6 @@ "resolved": "https://registry.npm.taobao.org/electron-to-chromium/download/electron-to-chromium-1.3.296.tgz?cache=0&sync_timestamp=1571976210878&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felectron-to-chromium%2Fdownload%2Felectron-to-chromium-1.3.296.tgz", "integrity": "sha1-odQyLXQjF5RShdO6iJZlYbZ/Osg=" }, - "element-ui": { - "version": "2.12.0", - "resolved": "https://registry.npm.taobao.org/element-ui/download/element-ui-2.12.0.tgz", - "integrity": "sha1-qJO8Ea5Pfbt+nVQWBvI+ZD8THuQ=", - "requires": { - "async-validator": "~1.8.1", - "babel-helper-vue-jsx-merge-props": "^2.0.0", - "deepmerge": "^1.2.0", - "normalize-wheel": "^1.0.1", - "resize-observer-polyfill": "^1.5.0", - "throttle-debounce": "^1.0.1" - } - }, "elliptic": { "version": "6.5.1", "resolved": "https://registry.npm.taobao.org/elliptic/download/elliptic-6.5.1.tgz?cache=0&sync_timestamp=1567592249994&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felliptic%2Fdownload%2Felliptic-6.5.1.tgz", @@ -5950,11 +5924,6 @@ "sort-keys": "^2.0.0" } }, - "normalize-wheel": { - "version": "1.0.1", - "resolved": "https://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz", - "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU=" - }, "npm": { "version": "6.12.1", "resolved": "https://registry.npm.taobao.org/npm/download/npm-6.12.1.tgz?cache=0&sync_timestamp=1572369279209&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnpm%2Fdownload%2Fnpm-6.12.1.tgz", @@ -10363,11 +10332,6 @@ "resolved": "https://registry.npm.taobao.org/reselect/download/reselect-3.0.1.tgz", "integrity": "sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc=" }, - "resize-observer-polyfill": { - "version": "1.5.1", - "resolved": "https://registry.npm.taobao.org/resize-observer-polyfill/download/resize-observer-polyfill-1.5.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fresize-observer-polyfill%2Fdownload%2Fresize-observer-polyfill-1.5.1.tgz", - "integrity": "sha1-DpAg3T0hAkRY1OvSfiPkAmmBBGQ=" - }, "resolve": { "version": "1.12.0", "resolved": "https://registry.npm.taobao.org/resolve/download/resolve-1.12.0.tgz", @@ -11336,11 +11300,6 @@ "resolved": "https://registry.npm.taobao.org/text-table/download/text-table-0.2.0.tgz", "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=" }, - "throttle-debounce": { - "version": "1.1.0", - "resolved": "https://registry.npm.taobao.org/throttle-debounce/download/throttle-debounce-1.1.0.tgz", - "integrity": "sha1-UYU9o3vmihVctugns1FKPEIuic0=" - }, "through": { "version": "2.3.8", "resolved": "https://registry.npm.taobao.org/through/download/through-2.3.8.tgz", diff --git a/package.json b/package.json index 02f42e1..9935653 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,6 @@ "animated-number-vue": "^1.0.0", "bootstrap": "^4.3.1", "bootstrap-vue": "^2.0.4", - "element-ui": "^2.12.0", "esm": "^3.2.25", "npm": "^6.11.3", "reduce-css-calc": "^2.1.6", diff --git a/support/index.md b/support/index.md index 94ae8bc..900586c 100644 --- a/support/index.md +++ b/support/index.md @@ -26,7 +26,7 @@ export default { - + * 使用 Kuboard 是 免费 的，无论您是用于学习还是用于生产 * 将来会推出 Kuboard Plus，当前所有的功能，将来仍然免费。Kuboard Plus 侧重点： @@ -34,16 +34,16 @@ export default { * 审计日志 * 只要您在本文末尾的评论区留下公司名字，您就已经 **取得将 Kuboard 用于生产环境的授权** - + - -
    + +
    - +     @@ -54,16 +54,16 @@ export default {
    - + Kubernetes教程_Kuboard_Github_Star - + - +
  • Kuboard 诞生于大型微服务项目的落地实施，在其发布之前，就已经在许多个实际项目中经受住了考验
  • Kuboard 于2019年8月初公开发布，不到三个月时间就已经获得了 855 Github Star（如图所示），当前
  • Kuboard 社群中，已有许多的用户将 Kuboard 用于自己的生产环境
    • -     +
    @@ -73,20 +73,20 @@ export default {
    - +

    服务范围

  • Kubernetes 企业培训
  • DevOps 环境搭建及培训
  • SpringCloud 微服务架构咨询
  • Kubernetes 投产支持及问题解决
  • Kuboard 定制化
    • -     +     - +

    联系方式

    -     +