fixing

2019-10-31 19:26:22 +08:00
parent e2b5ddc583
commit 005a047d3c
26 changed files with 622 additions and 71 deletions
--- a/.vuepress/components/AdSenseTitle.vue
+++ b/.vuepress/components/AdSenseTitle.vue
@ -1,6 +1,6 @@
 <template>
  <div :style="$isDev ? 'background-color: #grey;' : ''">
-    <div class="ads" v-if="!$frontmatter.lessAds && $themeConfig.showAds && !isSharing">
+    <div class="ads" v-if="!$frontmatter.lessAds && $themeConfig.showAds && isNotSharing">
      <div>
        <a @click="clickAds" :href="random.url" target="_blank" rel="nofollow" style="text-decoration: none;">
          <span class="name">
@ -40,13 +40,16 @@ export default {
  data () {
    return {
      ads: require('./ad-list'),
-      isSharing: false
+      isNotSharing: false
    }
  },
  mounted () {
    if (typeof window !== 'undefined') {
      if (location.search !== undefined && location.search.indexOf('sharing') >= 0) {
-        this.isSharing = true
+        // 如果带参数 sharing，则设置 isSharing = true
+        this.$set(this, 'isNotSharing', false)
+      } else {
+        this.$set(this, 'isNotSharing', true)
      }
    }
  },
--- a/.vuepress/components/InstallBanner.vue
+++ b/.vuepress/components/InstallBanner.vue
@ -0,0 +1,132 @@
+<template>
+  <div>
+
+    <link rel="stylesheet" href="/landing/css/googlefont.css">
+    <link rel="stylesheet" href="/landing/css/font-awesome.min.css">
+
+    <link rel="stylesheet" href="/landing/css/style.css">
+    <link rel="stylesheet" href="/landing/css/components.css">
+    <div class="py-80" id="features" style="padding-top: 1rem;">
+        <div class="container">
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="text-center" style="margin-bottom: 1rem;">
+                        <div class="text-primary-title">网上那么多 Kubernetes 安装文档，为什么这篇文档更有参考价值？</div>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-md-4" >
+                    <!-- InfoBox Center  <Start> -->
+                    <div class="cs-infobox-left mt-4 feature">
+                      <div class="feature-title">
+                        <img src="/landing/images/icn3.svg" alt="" class="img-fluid">
+                        <div class="text-primary-title">广泛验证</div>
+                      </div>
+                      <div class="feature-description">
+                        <li>每天有超过 300 人参考此文档完成 Kubernetes 集群的安装</li>
+                        <li>不断有网友对安装文档提出改进意见</li>
+                      </div>
+                    </div>
+                    <!-- InfoBox Center </End> -->
+                </div>
+              
+                <div class="col-md-4 bg-gray">
+                    <!-- InfoBox Center  <Start> -->
+                    <div class="cs-infobox-left mt-4 feature" data-aos="fade-up" data-aos-anchor-placement="top-bottom" data-aos-duration="1600">
+                      <div class="feature-title">
+                        <img src="/landing/images/icn4.svg" alt="" class="img-fluid">
+                        <div class="text-primary-title">持续更新</div>
+                      </div>
+                      <div class="feature-description">
+                        <li>始终有最新的 Kubernetes 稳定版安装文档</li>
+                        <li>当前版本 Kubernetes {{version}}</li>
+                        <li>已完成了 <span style="font-weight: 500; color: red;">{{updateCount}} 次更新</span>，每次更新都帮您排除一个或更多可能踩的坑。
+                          <a href="https://github.com/eip-work/kuboard-press/commits/master/install/install-k8s.md" target="_blank">
+                            查看更新历史
+                            <svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" x="0px" y="0px" viewBox="0 0 100 100" width="15" height="15" class="icon outbound"><path fill="currentColor" d="M18.8,85.1h56l0,0c2.2,0,4-1.8,4-4v-32h-8v28h-48v-48h28v-8h-32l0,0c-2.2,0-4,1.8-4,4v56C14.8,83.3,16.6,85.1,18.8,85.1z"></path> <polygon fill="currentColor" points="45.7,48.7 51.3,54.3 77.2,28.5 77.2,37.2 85.2,37.2 85.2,14.9 62.8,14.9 62.8,22.9 71.5,22.9"></polygon></svg>
+                          </a>
+                        </li>
+                      </div>
+                    </div>
+                    <!-- InfoBox Center </End> -->
+                </div>
+                <div class="col-md-4">
+                    <!-- InfoBox Left  <Start> -->
+                    <div class="cs-infobox-left mt-4 feature" data-aos="fade-up" data-aos-anchor-placement="top-bottom" data-aos-duration="1000">
+                      <div class="feature-title">
+                        <img src="/landing/images/icn5.svg" alt="" class="img-fluid">
+                        <div class="text-primary-title">适应面广</div>
+                      </div>
+                      <div class="feature-description">
+                        <li>大部分的 K8S 安装文档都是个人爱好者的一份笔记而已，他当时的特定条件并不一定适用于你</li>
+                        <li>此文档经众多网友验证，在公有云、私有云、自建虚拟机等多种条件下均适用</li>
+                      </div>
+                    </div>
+                    <!-- InfoBox Left </End> -->
+                </div>
+                <div class="col-md-4 bg-gray">
+                    <!-- InfoBox Center  <Start> -->
+                    <div class="cs-infobox-left mt-4 feature" data-aos="fade-up" data-aos-anchor-placement="top-bottom" data-aos-duration="1800">
+                      <div class="feature-title">
+                        <img src="/landing/images/icn1.svg" alt="" class="img-fluid">
+                        <div class="text-primary-title">在线答疑</div>
+                      </div>
+                      <div class="feature-description">
+                        <Qq></Qq> 808894550
+                        
+                        <p>
+                          <img src="/images/kuboard_qq.png" alt="Kubernetes安装：QQ群在线答疑" style="width: 120px;"/>
+                          <br/>如需远程协助，请扫描本文页尾的微信二维码
+                        </p>
+                      </div>
+                    </div>
+                    <!-- InfoBox Center </End> -->
+                </div>
+            </div>
+        </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    version: { type: String, required: true },
+    updateCount: { type: String, required: true }
+  },
+  data () {
+    return {
+      show: false
+    }
+  },
+  mounted () {
+    this.show = true
+  }
+}
+</script>
+
+<style scoped>
+.text-primary-title {
+  font-size: 1rem;
+  font-weight: 500;
+  margin-top: 0.7rem;
+}
+.feature {
+  text-align: left;
+  padding: 1rem;
+  margin-bottom: 0;
+  border-top: solid 1px #f7f7f7;
+}
+.feature-title {
+  display: inline-block;
+  text-align: center;
+}
+.feature-description {
+  display: inline-block;
+  max-width: calc(100% - 64px - 2rem);
+  padding: 0 0 0 1rem;
+  vertical-align: top;
+  text-align: left;
+}
+</style>
--- a/.vuepress/components/InstallEnvCheck.vue
+++ b/.vuepress/components/InstallEnvCheck.vue
@ -7,18 +7,19 @@

    <div>

-      <p style="color: red">必须选中下面的六个勾选框才能继续</p>
+      <p style="color: red">必须选中下面的 {{envCount}} 个勾选框才能继续</p>
      <p>选中后显示 安装 docker/kubelet 的文档</p>

-      <div style="display: inline-block; width: 480px; max-width: calc(100vw - 100px); overflow: hidden; line-height: 40px; background-color: rgba(255,229,100,0.3); padding: 20px 0 0 20px; margin-bottom: 20px; border: 1px solid #d7dae2;">
+      <div style="display: inline-block; width: 520px; max-width: calc(100vw - 100px); overflow: hidden; line-height: 40px; background-color: rgba(255,229,100,0.3); padding: 20px 0 0 20px; margin-bottom: 20px; border: 1px solid #d7dae2;">
      <el-form :model="form" ref="envForm" :rules="rules" style="text-align: left;">
      <el-form-item prop="checked" class="env-form-item">
      <el-checkbox-group v-model="form.checked">
        <li style="height: 40px;"> <el-checkbox style="width: 300px; max-width: calc(100vw - 100px); text-align: left;" label="centos">我的任意节点 centos 版本在兼容列表中</el-checkbox> </li>
        <li style="height: 40px;"> <el-checkbox style="width: 300px; max-width: calc(100vw - 100px); text-align: left;" label="cpu">我的任意节点 CPU 内核数量大于等于 2</el-checkbox> </li>
-        <li style="height: 40px;"> <el-checkbox style="width: 300px; max-width: calc(100vw - 100px); text-align: left;" label="hostname">我的任意节点 hostname 不是 localhost，且不包含下划线和小数点</el-checkbox> </li>
+        <li style="height: 40px;"> <el-checkbox style="width: 300px; max-width: calc(100vw - 100px); text-align: left;" label="hostname">我的任意节点 hostname 不是 localhost，且不包含下划线、小数点、大写字母</el-checkbox> </li>
        <li style="height: 40px;"> <el-checkbox style="width: 300px; max-width: calc(100vw - 100px); text-align: left;" label="ipaddress">我的任意节点都有固定的内网 IP 地址</el-checkbox> </li>
        <li style="height: 40px;"> <el-checkbox style="width: 300px; max-width: calc(100vw - 100px); text-align: left;" label="networkcard">我的任意节点只有一块网卡（可以在完成K8S安装后再添加网卡）</el-checkbox> </li>
+        <li style="height: 40px;"> <el-checkbox style="width: 300px; max-width: calc(100vw - 100px); text-align: left;" label="nat">如果我直接使用vmware等创建虚拟机，我使用NAT网络，而不是桥接网络</el-checkbox> </li>
        <li style="height: 40px;"> <el-checkbox style="width: 300px; max-width: calc(100vw - 100px); text-align: left;" label="docker">我的任意节点不会直接使用 docker run 或 docker-compose 运行容器</el-checkbox> </li>
      </el-checkbox-group>
      </el-form-item>
@ -44,7 +45,7 @@
 </template>

 <script>
-const ENV_COUNT = 6
+const ENV_COUNT = 7

 export default {
  props: {
@ -62,6 +63,7 @@ export default {
      form: {
        checked: []
      },
+      envCount: ENV_COUNT,
      rules: {
        checked: [{validator: validateEnv, trigger: 'change'}]
      }
@ -85,7 +87,7 @@ export default {
    },
    envOk () {
      if (this.envOk) {
-        this.$message.success('如果您符合刚才六个条件，请继续安装')
+        this.$message.success(`如果您符合刚才 ${ENV_COUNT} 个条件，请继续安装`)
        this.$sendGaEvent('install-' + this.type, 'envOk-' + this.type, '已确认环境符合条件-' + this.type)
      }
    }
--- a/.vuepress/config-sidebar.js
+++ b/.vuepress/config-sidebar.js
@ -203,6 +203,7 @@ module.exports = {
                'k8s-intermediate/workload/wl-job/',
                'k8s-intermediate/workload/wl-job/spec',
                'k8s-intermediate/workload/wl-job/failure',
+                'k8s-intermediate/workload/wl-job/cleanup',
              ]
            }
          ]
--- a/.vuepress/public/install-script/k8s-dashboard/v2.0.0-beta5.yaml
+++ b/.vuepress/public/install-script/k8s-dashboard/v2.0.0-beta5.yaml
@ -0,0 +1,302 @@
+# Copyright 2017 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: kubernetes-dashboard
+
+---
+
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    k8s-app: kubernetes-dashboard
+  name: kubernetes-dashboard
+  namespace: kubernetes-dashboard
+
+---
+
+kind: Service
+apiVersion: v1
+metadata:
+  labels:
+    k8s-app: kubernetes-dashboard
+  name: kubernetes-dashboard
+  namespace: kubernetes-dashboard
+spec:
+  ports:
+    - port: 443
+      targetPort: 8443
+  selector:
+    k8s-app: kubernetes-dashboard
+
+---
+
+apiVersion: v1
+kind: Secret
+metadata:
+  labels:
+    k8s-app: kubernetes-dashboard
+  name: kubernetes-dashboard-certs
+  namespace: kubernetes-dashboard
+type: Opaque
+
+---
+
+apiVersion: v1
+kind: Secret
+metadata:
+  labels:
+    k8s-app: kubernetes-dashboard
+  name: kubernetes-dashboard-csrf
+  namespace: kubernetes-dashboard
+type: Opaque
+data:
+  csrf: ""
+
+---
+
+apiVersion: v1
+kind: Secret
+metadata:
+  labels:
+    k8s-app: kubernetes-dashboard
+  name: kubernetes-dashboard-key-holder
+  namespace: kubernetes-dashboard
+type: Opaque
+
+---
+
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  labels:
+    k8s-app: kubernetes-dashboard
+  name: kubernetes-dashboard-settings
+  namespace: kubernetes-dashboard
+
+---
+
+kind: Role
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  labels:
+    k8s-app: kubernetes-dashboard
+  name: kubernetes-dashboard
+  namespace: kubernetes-dashboard
+rules:
+  # Allow Dashboard to get, update and delete Dashboard exclusive secrets.
+  - apiGroups: [""]
+    resources: ["secrets"]
+    resourceNames: ["kubernetes-dashboard-key-holder", "kubernetes-dashboard-certs", "kubernetes-dashboard-csrf"]
+    verbs: ["get", "update", "delete"]
+    # Allow Dashboard to get and update 'kubernetes-dashboard-settings' config map.
+  - apiGroups: [""]
+    resources: ["configmaps"]
+    resourceNames: ["kubernetes-dashboard-settings"]
+    verbs: ["get", "update"]
+    # Allow Dashboard to get metrics.
+  - apiGroups: [""]
+    resources: ["services"]
+    resourceNames: ["heapster", "dashboard-metrics-scraper"]
+    verbs: ["proxy"]
+  - apiGroups: [""]
+    resources: ["services/proxy"]
+    resourceNames: ["heapster", "http:heapster:", "https:heapster:", "dashboard-metrics-scraper", "http:dashboard-metrics-scraper"]
+    verbs: ["get"]
+
+---
+
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  labels:
+    k8s-app: kubernetes-dashboard
+  name: kubernetes-dashboard
+rules:
+  # Allow Metrics Scraper to get metrics from the Metrics server
+  - apiGroups: ["metrics.k8s.io"]
+    resources: ["pods", "nodes"]
+    verbs: ["get", "list", "watch"]
+
+---
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  labels:
+    k8s-app: kubernetes-dashboard
+  name: kubernetes-dashboard
+  namespace: kubernetes-dashboard
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: kubernetes-dashboard
+subjects:
+  - kind: ServiceAccount
+    name: kubernetes-dashboard
+    namespace: kubernetes-dashboard
+
+---
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: kubernetes-dashboard
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: kubernetes-dashboard
+subjects:
+  - kind: ServiceAccount
+    name: kubernetes-dashboard
+    namespace: kubernetes-dashboard
+
+---
+
+kind: Deployment
+apiVersion: apps/v1
+metadata:
+  labels:
+    k8s-app: kubernetes-dashboard
+  name: kubernetes-dashboard
+  namespace: kubernetes-dashboard
+spec:
+  replicas: 1
+  revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+      k8s-app: kubernetes-dashboard
+  template:
+    metadata:
+      labels:
+        k8s-app: kubernetes-dashboard
+    spec:
+      containers:
+        - name: kubernetes-dashboard
+          image: kubernetesui/dashboard:v2.0.0-beta5
+          imagePullPolicy: Always
+          ports:
+            - containerPort: 8443
+              protocol: TCP
+          args:
+            - --auto-generate-certificates
+            - --namespace=kubernetes-dashboard
+            # Uncomment the following line to manually specify Kubernetes API server Host
+            # If not specified, Dashboard will attempt to auto discover the API server and connect
+            # to it. Uncomment only if the default does not work.
+            # - --apiserver-host=http://my-address:port
+          volumeMounts:
+            - name: kubernetes-dashboard-certs
+              mountPath: /certs
+              # Create on-disk volume to store exec logs
+            - mountPath: /tmp
+              name: tmp-volume
+          livenessProbe:
+            httpGet:
+              scheme: HTTPS
+              path: /
+              port: 8443
+            initialDelaySeconds: 30
+            timeoutSeconds: 30
+          securityContext:
+            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: true
+            runAsUser: 1001
+            runAsGroup: 2001
+      volumes:
+        - name: kubernetes-dashboard-certs
+          secret:
+            secretName: kubernetes-dashboard-certs
+        - name: tmp-volume
+          emptyDir: {}
+      serviceAccountName: kubernetes-dashboard
+      nodeSelector:
+        "beta.kubernetes.io/os": linux
+      # Comment the following tolerations if Dashboard must not be deployed on master
+      tolerations:
+        - key: node-role.kubernetes.io/master
+          effect: NoSchedule
+
+---
+
+kind: Service
+apiVersion: v1
+metadata:
+  labels:
+    k8s-app: dashboard-metrics-scraper
+  name: dashboard-metrics-scraper
+  namespace: kubernetes-dashboard
+spec:
+  ports:
+    - port: 8000
+      targetPort: 8000
+  selector:
+    k8s-app: dashboard-metrics-scraper
+
+---
+
+kind: Deployment
+apiVersion: apps/v1
+metadata:
+  labels:
+    k8s-app: dashboard-metrics-scraper
+  name: dashboard-metrics-scraper
+  namespace: kubernetes-dashboard
+spec:
+  replicas: 1
+  revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+      k8s-app: dashboard-metrics-scraper
+  template:
+    metadata:
+      labels:
+        k8s-app: dashboard-metrics-scraper
+      annotations:
+        seccomp.security.alpha.kubernetes.io/pod: 'runtime/default'
+    spec:
+      containers:
+        - name: dashboard-metrics-scraper
+          image: kubernetesui/metrics-scraper:v1.0.1
+          ports:
+            - containerPort: 8000
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              scheme: HTTP
+              path: /
+              port: 8000
+            initialDelaySeconds: 30
+            timeoutSeconds: 30
+          volumeMounts:
+          - mountPath: /tmp
+            name: tmp-volume
+          securityContext:
+            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: true
+            runAsUser: 1001
+            runAsGroup: 2001
+      serviceAccountName: kubernetes-dashboard
+      nodeSelector:
+        "beta.kubernetes.io/os": linux
+      # Comment the following tolerations if Dashboard must not be deployed on master
+      tolerations:
+        - key: node-role.kubernetes.io/master
+          effect: NoSchedule
+      volumes:
+        - name: tmp-volume
+          emptyDir: {}
--- a/.vuepress/public/landing.html
+++ b/.vuepress/public/landing.html
@ -345,7 +345,7 @@
                                <div class="slider-item">
                                    <div class="testimonial-default">
                                        <!-- <div class="testimonial-default-img"><img src="landing/images/female-75.jpg" alt="" class="center-block img-fluid"></div> -->
-                                        <h4>2019年8月3日推出 Kuboard</h4>
+                                        <h4>2019年8月3日首次发布 Kuboard</h4>
                                        <h5>获得种子用户，解决一些兼容性问题</h5>
                                    </div>
                                </div>
@ -359,8 +359,8 @@
                                <div class="slider-item">
                                    <div class="testimonial-default">
                                        <!-- <div class="testimonial-default-img"><img src="landing/images/29.jpg" alt="" class="center-block img-fluid"></div> -->
-                                        <h4>2019年10月20日</h4>
-                                        <h5>获得第 629 颗 Github Star</h5>
+                                        <h4>2019年10月30日</h4>
+                                        <h5>获得第 855 颗 Github Star</h5>
                                    </div>
                                </div>
                            </div>
--- a/.vuepress/public/landing/images/trend.png
+++ b/.vuepress/public/landing/images/trend.png
--- a/.vuepress/public/share.html
+++ b/.vuepress/public/share.html
@ -345,7 +345,7 @@
                                <div class="slider-item">
                                    <div class="testimonial-default">
                                        <!-- <div class="testimonial-default-img"><img src="landing/images/female-75.jpg" alt="" class="center-block img-fluid"></div> -->
-                                        <h4>2019年8月3日推出 Kuboard</h4>
+                                        <h4>2019年8月3日首次发布 Kuboard</h4>
                                        <h5>获得种子用户，解决一些兼容性问题</h5>
                                    </div>
                                </div>
@ -359,8 +359,8 @@
                                <div class="slider-item">
                                    <div class="testimonial-default">
                                        <!-- <div class="testimonial-default-img"><img src="landing/images/29.jpg" alt="" class="center-block img-fluid"></div> -->
-                                        <h4>2019年10月20日</h4>
-                                        <h5>获得第 629 颗 Github Star</h5>
+                                        <h4>2019年10月30日</h4>
+                                        <h5>获得第 855 颗 Github Star</h5>
                                    </div>
                                </div>
                            </div>
--- a/.vuepress/theme/components/JoinCommunity.vue
+++ b/.vuepress/theme/components/JoinCommunity.vue
@ -18,7 +18,7 @@
            <h4>微信群</h4>
            <div>
              <div style="margin-top: 10px;">
-                <span>微信扫码后，发送“加群”</span>
+                <span>微信扫码</span>
                <p style="margin-top: 10px; margin-bottom: 0; text-align: center;">
                  <!-- <img src="/images/dz.png" style="width: 150px;"></img> -->
                  <img src="/images/dz2.jpeg" style="width: 150px;"></img>
--- a/.vuepress/theme/components/Page.vue
+++ b/.vuepress/theme/components/Page.vue
@ -3,7 +3,7 @@
    <div class="page-nav" style="max-width: 1000px; margin-top: 56px;">
      <AdSensePageTop></AdSensePageTop>
    </div>
-    <div v-if="!$frontmatter.isSharing" class="page-nav" style="max-width: 1000px; margin: auto;">
+    <div v-if="isNotSharing" class="page-nav" style="max-width: 1000px; margin: auto;">
      <div class="tip custom-block" style=" padding: 1rem; margin-top: 0;">
        <div style="display: inline-block; vertical-align: top; line-height: 1.6rem;">
          <li>
@ -58,13 +58,20 @@ import JoinCommunity from './JoinCommunity'
 export default {
  components: { PageEdit, PageNav, JoinCommunity },
  props: ['sidebarItems'],
+  data () {
+    return {
+      isNotSharing: false
+    }
+  },
  mounted () {
    if (typeof window !== 'undefined') {
      if (location.search !== undefined && location.search.indexOf('sharing') >= 0) {
        // 如果带参数 sharing，则设置 $frontmatter.isSharing = true
-        this.$set(this.$frontmatter, 'isSharing', true)
+        this.$set(this, 'isNotSharing', false)
        document.title = this.$frontmatter.sharingTitle || this.$page.title
        this.$frontmatter.title = this.$frontmatter.sharingTitle
+      } else {
+        this.$set(this, 'isNotSharing', true)
      }
    }
  }