diff --git a/.vuepress/components/FancyImage.vue b/.vuepress/components/FancyImage.vue index 0eba08d..ca6f936 100644 --- a/.vuepress/components/FancyImage.vue +++ b/.vuepress/components/FancyImage.vue @@ -1,129 +1,27 @@ diff --git a/.vuepress/components/ad-list.js b/.vuepress/components/ad-list.js index 61e160f..360828f 100644 --- a/.vuepress/components/ad-list.js +++ b/.vuepress/components/ad-list.js @@ -38,6 +38,14 @@ module.exports = [ action: '去抢', url: 'https://www.aliyun.com/1111/2019/home?userCode=obezo3pg', weight: 30 + }, + { + name: 'Kubetrain', + description: 'K8S在线直播培训,首次开班优惠', + strong: '不满意可无条件退款', + action: '再不去没名额啦', + url: 'https://kubetrain.cn/?from=kuboard-ads', + weight: 30 } // { diff --git a/.vuepress/components/fancy-images/Cross.vue b/.vuepress/components/fancy-images/Cross.vue new file mode 100644 index 0000000..9fe1c08 --- /dev/null +++ b/.vuepress/components/fancy-images/Cross.vue @@ -0,0 +1,166 @@ + + + + + diff --git a/.vuepress/components/fancy-images/Diamond.vue b/.vuepress/components/fancy-images/Diamond.vue new file mode 100644 index 0000000..99fd3f6 --- /dev/null +++ b/.vuepress/components/fancy-images/Diamond.vue @@ -0,0 +1,129 @@ + + + + + diff --git a/.vuepress/components/fancy-images/Rectangle.vue b/.vuepress/components/fancy-images/Rectangle.vue new file mode 100644 index 0000000..9418e6b --- /dev/null +++ b/.vuepress/components/fancy-images/Rectangle.vue @@ -0,0 +1,134 @@ + + + + + diff --git a/.vuepress/components/fancy-images/Rolling.vue b/.vuepress/components/fancy-images/Rolling.vue new file mode 100644 index 0000000..07883c9 --- /dev/null +++ b/.vuepress/components/fancy-images/Rolling.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/.vuepress/config-sidebar.js b/.vuepress/config-sidebar.js index 3532e2c..723bb61 100644 --- a/.vuepress/config-sidebar.js +++ b/.vuepress/config-sidebar.js @@ -38,16 +38,6 @@ module.exports = { 'install-kubernetes', ] }, - { - title: '升级 Kubernetes', - collapsable: false, - children: [ - // ['install-k8s-upgrade', '升级Kubernetes集群'], - 'upgrade-k8s/1.15.x-1.15.4', - ['upgrade-k8s/1.15.x-1.16.x', 'K8S从1.15.x(1.16.x)升级到 1.16.x'], - 'upgrade-k8s/calico-3.8-3.9', - ] - }, { title: '管理 Kubernetes', collapsable: false, @@ -59,13 +49,16 @@ module.exports = { 'install-k8s-dashboard', ] }, - // { - // title: '常见问题', - // collapsable: false, - // children: [ - // 'faq/timeout' - // ] - // } + { + title: '升级 Kubernetes', + collapsable: false, + children: [ + // ['install-k8s-upgrade', '升级Kubernetes集群'], + 'upgrade-k8s/1.15.x-1.15.4', + ['upgrade-k8s/1.15.x-1.16.x', 'K8S从1.15.x(1.16.x)升级到 1.16.x'], + 'upgrade-k8s/calico-3.8-3.9', + ] + }, ], '/learning/': [ @@ -159,6 +152,8 @@ module.exports = { 'k8s-intermediate/workload/init-config', 'k8s-intermediate/workload/init-debug', 'k8s-intermediate/workload/disruption', + 'k8s-intermediate/workload/pod-health.html', + 'k8s-intermediate/workload/workload', { title: '控制器 - Deployment', diff --git a/.vuepress/config.js b/.vuepress/config.js index c5fe83d..3a3dd74 100644 --- a/.vuepress/config.js +++ b/.vuepress/config.js @@ -157,6 +157,7 @@ module.exports = { { text: '安装', link: '/install/install-dashboard' }, { text: '教程', link: '/learning/' }, { text: '使用', link: '/guide/' }, + { text: '培训', link: 'https://kubetrain.cn/?from=kuboard', target: '_blank' }, { text: '支持', link: '/support/' }, // { text: '博客', link: 'https://blog.kuboard.cn/compaign' } // { text: 'DevOps', link: '/devops/' } diff --git a/.vuepress/public/images/courses/advanced.png b/.vuepress/public/images/courses/advanced.png new file mode 100644 index 0000000..869be61 Binary files /dev/null and b/.vuepress/public/images/courses/advanced.png differ diff --git a/.vuepress/public/images/courses/free.png b/.vuepress/public/images/courses/free.png new file mode 100644 index 0000000..f58ea7b Binary files /dev/null and b/.vuepress/public/images/courses/free.png differ diff --git a/.vuepress/public/images/courses/intermediate.png b/.vuepress/public/images/courses/intermediate.png new file mode 100644 index 0000000..2287393 Binary files /dev/null and b/.vuepress/public/images/courses/intermediate.png differ diff --git a/.vuepress/public/landing.html b/.vuepress/public/landing.html index a835d8e..9a687ea 100755 --- a/.vuepress/public/landing.html +++ b/.vuepress/public/landing.html @@ -167,6 +167,7 @@ + - - - - ## 在线体验
@@ -60,11 +39,6 @@ meta: | v1.13 | v1.0 | 😄 | 已验证 | | v1.12 | v1.0 | 😐 | Kubernetes Api v1.12 尚不支持 dryRun,
忽略Kuboard在执行命令时的参数校验错误,可正常工作 | | v1.11 | v1.0 | 😐 | 同上 | - - - ## 安装 @@ -93,10 +67,6 @@ kubectl delete -f https://kuboard.cn/install-script/kuboard.yaml - - ## 获取Token 您可以获得管理员用户、只读用户的Token @@ -180,10 +150,6 @@ token: eyJhbGciOiJSUzI1NiIsImtpZCI6IiJ9.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2Nv - - ## 访问Kuboard 您可以通过NodePort、port-forward 两种方式当中的任意一种访问 Kuboard @@ -229,21 +195,34 @@ kubectl port-forward service/kuboard 8080:80 -n kube-system - +可以通过查询参数中的 k8sToken 字段直接登录系统,无需在登录界面输入 Token。 - +::: tip 其他界面 +其他任意 Kuboard 界面同理,只需要增加 k8sToken 作为查询参数,即可跳过输入 Token 的步骤 +::: -**下一步** +### 直接访问终端界面 + +如果想要无登录直接访问容器组的控制台,可使用如下格式的 url 进入: +``` +http://任意一个Worker节点的IP地址:32567/#/console/pzy/yourPod?containerName=yourContainer&shell=bash&k8sToken=yourToken +``` + +其中,shell 参数可选取值有: +* `bash`,使用 /bin/bash 作为 shell +* `sh`, 使用 /bin/sh 作为 shell + +## 下一步 :tada: :tada: :tada: @@ -251,7 +230,3 @@ kubectl port-forward service/kuboard 8080:80 -n kube-system - 尝试 Kuboard 设计的其他 example [使用 Kuboard](/guide/index.html) - 学习 [Kubernetes免费教程](/learning/) - - diff --git a/learning/README.md b/learning/README.md index 311b06c..92f3572 100644 --- a/learning/README.md +++ b/learning/README.md @@ -9,16 +9,47 @@ meta: content: K8S教程,K8S 教程,K8S培训,Kubernetes培训 --- -# Kubernetes教程 +# Kubernetes 教程 - +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +## Kubernetes免费教程 本教程的主要依据是:Kubernetes 官网文档,以及使用 Kubernetes 落地 Spring Cloud 微服务并投产的实战经验。适用人群: * Kubernetes 初学者 * 学习过 Kubernetes,但在投产过程中仍有诸多疑虑和困惑的技术爱好者 -
+推荐自学能力强的同学选择免费教程,这里有来自 kubernetes.io 的权威资料,同时结合 Kuboard 作者的实战经验,已有证据证明,Kuboard 有许多用户能够在一个月左右时间 **从Kubernetes入门到投产**。 +同时,Kuboard 与资深 Kubernetes 运维工程师/布道者合作,为大家带来直播课程,可以更深入系统地学习 K8S。[Kubernetes中级班](https://kubetrain.cn/?from=learning-free) 由 360 资深运维工程师阿良为您直播讲解。直播课程的优势如下: +* 360 大厂一线实战经验 +* 专属学员答疑群 +* 优秀学员内推机会 +* 不满意无条件退费 + +对于有意向在运维/架构领域更深入发展的同学,还可以考虑课程 [Kuberentes高级班](https://kubetrain.cn/?from=learning-free)。高级班的主要内容如下: +* K8S弹性伸缩 +* K8S网络深入解析 +* Ceph存储 +* 微服务自动化发布(Spring Cloud & Jenkins CI/CD)