diff --git a/.vuepress/components/AdSensePageBottomInline.vue b/.vuepress/components/AdSensePageBottomInline.vue index 81d77d4..20b811c 100644 --- a/.vuepress/components/AdSensePageBottomInline.vue +++ b/.vuepress/components/AdSensePageBottomInline.vue @@ -9,9 +9,9 @@ data-ad-format="auto" data-full-width-responsive="true"> diff --git a/.vuepress/components/AdSenseRightSide.vue b/.vuepress/components/AdSenseRightSide.vue index 2a0d80e..1eceaa1 100644 --- a/.vuepress/components/AdSenseRightSide.vue +++ b/.vuepress/components/AdSenseRightSide.vue @@ -9,9 +9,9 @@ data-ad-format="auto" data-full-width-responsive="true"> diff --git a/.vuepress/components/AdSenseSquare.vue b/.vuepress/components/AdSenseSquare.vue index 397fd3c..0e06c4c 100644 --- a/.vuepress/components/AdSenseSquare.vue +++ b/.vuepress/components/AdSenseSquare.vue @@ -1,19 +1,21 @@ - - - - + +
+ + + + +
+
+ + diff --git a/.vuepress/components/PageVssue.vue b/.vuepress/components/PageVssue.vue index d4f1d75..afd5d06 100644 --- a/.vuepress/components/PageVssue.vue +++ b/.vuepress/components/PageVssue.vue @@ -1,29 +1,31 @@ diff --git a/.vuepress/components/StarCount.vue b/.vuepress/components/StarCount.vue index 8709dae..00cf73a 100644 --- a/.vuepress/components/StarCount.vue +++ b/.vuepress/components/StarCount.vue @@ -1,7 +1,11 @@ - ['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 89ca8e1..8b1c484 100644 --- a/.vuepress/enhanceApp.js +++ b/.vuepress/enhanceApp.js @@ -65,9 +65,9 @@ export default ({ if (typeof window !== 'undefined') { AOS.init({ easing: 'ease-out-back', - duration: 1000 + duration: 1200 }); - if (location.search && location.search.indexOf('sharing') >=0) { + if (location.search && (location.search.indexOf('sharing') >=0 || location.search.indexOf('from=timeline') >= 0)) { sharing = true window.kuboardSharing = true } else { diff --git a/.vuepress/theme/components/JoinCommunity.vue b/.vuepress/theme/components/JoinCommunity.vue index 6e508e4..6fa8250 100644 --- a/.vuepress/theme/components/JoinCommunity.vue +++ b/.vuepress/theme/components/JoinCommunity.vue @@ -1,23 +1,25 @@ diff --git a/.vuepress/theme/components/Page.vue b/.vuepress/theme/components/Page.vue index cccdadc..e88c0ea 100644 --- a/.vuepress/theme/components/Page.vue +++ b/.vuepress/theme/components/Page.vue @@ -39,13 +39,17 @@ - + + + diff --git a/.vuepress/theme/components/Sidebar.vue b/.vuepress/theme/components/Sidebar.vue index 809b7e7..ecdbf5a 100644 --- a/.vuepress/theme/components/Sidebar.vue +++ b/.vuepress/theme/components/Sidebar.vue @@ -33,7 +33,7 @@

diff --git a/learning/k8s-advanced/ts/application.md b/learning/k8s-advanced/ts/application.md index df2be11..f63847f 100644 --- a/learning/k8s-advanced/ts/application.md +++ b/learning/k8s-advanced/ts/application.md @@ -75,6 +75,13 @@ Events: ### Pod一直是Pending 如果 Pod 一直停留在 `Pending`,意味着该 Pod 不能被调度到某一个节点上。通常,这是因为集群中缺乏足够的资源或者 ***“合适”*** 的资源。在上述 `kubectl describe...` 命令的输出中的 `Events` 字段,会有对应的事件描述为什么 Pod 不能调度到节点上。可能的原因有: +* **资源不就绪**:创建 Pod 时,有时候需要依赖于集群中的其他对象, ConfigMap(配置字典)、PVC(存储卷声明)等,例如 + * 可能该 Pod 需要的存储卷声明尚未与存储卷绑定,Events 信息如下所示: + ``` + Type Reason Age From Message + ---- ------ ---- ---- ------- + Warning FailedScheduling default-scheduler pod has unbound immediate PersistentVolumeClaims (repated 2 times) + ``` * **缺乏足够的资源**:可能集群中的CPU或内存都已经耗尽,此时,您可以尝试: * 删除某些 Pod * 调整Pod的资源请求 diff --git a/support/change-log/change-log-on-the-way.md b/support/change-log/change-log-on-the-way.md index c032847..d4aec08 100644 --- a/support/change-log/change-log-on-the-way.md +++ b/support/change-log/change-log-on-the-way.md @@ -11,6 +11,11 @@ Kuboard v1.0.x 的更新说明 **优化** +* 日志下载功能优化: + * 可指定起始时间 + * 可指定日志文件大小 + * 可显示下载进度 + * 可取消下载 * 将监控套件的安装脚本从 github 迁移到 https://addons.kuboard.cn **BUG 修复**