This commit is contained in:
huanqing.shao
2019-11-03 21:51:07 +08:00
parent a7ffaa1f8d
commit c7ca6dc076
14 changed files with 168 additions and 97 deletions

View File

@ -9,9 +9,9 @@
data-ad-format="auto" data-ad-format="auto"
data-full-width-responsive="true"></ins> data-full-width-responsive="true"></ins>
<script> <script>
if (!window.kuboardSharing) { <!-- if (!window.kuboardSharing) { -->
(adsbygoogle = window.adsbygoogle || []).push({}); (adsbygoogle = window.adsbygoogle || []).push({});
} <!-- } -->
</script> </script>
</div> </div>
</template> </template>

View File

@ -9,9 +9,9 @@
data-ad-format="auto" data-ad-format="auto"
data-full-width-responsive="true"></ins> data-full-width-responsive="true"></ins>
<script> <script>
if (!window.kuboardSharing) { <!-- if (!window.kuboardSharing) { -->
(adsbygoogle = window.adsbygoogle || []).push({}); (adsbygoogle = window.adsbygoogle || []).push({});
} <!-- } -->
</script> </script>
</div> </div>
</template> </template>

View File

@ -1,19 +1,21 @@
<template> <template>
<div v-if="$themeConfig.showAds" :style="$isDev ? 'background-color: grey;' : ''"> <LazyLoad :noAdsOnSharing="true">
<script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script> <div v-if="$themeConfig.showAds" :style="$isDev ? 'background-color: grey;' : ''">
<!-- 正方形-正文 --> <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
<ins class="adsbygoogle" <!-- 正方形-正文 -->
style="display:block" <ins class="adsbygoogle"
data-ad-client="ca-pub-3313149841665250" style="display:block"
data-ad-slot="9455695764" data-ad-client="ca-pub-3313149841665250"
data-ad-format="auto" data-ad-slot="9455695764"
data-full-width-responsive="true"></ins> data-ad-format="auto"
<script> data-full-width-responsive="true"></ins>
if (!window.kuboardSharing) { <script>
(adsbygoogle = window.adsbygoogle || []).push({}); if (!window.kuboardSharing) {
} (adsbygoogle = window.adsbygoogle || []).push({});
</script> }
</div> </script>
</div>
</LazyLoad>
</template> </template>
<script> <script>

View File

@ -1,19 +1,21 @@
<template> <template>
<div v-if="$themeConfig.showAds" :style="$isDev ? 'background-color: grey;' : ''"> <LazyLoad :noAdsOnSharing="true">
<script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script> <div v-if="$themeConfig.showAds" :style="$isDev ? 'background-color: grey;' : ''">
<!-- 正文-垂直 --> <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
<ins class="adsbygoogle" <!-- 正文-垂直 -->
style="display:block" <ins class="adsbygoogle"
data-ad-client="ca-pub-3313149841665250" style="display:block"
data-ad-slot="4549679988" data-ad-client="ca-pub-3313149841665250"
data-ad-format="auto" data-ad-slot="4549679988"
data-full-width-responsive="true"></ins> data-ad-format="auto"
<script> data-full-width-responsive="true"></ins>
if (!window.kuboardSharing) { <script>
(adsbygoogle = window.adsbygoogle || []).push({}); if (!window.kuboardSharing) {
} (adsbygoogle = window.adsbygoogle || []).push({});
</script> }
</div> </script>
</div>
</LazyLoad>
</template> </template>
<script> <script>

View File

@ -0,0 +1,42 @@
<template>
<div v-if="load">
<slot></slot>
</div>
</template>
<script>
export default {
props: {
noAdsOnSharing: { type: Boolean, required: false, default: false }
},
data () {
let load = false
return {
load: load
}
},
mounted () {
setTimeout( _ => {
if (this.noAdsOnSharing) {
console.log('noAdsOnSharing')
if (typeof window !== 'undefined') {
if (this.$isSharing) {
this.load = false
console.log('noAdsOnSharing', this.load)
} else {
this.load = true
console.log('noAdsOnSharing', this.load)
}
}
} else {
this.load = true
console.log('load', this.load)
}
}, 1000)
}
}
</script>
<style>
</style>

View File

@ -1,29 +1,31 @@
<template> <template>
<div> <div>
<div v-for="(item, key) in vssues" :key="key"> <LazyLoad>
<Vssue v-if="item && item > 0" v-show="key === $route.path" :issueId="item" :options="options"/> <div v-for="(item, key) in vssues" :key="key">
<div v-if="item === undefined && isLocalHost" v-show="key === $route.path" :key="key"> <Vssue v-if="item && item > 0" v-show="key === $route.path" :issueId="item" :options="options"/>
<b-button variant="danger" @click="vssues[key] = ''">请创建 VssueId</b-button> <div v-if="item === undefined && isLocalHost" v-show="key === $route.path" :key="key">
<b-button variant="danger" @click="vssues[key] = ''">请创建 VssueId</b-button>
</div>
<div v-if="item === ''">
<b-button variant="warning" @click="refreshId = $refs.vssue[0].vssue.issue.id">请填写 vusseId <span v-if="refreshId"> - {{refreshId}}</span></b-button>
<Vssue ref="vssue" :title="$page.path" :options="options"/>
</div>
</div> </div>
<div v-if="item === ''"> <script type="text/javascript">
<b-button variant="warning" @click="refreshId = $refs.vssue[0].vssue.issue.id">请填写 vusseId <span v-if="refreshId"> - {{refreshId}}</span></b-button> (function(){
<Vssue ref="vssue" :title="$page.path" :options="options"/> var bp = document.createElement('script');
</div> var curProtocol = window.location.protocol.split(':')[0];
</div> if (curProtocol === 'https') {
<script type="text/javascript"> bp.src = 'https://zz.bdstatic.com/linksubmit/push.js';
(function(){ }
var bp = document.createElement('script'); else {
var curProtocol = window.location.protocol.split(':')[0]; bp.src = 'http://push.zhanzhang.baidu.com/push.js';
if (curProtocol === 'https') { }
bp.src = 'https://zz.bdstatic.com/linksubmit/push.js'; var s = document.getElementsByTagName('script')[0];
} s.parentNode.insertBefore(bp, s);
else { })();
bp.src = 'http://push.zhanzhang.baidu.com/push.js'; </script>
} </LazyLoad>
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(bp, s);
})();
</script>
</div> </div>
</template> </template>

View File

@ -1,7 +1,11 @@
<template> <template>
<a aria-label="github" @click="$sendGaEvent('ViewGitHubStar', 'ViewGitHubStarNav', 'ViweGitHubStar:' + $page.path)"> <div style="display: inline-block; width: 100px;">
<iframe style="display:inline-block;vertical-align:middle;" src="https://ghbtns.com/github-btn.html?user=eip-work&amp;repo=kuboard-press&amp;type=star&amp;count=true&amp;size=small" frameborder="0" scrolling="0" width="100px" height="20px"></iframe> <LazyLoad>
</a> <a aria-label="github" @click="$sendGaEvent('ViewGitHubStar', 'ViewGitHubStarNav', 'ViweGitHubStar:' + $page.path)">
<iframe style="display:inline-block;vertical-align:middle;" src="https://ghbtns.com/github-btn.html?user=eip-work&amp;repo=kuboard-press&amp;type=star&amp;count=true&amp;size=small" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
</a>
</LazyLoad>
</div>
</template> </template>
<script> <script>

View File

@ -36,16 +36,16 @@ module.exports = {
['script', { 'data-ad-client': "ca-pub-3313149841665250", async: true, src: "https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"}], ['script', { 'data-ad-client': "ca-pub-3313149841665250", async: true, src: "https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"}],
// <script data-ad-client="ca-pub-3313149841665250" async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script> // <script data-ad-client="ca-pub-3313149841665250" async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
['script', { type: 'text/javascript', async: true, src: "https://bot.4paradigm.com/web/assets/ics-web-sdk-js.js" }], // ['script', { type: 'text/javascript', async: true, src: "https://bot.4paradigm.com/web/assets/ics-web-sdk-js.js" }],
['script', { type: 'text/javascript' }, ` // ['script', { type: 'text/javascript' }, `
window.onload = function() { // window.onload = function() {
if (window.innerWidth > 1360) { // if (window.innerWidth > 1360) {
console.log('init-wechat') // console.log('init-wechat')
IcsWebSdkJs.init('https://bot.4paradigm.com/web/chat/15516/bbc69136-e42c-4299-ba85-c57685c8417d') // IcsWebSdkJs.init('https://bot.4paradigm.com/web/chat/15516/bbc69136-e42c-4299-ba85-c57685c8417d')
} else { // } else {
console.log('窗口太小,不显示机器人') // console.log('窗口太小,不显示机器人')
} // }
}`], // }`],
// <script type="text/javascript" src="https://bot.4paradigm.com/web/assets/ics-web-sdk-js.js"></script> // <script type="text/javascript" src="https://bot.4paradigm.com/web/assets/ics-web-sdk-js.js"></script>

View File

@ -65,9 +65,9 @@ export default ({
if (typeof window !== 'undefined') { if (typeof window !== 'undefined') {
AOS.init({ AOS.init({
easing: 'ease-out-back', 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 sharing = true
window.kuboardSharing = true window.kuboardSharing = true
} else { } else {

View File

@ -1,23 +1,25 @@
<template> <template>
<div class="page-nav" style="max-width: 1000px; padding: 1rem; text-align: center;"> <div class="page-nav" style="max-width: 1000px; padding: 1rem; text-align: center;">
<b-alert style="margin-bottom: 0;" show variant="primary">免费答疑</b-alert> <b-alert style="margin-bottom: 0;" show variant="primary">免费答疑</b-alert>
<grid :rwd="{compact: 'stack'}">
<grid-item size="1/3" :rwd="{tablet: '1/1', compact: '1/1'}" > <div>
<b-card style="height: 100%; margin-top: 1rem;" shadow="none" :body-style="{padding: '0rem 1.5rem'}" <div class="row" style="margin-top: 1rem;">
data-aos="fade-up" data-aos-duration="800"> <div class="col-md-4 col-sm-12">
<h4>QQ群</h4> <b-card style="height: 100%; " shadow="none" :body-style="{padding: '0rem 1.5rem'}"
<div> data-aos="fade-up" data-aos-duration="800">
<!-- 一键进群 --> <h4>QQ群</h4>
<Qq/> <div>
<!-- 808894550 --> <!-- 一键进群 -->
</div> <Qq/>
<p style="margin-bottom: 0; margin-top: 10px;"> <!-- 808894550 -->
<img style="margin: auto; width: 150px;" src="/images/kuboard_qq.png" alt="Kubernetes教程QQ群在线答疑"/> </div>
</p> <p style="margin-bottom: 0; margin-top: 10px;">
</b-card> <img style="margin: auto; width: 150px;" src="/images/kuboard_qq.png" alt="Kubernetes教程QQ群在线答疑"/>
</grid-item> </p>
<grid-item size="1/3" :rwd="{tablet: '1/1', compact: '1/1'}"> </b-card>
<b-card style="height: 100%; color: #2c3e50; line-height: 1.7; margin-top: 1rem;" shadow="none" :body-style="{padding: '0rem 1.5rem'}" </div>
<div class="col-md-4 col-sm-12">
<b-card style="height: 100%; color: #2c3e50; line-height: 1.7; " shadow="none" :body-style="{padding: '0rem 1.5rem'}"
data-aos="fade-up" data-aos-duration="1000"> data-aos="fade-up" data-aos-duration="1000">
<h4>微信群</h4> <h4>微信群</h4>
<div> <div>
@ -30,9 +32,9 @@
</div> </div>
</div> </div>
</b-card> </b-card>
</grid-item> </div>
<grid-item size="1/3" :rwd="{tablet: '1/1', compact: '1/1'}"> <div class="col-md-4 col-sm-12">
<b-card style="height: 100%; color: #2c3e50; line-height: 1.7; margin-top: 1rem; border-color: #f2be45; background-color: rgba(242, 190, 69, 0.1)" shadow="none" :body-style="{padding: '0rem 1.5rem'}" <b-card style="height: 100%; color: #2c3e50; line-height: 1.7; border-color: #f2be45; background-color: rgba(242, 190, 69, 0.1)" shadow="none" :body-style="{padding: '0rem 1.5rem'}"
data-aos="fade-up" data-aos-duration="1200"> data-aos="fade-up" data-aos-duration="1200">
<h4>VIP群</h4> <h4>VIP群</h4>
<div> <div>
@ -45,8 +47,9 @@
</div> </div>
</div> </div>
</b-card> </b-card>
</grid-item> </div>
</grid> </div>
</div>
</div> </div>
</template> </template>

View File

@ -39,13 +39,17 @@
<PageEdit style="max-width: 1000px; padding: 1rem 2.5rem; margin-top: 2rem; background-color: #FFF;"/> <PageEdit style="max-width: 1000px; padding: 1rem 2.5rem; margin-top: 2rem; background-color: #FFF;"/>
<PageNav v-bind="{ sidebarItems }" style="max-width: 1000px; padding: 1rem 2.5rem;"/> <PageNav v-bind="{ sidebarItems }" style="max-width: 1000px; padding: 1rem 2.5rem;"/>
<div class="page-nav" style="max-width: 1000px; padding-top:0; margin-top: 1rem;" v-show="!$frontmatter.lessAds && !$isSharing"> <div class="page-nav" style="max-width: 1000px; padding-top:0; margin-top: 1rem;" v-show="!$frontmatter.lessAds && !$isSharing">
<AdSensePageBottomInline/> <LazyLoad :noAdsOnSharing="true">
<AdSensePageBottomInline/>
</LazyLoad>
</div> </div>
<slot name="bottom" /> <slot name="bottom" />
<PageVssue class="page-nav" style="max-width: 1000px;" v-show="!$isSharing"/> <PageVssue class="page-nav" style="max-width: 1000px;" v-show="!$isSharing"/>
<FriendlyUrl class="page-nav" style="max-width: 1000px;" v-show="!$isSharing"/> <FriendlyUrl class="page-nav" style="max-width: 1000px;" v-show="!$isSharing"/>
<StarGazer/> <StarGazer/>
<AdSenseRightSide v-show="!$isSharing"/> <LazyLoad :noAdsOnSharing="true">
<AdSenseRightSide v-show="!$isSharing"/>
</LazyLoad>
</main> </main>
</template> </template>

View File

@ -33,7 +33,7 @@
</p> </p>
<div> <div>
<a target="_blank" :href="`http://demo.kuboard.cn/#/dashboard?k8sToken=${$site.themeConfig.kuboardToken}`"> <a target="_blank" :href="`http://demo.kuboard.cn/#/dashboard?k8sToken=${$site.themeConfig.kuboardToken}`">
<FancyImage src="/images/preview.gif" alt="Kubernetes教程_Kuboard在线体验" title="Kuboard" description="快速在 Kubernetes 上落地微服务"></FancyImage> <FancyImage style="width: 242px;" src="/images/preview.gif" alt="Kubernetes教程_Kuboard在线体验" title="Kuboard" description="快速在 Kubernetes 上落地微服务"></FancyImage>
</a> </a>
</div> </div>
<p> <p>

View File

@ -75,6 +75,13 @@ Events: <none>
### Pod一直是Pending ### Pod一直是Pending
如果 Pod 一直停留在 `Pending`,意味着该 Pod 不能被调度到某一个节点上。通常,这是因为集群中缺乏足够的资源或者 ***“合适”*** 的资源。在上述 `kubectl describe...` 命令的输出中的 `Events` 字段,会有对应的事件描述为什么 Pod 不能调度到节点上。可能的原因有: 如果 Pod 一直停留在 `Pending`,意味着该 Pod 不能被调度到某一个节点上。通常,这是因为集群中缺乏足够的资源或者 ***“合适”*** 的资源。在上述 `kubectl describe...` 命令的输出中的 `Events` 字段,会有对应的事件描述为什么 Pod 不能调度到节点上。可能的原因有:
* **资源不就绪**:创建 Pod 时,有时候需要依赖于集群中的其他对象, ConfigMap配置字典、PVC存储卷声明例如
* 可能该 Pod 需要的存储卷声明尚未与存储卷绑定Events 信息如下所示:
```
Type Reason Age From Message
---- ------ ---- ---- -------
Warning FailedScheduling <unknown> default-scheduler pod has unbound immediate PersistentVolumeClaims (repated 2 times)
```
* **缺乏足够的资源**可能集群中的CPU或内存都已经耗尽此时您可以尝试 * **缺乏足够的资源**可能集群中的CPU或内存都已经耗尽此时您可以尝试
* 删除某些 Pod * 删除某些 Pod
* 调整Pod的资源请求 * 调整Pod的资源请求

View File

@ -11,6 +11,11 @@ Kuboard v1.0.x 的更新说明
**优化** **优化**
* 日志下载功能优化:
* 可指定起始时间
* 可指定日志文件大小
* 可显示下载进度
* 可取消下载
* 将监控套件的安装脚本从 github 迁移到 https://addons.kuboard.cn * 将监控套件的安装脚本从 github 迁移到 https://addons.kuboard.cn
**BUG 修复** **BUG 修复**