From ceb6b8eeab969de2463b21ff6e244dbae6f33c22 Mon Sep 17 00:00:00 2001 From: "huanqing.shao" Date: Wed, 5 Feb 2020 17:39:19 +0800 Subject: [PATCH] remove hash --- .vuepress/comp/Course.vue | 5 +++-- .vuepress/comp/course-index.js | 5 +++++ .vuepress/components/InstallDashboardPreview.vue | 4 ++-- .vuepress/components/SpecialHomePage.vue | 6 +++--- .vuepress/public/landing-video.html | 2 +- .vuepress/public/landing.html | 2 +- .vuepress/public/share.html | 2 +- .vuepress/theme/components/Sidebar.vue | 6 +++--- install/history-k8s/install-k8s-1.15.2.md | 2 +- install/history-k8s/install-k8s-1.15.3.md | 2 +- install/history-k8s/install-k8s-1.15.4.md | 2 +- install/history-k8s/install-k8s-1.16.0.md | 2 +- install/history-k8s/install-k8s-1.16.1.md | 2 +- install/history-k8s/install-kubernetes-1.15.3.md | 2 +- install/install-dashboard.md | 5 +++-- learning/README.md | 4 ++++ learning/k8s-advanced/sec/authenticate/install.md | 2 ++ learning/k8s-advanced/sec/rbac/api.md | 2 ++ .../micro-service/kuboard-view-of-k8s.md | 2 +- overview/README.md | 4 ++-- support/change-log/v1.0.x.md | 15 ++++++++++++++- 21 files changed, 53 insertions(+), 25 deletions(-) diff --git a/.vuepress/comp/Course.vue b/.vuepress/comp/Course.vue index 03dc2c9..fe875d8 100644 --- a/.vuepress/comp/Course.vue +++ b/.vuepress/comp/Course.vue @@ -41,11 +41,12 @@ export default { border-radius: 2px; color: #486491; position: relative; + margin: 10px 0; } .school { color: #486491 !important; - position: relative; - padding-left: 36px; + /* position: relative; */ + /* padding-left: 36px; */ } .school p:before { content: ''; diff --git a/.vuepress/comp/course-index.js b/.vuepress/comp/course-index.js index 1fd3f7d..c3a5c2f 100644 --- a/.vuepress/comp/course-index.js +++ b/.vuepress/comp/course-index.js @@ -3,5 +3,10 @@ module.exports = { description: '使用kubeadm安装kubernetes集群', href: 'https://ke.qq.com/course/477593?flowToken=1016936', price: '12', + }, + '484058': { + description: '使用GitLab/GitHub账号登录Kubernetes以及RBAC为用户授权', + href: 'https://ke.qq.com/course/484058?flowToken=1017467', + price: '12', } } diff --git a/.vuepress/components/InstallDashboardPreview.vue b/.vuepress/components/InstallDashboardPreview.vue index 825cac3..35862de 100644 --- a/.vuepress/components/InstallDashboardPreview.vue +++ b/.vuepress/components/InstallDashboardPreview.vue @@ -4,7 +4,7 @@

- + Kuboard 在线体验 @@ -19,7 +19,7 @@ - + diff --git a/.vuepress/components/SpecialHomePage.vue b/.vuepress/components/SpecialHomePage.vue index b273e29..91e1c43 100644 --- a/.vuepress/components/SpecialHomePage.vue +++ b/.vuepress/components/SpecialHomePage.vue @@ -70,7 +70,7 @@

Kuboard

- + Kuboard 在线体验
  • Kubernetes 管理界面
    • @@ -80,7 +80,7 @@

    - +
    @@ -153,7 +153,7 @@ export default { actionLink () { return { - link: `http://demo.kuboard.cn/#/dashboard?k8sToken=${this.$site.themeConfig.kuboardToken}`, + link: `http://demo.kuboard.cn/dashboard?k8sToken=${this.$site.themeConfig.kuboardToken}`, text: this.data.actionText } }, diff --git a/.vuepress/public/landing-video.html b/.vuepress/public/landing-video.html index e39d15c..f3a9387 100644 --- a/.vuepress/public/landing-video.html +++ b/.vuepress/public/landing-video.html @@ -97,7 +97,7 @@
  • 开始使用
  • + href="http://demo.kuboard.cn/dashboard?k8sToken=eyJhbGciOiJSUzI1NiIsImtpZCI6IiJ9.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2NvdW50Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9uYW1lc3BhY2UiOiJrdWJlLXN5c3RlbSIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VjcmV0Lm5hbWUiOiJrdWJvYXJkLXZpZXdlci10b2tlbi1mdGw0diIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50Lm5hbWUiOiJrdWJvYXJkLXZpZXdlciIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50LnVpZCI6ImE1YWFiMmQxLTQxMjYtNDU5Yi1hZmNhLTkyYzMwZDk0NTQzNSIsInN1YiI6InN5c3RlbTpzZXJ2aWNlYWNjb3VudDprdWJlLXN5c3RlbTprdWJvYXJkLXZpZXdlciJ9.eYqN3FLIT6xs0-lm8AidZtaiuHeX70QTn9FhJglhEyh5dlyMU5lo8UtR-h1OY8sTSeYdYKJAS83-9SUObKQhp6XNmRgOYAfZblKUy4mvbGVQ3dn_qnzxYxt6zdGCwIY7E34eNNd9IjMF7G_Y4eJLWE7NvkSB1O8zbdn8En9rQXv_xJ9-ugCyr4CYB1lDGuZl3CIXgQ1FWcQdUBrxTT95tzcNTB0l6OUOGhRxOfw-RyIOST83GV5U0iVzxnD4sjgSaJefvCU-BmwXgpxAwRVhFyHEziXXa0CuZfBfJbmnQW308B4wocr4QDm6Nvmli1P3B6Yo9-HNF__d2hCwZEr7eg"> 在线演示

    • diff --git a/.vuepress/public/landing.html b/.vuepress/public/landing.html index e6ec4ba..c9cfdb3 100755 --- a/.vuepress/public/landing.html +++ b/.vuepress/public/landing.html @@ -201,7 +201,7 @@ diff --git a/.vuepress/public/share.html b/.vuepress/public/share.html index 9d6485a..0b311de 100755 --- a/.vuepress/public/share.html +++ b/.vuepress/public/share.html @@ -96,7 +96,7 @@ diff --git a/.vuepress/theme/components/Sidebar.vue b/.vuepress/theme/components/Sidebar.vue index d9c696d..fe33a12 100644 --- a/.vuepress/theme/components/Sidebar.vue +++ b/.vuepress/theme/components/Sidebar.vue @@ -34,17 +34,17 @@
    -

    - 在线体验 + 在线体验

    diff --git a/install/history-k8s/install-k8s-1.15.2.md b/install/history-k8s/install-k8s-1.15.2.md index 3f5b54e..9269c1a 100644 --- a/install/history-k8s/install-k8s-1.15.2.md +++ b/install/history-k8s/install-k8s-1.15.2.md @@ -321,7 +321,7 @@ kubectl apply -f https://kuboard.cn/install-script/v1.15.2/nginx-ingress.yaml [安装 Kuboard](/install/install-dashboard.html) 安装 Kuboard 之前先 - + 在线体验 Kuboard diff --git a/install/history-k8s/install-k8s-1.15.3.md b/install/history-k8s/install-k8s-1.15.3.md index c87966a..bc1094a 100644 --- a/install/history-k8s/install-k8s-1.15.3.md +++ b/install/history-k8s/install-k8s-1.15.3.md @@ -450,7 +450,7 @@ kubectl delete -f https://kuboard.cn/install-script/v1.15.3/nginx-ingress.yaml [安装 Kuboard](/install/install-dashboard.html) 安装 Kuboard 之前先 - + 在线体验 Kuboard diff --git a/install/history-k8s/install-k8s-1.15.4.md b/install/history-k8s/install-k8s-1.15.4.md index 2b572cc..170ed5f 100644 --- a/install/history-k8s/install-k8s-1.15.4.md +++ b/install/history-k8s/install-k8s-1.15.4.md @@ -449,7 +449,7 @@ kubectl delete -f https://kuboard.cn/install-script/v1.15.4/nginx-ingress.yaml [安装 Kuboard](/install/install-dashboard.html) 安装 Kuboard 之前先 - + 在线体验 Kuboard diff --git a/install/history-k8s/install-k8s-1.16.0.md b/install/history-k8s/install-k8s-1.16.0.md index a40c2b3..e00640c 100644 --- a/install/history-k8s/install-k8s-1.16.0.md +++ b/install/history-k8s/install-k8s-1.16.0.md @@ -444,7 +444,7 @@ kubectl delete -f https://kuboard.cn/install-script/v1.16.0/nginx-ingress.yaml [安装 Kuboard - 微服务管理界面](/install/install-dashboard.html) 安装 Kuboard 之前先 - + 在线体验 Kuboard diff --git a/install/history-k8s/install-k8s-1.16.1.md b/install/history-k8s/install-k8s-1.16.1.md index 69552e7..9e096c7 100644 --- a/install/history-k8s/install-k8s-1.16.1.md +++ b/install/history-k8s/install-k8s-1.16.1.md @@ -452,7 +452,7 @@ kubectl delete -f https://kuboard.cn/install-script/v1.16.1/nginx-ingress.yaml [安装 Kuboard - 微服务管理界面](/install/install-dashboard.html) 安装 Kuboard 之前先 - + 在线体验 Kuboard diff --git a/install/history-k8s/install-kubernetes-1.15.3.md b/install/history-k8s/install-kubernetes-1.15.3.md index 7e70c3b..50691f6 100644 --- a/install/history-k8s/install-kubernetes-1.15.3.md +++ b/install/history-k8s/install-kubernetes-1.15.3.md @@ -508,7 +508,7 @@ kubectl apply -f https://kuboard.cn/install-script/v1.15.3/nginx-ingress.yaml [安装 Kuboard](/install/install-dashboard.html) 安装 Kuboard 之前先 - + 在线体验 Kuboard diff --git a/install/install-dashboard.md b/install/install-dashboard.md index 312a3e8..19544c0 100644 --- a/install/install-dashboard.md +++ b/install/install-dashboard.md @@ -102,8 +102,9 @@ kubectl delete -f https://kuboard.cn/install-script/kuboard.yaml 您可以获得管理员用户、只读用户的Token。 -> * 如果您需要更细粒度的权限控制，请参考 [RBAC Example](/learning/k8s-advanced/sec/rbac/example.html) -> * Kuboard beta 版已经开始支持 RBAC，请参考 [使用Kuboard管理ServiceAccount及RBAC](/learning/k8s-advanced/sec/kuboard.html) +> * 默认情况下，您可以使用 ServiceAccount 的 Token 登录 Kuboard +> * 您还可以 [使用 GitLab/GitHub 账号登录 Kuboard/Kubectl](/learning/k8s-advanced/sec/authenticate/install.html) +> * 您也可以 [为用户授权](/learning/k8s-advanced/sec/kuboard.html) diff --git a/learning/README.md b/learning/README.md index 9c63ebd..ec94c3c 100644 --- a/learning/README.md +++ b/learning/README.md @@ -159,7 +159,11 @@ meta: * [Limit Range](/learning/k8s-advanced/policy/lr.html) * [Resource Quota](/learning/k8s-advanced/policy/rq.html) * 安全 + * [用户认证概述](/learning/k8s-advanced/sec/authenticate/) + * [使用GitLab/GitHub等账号登录Kubernetes](/learning/k8s-advanced/sec/authenticate/install.html) * [RBAC授权](/learning/k8s-advanced/sec/rbac/api.html) + + * 监控 * 联邦 diff --git a/learning/k8s-advanced/sec/authenticate/install.md b/learning/k8s-advanced/sec/authenticate/install.md index e657da4..266f542 100644 --- a/learning/k8s-advanced/sec/authenticate/install.md +++ b/learning/k8s-advanced/sec/authenticate/install.md @@ -14,6 +14,8 @@ meta: 本文描述了如何为已有 Kubernetes 集群安装认证模块，并可以通过 GitLab、GitHub、LDAP 中的已有账号登录 Kubernetes 集群。 + + ## 前提条件 * 您已经安装了 Kubernetes 集群 diff --git a/learning/k8s-advanced/sec/rbac/api.md b/learning/k8s-advanced/sec/rbac/api.md index 0dfa020..5c765cb 100644 --- a/learning/k8s-advanced/sec/rbac/api.md +++ b/learning/k8s-advanced/sec/rbac/api.md @@ -13,6 +13,8 @@ meta: > 参考文档：[Using RBAC Authorization](https://kubernetes.io/docs/reference/access-authn-authz/rbac/) + + Role-based access control (RBAC)基于角色的访问控制，是Kubernetes中支持的一种授权方式。使用 `rbac.authorization.k8s.io` API 来驱动授权决策，允许管理员通过该 API 动态配置授权策略。自 Kubernetes 1.8 起，RBAC 模式已稳定可用，且通过 `rbac.authorization.k8s.io/v1` API 提供支持。如果要激活 RBAC，在启动 API Server 时必须使用参数 `--authorization-mode=RBAC` > 译者注： diff --git a/learning/k8s-practice/micro-service/kuboard-view-of-k8s.md b/learning/k8s-practice/micro-service/kuboard-view-of-k8s.md index 15c822a..a47647f 100644 --- a/learning/k8s-practice/micro-service/kuboard-view-of-k8s.md +++ b/learning/k8s-practice/micro-service/kuboard-view-of-k8s.md @@ -199,7 +199,7 @@ Kuboard 认为，应该以微服务视角快速查看到该微服务在不同层 ![Kubernetes教程：Kuboard监控](./kuboard-view-of-k8s.assets/image-20190809220543742.png) -点击图中 ***Nginx 监控***、 ***容器组监控***、 ***所在节点监控*** 等按钮，可以直接打开该容器组对应的监控界面。因为篇幅的限制，此处不再展开描述，请点击 +点击图中 ***Nginx 监控***、 ***容器组监控***、 ***所在节点监控*** 等按钮，可以直接打开该容器组对应的监控界面。因为篇幅的限制，此处不再展开描述，请点击 Kuboard 在线体验 查看具体的监控效果。 diff --git a/overview/README.md b/overview/README.md index 9ca7b95..bf04b00 100644 --- a/overview/README.md +++ b/overview/README.md @@ -100,7 +100,7 @@ Kuboard，是一款免费的 Kubernetes 图形化管理工具，Kuboard 力图

    - + Kuboard 在线体验

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

    diff --git a/support/change-log/v1.0.x.md b/support/change-log/v1.0.x.md index f4707db..738f7c9 100644 --- a/support/change-log/v1.0.x.md +++ b/support/change-log/v1.0.x.md @@ -10,10 +10,23 @@ description: 本文描述了Kuboard_v1.0.x的版本变更说明 了解如何 [升级Kuboard](/install/install-dashboard-upgrade.html) * eipwork/kuboard:latest 当前对应的版本是 kuboard v1.0.5.4 -* eipwork/kuboard:beta 当前对应的版本是 kuboard v1.0.6-beta.6 +* eipwork/kuboard:beta 当前对应的版本是 kuboard v1.0.6-beta.9 Kuboard v1.0.x 的更新说明 + +## v1.0.6-beta.9 + +**发布日期** + +2020年2月5日 + +**优化** +登录界面 --> 如果配置了 OIDC，则默认显示用户名密码登录方式，否则，默认显示服务账号登录方式 + +**Bug修正** +* 修复 beta.8中引入的一个 BUG： 当没有定义 Service / Ingress 时，不能显示 Workload 的查看界面 + ## v1.0.6-beta.8 **发布日期**