diff --git a/.vuepress/components/ad-list.js b/.vuepress/components/ad-list.js index 5f5e855..4e8cda1 100644 --- a/.vuepress/components/ad-list.js +++ b/.vuepress/components/ad-list.js @@ -5,7 +5,15 @@ module.exports = [ strong: '一键离线安装', action: '去看看', url: 'https://github.com/fanux/sealos', - weight: 60 + weight: 50 + }, + { + name: '免费教程', + description: '廖雪峰研发 Java 进阶教程', + strong: '原价2580元，限时免费', + action: '立即学习', + url: 'https://datayi.cn/w/GR4bGZ3o', + weight: 100 }, // { // name: 'SOCK BOOM', @@ -23,36 +31,13 @@ module.exports = [ // url: 'https://activity.huaweicloud.com/2020feb_promotion/index.html?&fromuser=a3Vib2FyZA==&utm_source=a3Vib2FyZA==&utm_medium=cps&utm_campaign=201905', // weight: 60 // }, - // { - // name: 'Suveng', - // description: '趣丸网络科技 Suveng 免费提供的视频课', - // strong: '免费学习', - // url: 'https://www.bilibili.com/video/av88798402', - // weight: 60, - // }, - // { - // name: '阳明的博客', - // description: 'Kubernetes，', - // strong: '实战课程', - // action: '去看看', - // url: 'https://www.qikqiak.com/post/promotion-51/', - // weight: 1 - // }, - // { - // name: '极客时间', - // description: '精要30计，让DevOps快速落地。', - // strong: 'DevOps实战笔记', - // action: '去看看', - // url: 'https://time.geekbang.org/column/intro/100036601?code=0Totv3yN%2FohiumTclUF4ky4qRYs9Ecq6ZK4IdgNf88M%3D', - // weight: 1 - // }, { name: '腾讯云', description: '【腾讯云】云产品采购季，助力行业复工。', strong: '1核2G云服务器，首年99元', action: '去抢', url: 'https://cloud.tencent.com/act/cps/redirect?redirect=1053&cps_key=2ee6baa049659f4713ddc55a51314372&from=console', - weight: 60 + weight: 50 }, // { // name: '阿里云', diff --git a/guide/README.md b/guide/README.md index 6caf9c3..9dc60d1 100644 --- a/guide/README.md +++ b/guide/README.md @@ -26,7 +26,7 @@ description: 熟悉Kuboard_on_Kubernetes_的最佳途径。 * 根据微服务上下文查看监控结果 - [在微服务上下文中监控 example](example/monitor.html) + [在微服务上下文中监控 example](example/monitor-v2.html) * 了解Kuboard的套件 diff --git a/install/install-dashboard.md b/install/install-dashboard.md index 8f3e696..d967919 100644 --- a/install/install-dashboard.md +++ b/install/install-dashboard.md @@ -39,14 +39,14 @@ Kuboard 是 Kubernetes 的一款图形化管理界面。 | Kubernetes 版本 | Kuboard 版本 | 兼容性 | 说明 | | --------------- | -------------- | ------ | ------------------------------------------------------------ | -| v1.18 | v1.0.x | 😄 | 已验证 | -| v1.17 | v1.0.x | 😄 | 已验证 | -| v1.16 | v1.0.x | 😄 | 已验证 | -| v1.15 | v1.0.x | 😄 | 已验证 | -| v1.14 | v1.0.x | 😄 | 已验证 | -| v1.13 | v1.0.x | 😄 | 已验证 | -| v1.12 | v1.0.x | 😐 | Kubernetes Api v1.12 不支持 dryRun，
Kuboard 不支持 Kubernetes v1.12 | -| v1.11 | v1.0.x | 😐 | Kuboard 不支持 Kubernetes v1.11 | +| v1.18 | v1.0.x， v2.0.x | 😄 | 已验证 | +| v1.17 | v1.0.x， v2.0.x | 😄 | 已验证 | +| v1.16 | v1.0.x， v2.0.x | 😄 | 已验证 | +| v1.15 | v1.0.x， v2.0.x | 😄 | 已验证 | +| v1.14 | v1.0.x， v2.0.x | 😄 | 已验证 | +| v1.13 | v1.0.x， v2.0.x | 😄 | 已验证 | +| v1.12 | v1.0.x， v2.0.x | 😐 | Kubernetes Api v1.12 不支持 dryRun，
Kuboard 不支持 Kubernetes v1.12 | +| v1.11 | v1.0.x， v2.0.x | 😐 | Kuboard 不支持 Kubernetes v1.11 | ## 安装 @@ -59,7 +59,7 @@ Kuboard 是 Kubernetes 的一款图形化管理界面。 > 如果您参考 https://kuboard.cn 网站上提供的 Kubernetes 安装文档，可在 master 节点上执行以下命令。 > 关于版本选择： -> * 当前，Kuboard 正在从 v1.0.x 向 Kuboard v2.0.0 过渡，由于 v2.0.0 仍然处于 beta 状态，latest 版本仍然保持为 v1.0.9.7。新用户可以从 beta 版开始，以获得更好的体验。 +> * 当前，Kuboard 正在从 v1.0.x 向 Kuboard v2.0.0 过渡，v2.0.0-beta.3.c 完成度已经比较高，由于文档尚未更新，latest 版本仍然保持为 v1.0.9.7。新用户可以从 beta 版开始，以获得更好的体验。 > * 参考此文，[了解如何从 v1.0.x 升级到 Kuboard v2.0.x](/support/change-log/upgrade-1-2.html) diff --git a/learning/README.md b/learning/README.md index f2c48a4..260883a 100644 --- a/learning/README.md +++ b/learning/README.md @@ -94,7 +94,7 @@ meta: * [创建ServiceAccount并授权其访问指定的名称空间](/learning/k8s-advanced/sec/kuboard.html) * [实现Kubernetes与GitLab/GitHub的单点登录](/learning/k8s-advanced/sec/authenticate/install.html) * [了解日志聚合](/learning/k8s-advanced/logs/) - * [了解Kubernetes的监控](/guide/example/monitor.html) + * [了解Kubernetes的监控](/guide/example/monitor-v2.html) * [免费获得Kuboard授权](/support/) * 自动伸缩 * 按教程章节顺序对 Kubernetes 各种概念进行深入理解 @@ -202,7 +202,7 @@ meta: * [概述](/learning/k8s-practice/spring-cloud/) * [导入 example 微服务应用](/guide/example/import.html) （15分钟） * 导入一个完整的 example 微服务应用，体验 Spring Cloud 在 Kubernetes 上的部署过程。 -* [在微服务上下文中监控 example](example/monitor.html) +* [在微服务上下文中监控 example](/guide/example/monitor-v2.html) * 根据微服务上下文查看监控结果 在 Kubernetes 上部署 Spring Cloud 微服务：(Open Capacity Platform) diff --git a/package.json b/package.json index 31cee29..ca551b6 100644 --- a/package.json +++ b/package.json @@ -1,18 +1,17 @@ { "scripts": { - "dev": "vuepress dev .", - "start": "nodemon --ext md,vue --watch .vuepress --watch . --exec vuepress dev", + "docs:dev": "vuepress dev .", "docs:build": "vuepress build ." }, "dependencies": { "@vssue/api-github-v4": "^1.4.0", "@vssue/vuepress-plugin-vssue": "^1.4.6", - "@vuepress/plugin-active-header-links": "^1.5.0", - "@vuepress/plugin-back-to-top": "^1.5.0", - "@vuepress/plugin-google-analytics": "^1.5.0", - "@vuepress/plugin-medium-zoom": "^1.5.0", - "@vuepress/plugin-nprogress": "^1.5.0", - "@vuepress/plugin-pwa": "^1.5.0", + "@vuepress/plugin-active-header-links": "^1.3.1", + "@vuepress/plugin-back-to-top": "^1.3.1", + "@vuepress/plugin-google-analytics": "^1.3.1", + "@vuepress/plugin-medium-zoom": "^1.3.1", + "@vuepress/plugin-nprogress": "^1.3.1", + "@vuepress/plugin-pwa": "^1.3.1", "animated-number-vue": "^1.0.0", "aos": "^2.3.4", "axios": "^0.19.2", @@ -21,16 +20,19 @@ "bootstrap-vue": "^2.15.0", "date-fns": "^1.30.1", "esm": "^3.2.25", + "nodemon": "2.0.4", "reduce-css-calc": "^2.1.7", "vue2-animate": "^2.1.3", - "vuepress": "^1.5.0", + "vuepress": "^1.3.1", "vuepress-plugin-baidu-autopush": "^1.0.1", "vuepress-plugin-code-copy": "^1.0.6", "vuepress-plugin-code-switcher": "^1.0.3", "vuepress-plugin-named-chunks": "^1.1.3", "vuepress-plugin-reading-progress": "^1.0.9", "vuepress-plugin-seo": "^0.1.3", - "vuepress-plugin-sitemap": "2.1.2", - "nodemon": "2.0.4" + "vuepress-plugin-sitemap": "2.1.2" + }, + "resolutions": { + "watchpack": "1.6.1" } } diff --git a/support/change-log/change-log-on-the-way-2.0.md b/support/change-log/change-log-on-the-way-2.0.md index aef4bb7..a8a2752 100644 --- a/support/change-log/change-log-on-the-way-2.0.md +++ b/support/change-log/change-log-on-the-way-2.0.md @@ -9,4 +9,6 @@ * 节点管理操作，驱逐、封禁等 -增加个按内存排序使用量排序的功能， 在那个TOP的地方 +**BUG 修复** +* 创建 PVC 后，列表未刷新 +* 工作负载编辑页，不创建 Service 时，不应该显示端口列表 diff --git a/support/change-log/v2.0.x.md b/support/change-log/v2.0.x.md index ca96477..f3f8a31 100644 --- a/support/change-log/v2.0.x.md +++ b/support/change-log/v2.0.x.md @@ -13,6 +13,24 @@ Kuboard v2.0.x 的更新说明 了解 [从Kuboard v1.0.x 升级到 Kuboard v2.0.x](./upgrade-1-2.html) +## v2.0.0-beta.3.c + +**发布日期** + +2020年6月1日 + +**优化** + +* 套件 + * 开发者模式 + * 参数页面，可以修改参数的元数据信息 + * 参数页面，可以修改额外操作的 html 代码 + * 安装页面，可以预览参数的命中次数 + * 套件仓库 + * 列表页不允许选择已经安装套件 + * 资源监控套件 + * 将 Grafana 的管理用户名参数化 + ## v2.0.0-beta.3.b **发布日期** diff --git a/yarn.lock b/yarn.lock index 591f2f2..56bb44d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1134,21 +1134,21 @@ markdown-it-table-of-contents "^0.4.0" prismjs "^1.13.0" -"@vuepress/plugin-active-header-links@1.5.0", "@vuepress/plugin-active-header-links@^1.5.0": +"@vuepress/plugin-active-header-links@1.5.0", "@vuepress/plugin-active-header-links@^1.3.1": version "1.5.0" resolved "https://registry.npm.taobao.org/@vuepress/plugin-active-header-links/download/@vuepress/plugin-active-header-links-1.5.0.tgz#a7b9ce361e97119928f5209aeda69b699205bd31" integrity sha1-p7nONh6XEZko9SCa7aabaZIFvTE= dependencies: lodash.debounce "^4.0.8" -"@vuepress/plugin-back-to-top@^1.5.0": +"@vuepress/plugin-back-to-top@^1.3.1": version "1.5.0" resolved "https://registry.npm.taobao.org/@vuepress/plugin-back-to-top/download/@vuepress/plugin-back-to-top-1.5.0.tgz#393cbc392ac7c1718cdbdbcac6375f8079a57912" integrity sha1-OTy8OSrHwXGM29vKxjdfgHmleRI= dependencies: lodash.debounce "^4.0.8" -"@vuepress/plugin-google-analytics@^1.5.0": +"@vuepress/plugin-google-analytics@^1.3.1": version "1.5.0" resolved "https://registry.npm.taobao.org/@vuepress/plugin-google-analytics/download/@vuepress/plugin-google-analytics-1.5.0.tgz#07a9783739a552e3e4c435e3e2ad64432a540002" integrity sha1-B6l4NzmlUuPkxDXj4q1kQypUAAI= @@ -1160,21 +1160,21 @@ dependencies: cross-spawn "^6.0.5" -"@vuepress/plugin-medium-zoom@^1.5.0": +"@vuepress/plugin-medium-zoom@^1.3.1": version "1.5.0" resolved "https://registry.npm.taobao.org/@vuepress/plugin-medium-zoom/download/@vuepress/plugin-medium-zoom-1.5.0.tgz#99a574f6c52570ae16be3de529bdc556d09f88fe" integrity sha1-maV09sUlcK4Wvj3lKb3FVtCfiP4= dependencies: medium-zoom "^1.0.4" -"@vuepress/plugin-nprogress@1.5.0", "@vuepress/plugin-nprogress@^1.5.0": +"@vuepress/plugin-nprogress@1.5.0", "@vuepress/plugin-nprogress@^1.3.1": version "1.5.0" resolved "https://registry.npm.taobao.org/@vuepress/plugin-nprogress/download/@vuepress/plugin-nprogress-1.5.0.tgz#bbf5d331a4acc1d862e2c7143b3b7587c3e4f0cc" integrity sha1-u/XTMaSswdhi4scUOzt1h8Pk8Mw= dependencies: nprogress "^0.2.0" -"@vuepress/plugin-pwa@^1.5.0": +"@vuepress/plugin-pwa@^1.3.1": version "1.5.0" resolved "https://registry.npm.taobao.org/@vuepress/plugin-pwa/download/@vuepress/plugin-pwa-1.5.0.tgz#700ac453e1f670a662af2fbc6455b3e98488843d" integrity sha1-cArEU+H2cKZiry+8ZFWz6YSIhD0= @@ -2225,7 +2225,7 @@ chokidar@^2.0.3, chokidar@^2.1.8: optionalDependencies: fsevents "^1.2.7" -chokidar@^3.2.2, chokidar@^3.4.0: +chokidar@^3.2.2: version "3.4.0" resolved "https://registry.npm.taobao.org/chokidar/download/chokidar-3.4.0.tgz#b30611423ce376357c765b9b8f904b9fba3c0be8" integrity sha1-swYRQjzjdjV8dlubj5BLn7o8C+g= @@ -7976,7 +7976,7 @@ vuepress-plugin-smooth-scroll@^0.0.3: dependencies: smoothscroll-polyfill "^0.4.3" -vuepress@^1.5.0: +vuepress@^1.3.1: version "1.5.0" resolved "https://registry.npm.taobao.org/vuepress/download/vuepress-1.5.0.tgz#690ed2b190844c2e53665df1e211a5fb107a8de7" integrity sha1-aQ7SsZCETC5TZl3x4hGl+xB6jec= @@ -7988,23 +7988,14 @@ vuepress@^1.5.0: opencollective-postinstall "^2.0.2" update-notifier "^4.0.0" -watchpack-chokidar2@^2.0.0: - version "2.0.0" - resolved "https://registry.npm.taobao.org/watchpack-chokidar2/download/watchpack-chokidar2-2.0.0.tgz?cache=0&sync_timestamp=1589640722705&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwatchpack-chokidar2%2Fdownload%2Fwatchpack-chokidar2-2.0.0.tgz#9948a1866cbbd6cb824dea13a7ed691f6c8ddff0" - integrity sha1-mUihhmy71suCTeoTp+1pH2yN3/A= +watchpack@1.6.1, watchpack@^1.6.1: + version "1.6.1" + resolved "https://registry.npm.taobao.org/watchpack/download/watchpack-1.6.1.tgz?cache=0&sync_timestamp=1589640713702&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwatchpack%2Fdownload%2Fwatchpack-1.6.1.tgz#280da0a8718592174010c078c7585a74cd8cd0e2" + integrity sha1-KA2gqHGFkhdAEMB4x1hadM2M0OI= dependencies: chokidar "^2.1.8" - -watchpack@^1.6.1: - version "1.7.2" - resolved "https://registry.npm.taobao.org/watchpack/download/watchpack-1.7.2.tgz?cache=0&sync_timestamp=1589640713702&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwatchpack%2Fdownload%2Fwatchpack-1.7.2.tgz#c02e4d4d49913c3e7e122c3325365af9d331e9aa" - integrity sha1-wC5NTUmRPD5+EiwzJTZa+dMx6ao= - dependencies: graceful-fs "^4.1.2" neo-async "^2.5.0" - optionalDependencies: - chokidar "^3.4.0" - watchpack-chokidar2 "^2.0.0" wbuf@^1.1.0, wbuf@^1.7.3: version "1.7.3"