Merge remote-tracking branch 'origin/main'

be7c6a44 · 徐晓伟 · a275fa17 · 4bdf1b46 · be7c6a44 · be7c6a44
15 changed file
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
+# dependabot-github 专用
+
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+# dependabot.yml 文件的配置选项：https://docs.github.com/zh/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+# 自定义依赖项更新：https://docs.github.com/zh/code-security/dependabot/dependabot-version-updates/customizing-dependency-updates
+# 管理依赖项更新的所有拉取请求：https://docs.github.com/zh/code-security/dependabot/working-with-dependabot/managing-pull-requests-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/"
+    auto-merge: true
+    # 默认：5
+    open-pull-requests-limit: 5
+    schedule:
+      interval: "daily"
+      time: "02:00"
+      timezone: "Asia/Shanghai"
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "main" ]
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  analyze:
+    name: Analyze
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners
+    # Consider using larger runners for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby', 'swift' ]
+        # Use only 'java' to analyze code written in Java, Kotlin or both
+        # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+
+    # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #     echo "Run, Build Application using script"
+    #     ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"
--- a/.github/workflows/node.js.yml
+++ b/.github/workflows/node.js.yml
+# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs
+
+name: Node.js CI
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  build:
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ "ubuntu-latest" ]
+        node-version: [ 16.x, 18.x ]
+        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+
+    steps:
+
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Cache modules
+        uses: actions/cache@v3
+        id: cache-modules
+        with:
+          path: |
+            ~/.npm
+            ~/.cache
+          key: ${{ matrix.os }}-${{ hashFiles('package.json') }}
+          restore-keys: |
+            ${{ matrix.os }}-
+
+      - name: Install Dependencies
+        run: npm install
+
+      - name: Build with Docusaurus
+        run: npm run build
--- a/docs/docker/centos-install.md
+++ b/docs/docker/centos-install.md
@@ -63,11 +63,11 @@ sidebar_position: 1
    ```

    ```shell
-    sudo systemctl status docker.service
+    sudo systemctl status docker.service -n 0
    ```

    ```shell
-    sudo systemctl status docker.socket
+    sudo systemctl status docker.socket -n 0
    ```

 2. 设置 Docker 镜像

--- a/docs/download/anolis.md
+++ b/docs/download/anolis.md
-# 龙蜥 Anolis 下载
+# Anolis 龙蜥 下载

 # 视频演示

@@ -9,24 +9,27 @@
 1. 官网：[https://openanolis.cn/](https://openanolis.cn/)

 | 系统         | 下载地址                                                      |
-|------------|------------------------------------------------------------------------------------------------------------------------|
-| 7.7 正式版    | [https://mirrors.openanolis.cn/anolis/7.7/isos/GA/x86_64/](https://mirrors.openanolis.cn/anolis/7.7/isos/GA/x86_64/)   |
-| 7.9 正式版    | [https://mirrors.openanolis.cn/anolis/7.9/isos/GA/x86_64/](https://mirrors.openanolis.cn/anolis/7.9/isos/GA/x86_64/)   |
-| 7.9 优选更新版本 | [https://mirrors.openanolis.cn/anolis/7.9/isos/QU1/x86_64/](https://mirrors.openanolis.cn/anolis/7.9/isos/QU1/x86_64/) |
-
-| 8 正式版        | [https://mirrors.openanolis.cn/anolis/8/isos/GA/x86_64/](https://mirrors.openanolis.cn/anolis/8/isos/GA/x86_64/)         |
-|--------------|--------------------------------------------------------------------------------------------------------------------------|
-| 8.2 预发布版 1   | [https://mirrors.openanolis.cn/anolis/8.2/isos/RC1/x86_64/](https://mirrors.openanolis.cn/anolis/8.2/isos/RC1/x86_64/)   |
-| 8.2 预发布版 2   | [https://mirrors.openanolis.cn/anolis/8.2/isos/RC2/x86_64/](https://mirrors.openanolis.cn/anolis/8.2/isos/RC2/x86_64/)   |
-| 8.2 正式版      | [https://mirrors.openanolis.cn/anolis/8.2/isos/GA/x86_64/](https://mirrors.openanolis.cn/anolis/8.2/isos/GA/x86_64/)     |
-| 8.2 优选更新版本 1 | [https://mirrors.openanolis.cn/anolis/8.2/isos/QU1/x86_64/](https://mirrors.openanolis.cn/anolis/8.2/isos/QU1/x86_64/)   |
-| 8.2 优选更新版本 2 | [https://mirrors.openanolis.cn/anolis/8.2/isos/QU2/x86_64/](https://mirrors.openanolis.cn/anolis/8.2/isos/QU2/x86_64/)   |
-| 8.4 正式版      | [https://mirrors.openanolis.cn/anolis/8.4/isos/GA/x86_64/](https://mirrors.openanolis.cn/anolis/8.4/isos/GA/x86_64/)     |
-| 8.6 公测版      | [https://mirrors.openanolis.cn/anolis/8.6/isos/BETA/x86_64/](https://mirrors.openanolis.cn/anolis/8.6/isos/BETA/x86_64/) |
-| 8.6 预发布版     | [https://mirrors.openanolis.cn/anolis/8.6/isos/RC/x86_64/](https://mirrors.openanolis.cn/anolis/8.6/isos/RC/x86_64/)     |
-| 8.6 正式版      | [https://mirrors.openanolis.cn/anolis/8.6/isos/GA/x86_64/](https://mirrors.openanolis.cn/anolis/8.6/isos/GA/x86_64/)     |
-| 8.6 优选更新版本   | [https://mirrors.openanolis.cn/anolis/8.6/isos/QU1/x86_64/](https://mirrors.openanolis.cn/anolis/8.6/isos/QU1/x86_64/)   |
-| 8.8 正式版      | [https://mirrors.openanolis.cn/anolis/8.8/isos/GA/x86_64/](https://mirrors.openanolis.cn/anolis/8.8/isos/GA/x86_64/)     |
+|------------|-----------------------------------------------------------|
+| 7.7 正式版    | https://mirrors.openanolis.cn/anolis/7.7/isos/GA/x86_64/  |
+| 7.9 正式版    | https://mirrors.openanolis.cn/anolis/7.9/isos/GA/x86_64/  |
+| 7.9 优选更新版本 | https://mirrors.openanolis.cn/anolis/7.9/isos/QU1/x86_64/ |
+
+| 8 正式版        | https://mirrors.openanolis.cn/anolis/8/isos/GA/x86_64/       |
+|--------------|--------------------------------------------------------------|
+| 8.2 预发布版 1   | https://mirrors.openanolis.cn/anolis/8.2/isos/RC1/x86_64/    |
+| 8.2 预发布版 2   | https://mirrors.openanolis.cn/anolis/8.2/isos/RC2/x86_64/    |
+| 8.2 正式版      | https://mirrors.openanolis.cn/anolis/8.2/isos/GA/x86_64/     |
+| 8.2 优选更新版本 1 | https://mirrors.openanolis.cn/anolis/8.2/isos/QU1/x86_64/    |
+| 8.2 优选更新版本 2 | https://mirrors.openanolis.cn/anolis/8.2/isos/QU2/x86_64/    |
+| 8.4 正式版      | https://mirrors.openanolis.cn/anolis/8.4/isos/GA/x86_64/     |
+| 8.6 公测版      | https://mirrors.openanolis.cn/anolis/8.6/isos/BETA/x86_64/   |
+| 8.6 预发布版     | https://mirrors.openanolis.cn/anolis/8.6/isos/RC/x86_64/     |
+| 8.6 正式版      | https://mirrors.openanolis.cn/anolis/8.6/isos/GA/x86_64/     |
+| 8.6 优选更新版本   | https://mirrors.openanolis.cn/anolis/8.6/isos/QU1/x86_64/    |
+| 8.8 正式版      | https://mirrors.openanolis.cn/anolis/8.8/isos/GA/x86_64/     |
+| 23.0 内测版     | https://mirrors.openanolis.cn/anolis/23.0/isos/ALPHA/x86_64/ |
+| 23.0 公测版     | https://mirrors.openanolis.cn/anolis/23.0/isos/BETA/x86_64/  |
+| 23.0 正式版     | https://mirrors.openanolis.cn/anolis/23.0/isos/GA/x86_64/    |

 **身为一个程序员一定要对URL敏感**


--- a/docs/download/centos.md
+++ b/docs/download/centos.md
@@ -11,34 +11,34 @@
 2. CentOS 7/8 最新版（含各大云厂商的镜像）

   | 系统       | 下载地址                                                |
-   |----------|------------------------------------------------------------------------------------------------------------|
-   | CentOS 7 | [http://isoredirect.centos.org/centos/7/isos/x86_64/](http://isoredirect.centos.org/centos/7/isos/x86_64/) |
-   | CentOS 8 | [http://isoredirect.centos.org/centos/8/isos/x86_64/](http://isoredirect.centos.org/centos/8/isos/x86_64/) |
+      |----------|-----------------------------------------------------|
+   | CentOS 7 | http://isoredirect.centos.org/centos/7/isos/x86_64/ |
+   | CentOS 8 | http://isoredirect.centos.org/centos/8/isos/x86_64/ |

 3. CentOS 7 历史版本下载

-   | 系统       | 下载地址                                                                                              |
-   |----------|---------------------------------------------------------------------------------------------------|
-   | 7.8.2003 | [https://vault.centos.org/7.8.2003/isos/x86_64/](https://vault.centos.org/7.8.2003/isos/x86_64/)  |
-   | 7.7.1908 | [https://vault.centos.org/7.7.1908/isos/x86_64/](https://vault.centos.org/7.7.1908/isos/x86_64/)  |
-   | 7.6.1810 | [https://vault.centos.org/7.6.1810/isos/x86_64/](https://vault.centos.org/7.6.1810/isos/x86_64/)  |
-   | 7.5.1804 | [https://vault.centos.org/7.5.1804/isos/x86_64/](https://vault.centos.org/7.5.1804/isos/x86_64/)  |
-   | 7.4.1708 | [https://vault.centos.org/7.4.1708/isos/x86_64/](https://vault.centos.org/7.4.1708/isos/x86_64/)  |
-   | 7.3.1611 | [https://vault.centos.org/7.3.1611/isos/x86_64/](https://vault.centos.org/7.3.1611/isos/x86_64/)  |
-   | 7.2.1511 | [https://vault.centos.org/7.2.1511/isos/x86_64/](https://vault.centos.org/7.2.1511/isos/x86_64/)  |
-   | 7.1.1503 | [https://vault.centos.org/7.1.1503/isos/x86_64/](https://vault.centos.org/7.1.1503/isos/x86_64/)  |
-   | 7.0.1406 | [https://vault.centos.org/7.0.1406/isos/x86_64/](https://vault.centos.org/7.0.1406/isos/x86_64/)  |
+   | 系统       | 下载地址                                           | 下载地址                                                          |
+      |----------|------------------------------------------------|---------------------------------------------------------------|
+   | 7.8.2003 | https://vault.centos.org/7.8.2003/isos/x86_64/ | https://archive.kernel.org/centos-vault/7.8.2003/isos/x86_64/ |
+   | 7.7.1908 | https://vault.centos.org/7.7.1908/isos/x86_64/ | https://archive.kernel.org/centos-vault/7.7.1908/isos/x86_64/ |
+   | 7.6.1810 | https://vault.centos.org/7.6.1810/isos/x86_64/ | https://archive.kernel.org/centos-vault/7.6.1810/isos/x86_64/ |
+   | 7.5.1804 | https://vault.centos.org/7.5.1804/isos/x86_64/ | https://archive.kernel.org/centos-vault/7.5.1804/isos/x86_64/ |
+   | 7.4.1708 | https://vault.centos.org/7.4.1708/isos/x86_64/ | https://archive.kernel.org/centos-vault/7.4.1708/isos/x86_64/ |
+   | 7.3.1611 | https://vault.centos.org/7.3.1611/isos/x86_64/ | https://archive.kernel.org/centos-vault/7.3.1611/isos/x86_64/ |
+   | 7.2.1511 | https://vault.centos.org/7.2.1511/isos/x86_64/ | https://archive.kernel.org/centos-vault/7.2.1511/isos/x86_64/ |
+   | 7.1.1503 | https://vault.centos.org/7.1.1503/isos/x86_64/ | https://archive.kernel.org/centos-vault/7.1.1503/isos/x86_64/ |
+   | 7.0.1406 | https://vault.centos.org/7.0.1406/isos/x86_64/ | https://archive.kernel.org/centos-vault/7.0.1406/isos/x86_64/ |

 4. CentOS 8 历史版本下载

-   | 系统       | 下载地址                                                                                             |
-   |----------|--------------------------------------------------------------------------------------------------|
-   | 8.5.2111 | [https://vault.centos.org/8.5.2111/isos/x86_64/](https://vault.centos.org/8.5.2111/isos/x86_64/) |
-   | 8.4.2105 | [https://vault.centos.org/8.4.2105/isos/x86_64/](https://vault.centos.org/8.4.2105/isos/x86_64/) |
-   | 8.3.2011 | [https://vault.centos.org/8.3.2011/isos/x86_64/](https://vault.centos.org/8.3.2011/isos/x86_64/) |
-   | 8.2.2004 | [https://vault.centos.org/8.2.2004/isos/x86_64/](https://vault.centos.org/8.2.2004/isos/x86_64/) |
-   | 8.1.1911 | [https://vault.centos.org/8.1.1911/isos/x86_64/](https://vault.centos.org/8.1.1911/isos/x86_64/) |
-   | 8.0.1905 | [https://vault.centos.org/8.0.1905/isos/x86_64/](https://vault.centos.org/8.0.1905/isos/x86_64/) |
+   | 系统       | 下载地址                                           | 下载地址                                                          |
+      |----------|------------------------------------------------|---------------------------------------------------------------|
+   | 8.5.2111 | https://vault.centos.org/8.5.2111/isos/x86_64/ | https://archive.kernel.org/centos-vault/8.5.2111/isos/x86_64/ |
+   | 8.4.2105 | https://vault.centos.org/8.4.2105/isos/x86_64/ | https://archive.kernel.org/centos-vault/8.4.2105/isos/x86_64/ |
+   | 8.3.2011 | https://vault.centos.org/8.3.2011/isos/x86_64/ | https://archive.kernel.org/centos-vault/8.3.2011/isos/x86_64/ |
+   | 8.2.2004 | https://vault.centos.org/8.2.2004/isos/x86_64/ | https://archive.kernel.org/centos-vault/8.2.2004/isos/x86_64/ |
+   | 8.1.1911 | https://vault.centos.org/8.1.1911/isos/x86_64/ | https://archive.kernel.org/centos-vault/8.1.1911/isos/x86_64/ |
+   | 8.0.1905 | https://vault.centos.org/8.0.1905/isos/x86_64/ | https://archive.kernel.org/centos-vault/8.0.1905/isos/x86_64/ |

 5. 版本说明
   1. 前面两个数字：代表版本号

--- a/docs/download/ubuntu.md
+++ b/docs/download/ubuntu.md
-# 乌班图 Ubuntu 下载
+# Ubuntu 乌班图 下载

-1. [https://releases.ubuntu.com/](https://releases.ubuntu.com/)
-2. [https://old-releases.ubuntu.com/releases/](https://old-releases.ubuntu.com/releases/)
+1. https://releases.ubuntu.com/
+2. https://old-releases.ubuntu.com/releases/

 | 版本号     | 版本代号              | 下载地址                                              |
-|---------|-------------------|--------------------------------------------------------------------------------------------------------|
-| 14.04.5 | Trusty Tahr       | [https://old-releases.ubuntu.com/releases/14.04.5/](https://old-releases.ubuntu.com/releases/14.04.5/) |
-| 14.10   | Utopic Unicorn    | [https://old-releases.ubuntu.com/releases/14.10/](https://old-releases.ubuntu.com/releases/14.10/)     |
-| 16.04.6 | Xenial Xerus      | [https://old-releases.ubuntu.com/releases/16.04.6/](https://old-releases.ubuntu.com/releases/16.04.6/) |
-| 16.10   | Yakkety Yak       | [https://old-releases.ubuntu.com/releases/16.10/](https://old-releases.ubuntu.com/releases/16.10/)     |
-| 17.04   | Zesty Zapus       | [https://old-releases.ubuntu.com/releases/17.04/](https://old-releases.ubuntu.com/releases/17.04/)     |
-| 17.10   | Artful Aardvark   | [https://old-releases.ubuntu.com/releases/17.10/](https://old-releases.ubuntu.com/releases/17.10/)     |
-| 18.04   | Bionic Beaver     | [https://old-releases.ubuntu.com/releases/18.04/](https://old-releases.ubuntu.com/releases/18.04/)     |
-| 18.10   | Cosmic Cuttlefish | [https://old-releases.ubuntu.com/releases/18.10/](https://old-releases.ubuntu.com/releases/18.10/)     |
-| 19.04   | Disco Dingo       | [https://old-releases.ubuntu.com/releases/19.04/](https://old-releases.ubuntu.com/releases/19.04/)     |
-| 19.10   | Eoan Ermine       | [https://old-releases.ubuntu.com/releases/19.10/](https://old-releases.ubuntu.com/releases/19.10/)     |
-| 20.04   | Focal Fossa       | [https://old-releases.ubuntu.com/releases/20.04/](https://old-releases.ubuntu.com/releases/20.04/)     |
-| 20.10   | Groovy Gorilla    | [https://old-releases.ubuntu.com/releases/20.10/](https://old-releases.ubuntu.com/releases/20.10/)     |
-| 21.04   | Hirsute Hippo     | [https://old-releases.ubuntu.com/releases/21.04/](https://old-releases.ubuntu.com/releases/21.04/)     |
-| 21.10   | Impish Indri      | [https://old-releases.ubuntu.com/releases/21.10/](https://old-releases.ubuntu.com/releases/21.10/)     |
-| 22.04   | Jammy Jellyfish   | [https://old-releases.ubuntu.com/releases/22.04.1/](https://old-releases.ubuntu.com/releases/22.04.1/) |
-| 22.10   | Kinetic Kudu      | [https://releases.ubuntu.com/22.10/](https://releases.ubuntu.com/22.10/)                               |
+|---------|-------------------|---------------------------------------------------|
+| 14.04.5 | Trusty Tahr       | https://old-releases.ubuntu.com/releases/14.04.5/ |
+| 14.10   | Utopic Unicorn    | https://old-releases.ubuntu.com/releases/14.10/   |
+| 16.04.6 | Xenial Xerus      | https://old-releases.ubuntu.com/releases/16.04.6/ |
+| 16.10   | Yakkety Yak       | https://old-releases.ubuntu.com/releases/16.10/   |
+| 17.04   | Zesty Zapus       | https://old-releases.ubuntu.com/releases/17.04/   |
+| 17.10   | Artful Aardvark   | https://old-releases.ubuntu.com/releases/17.10/   |
+| 18.04   | Bionic Beaver     | https://old-releases.ubuntu.com/releases/18.04/   |
+| 18.10   | Cosmic Cuttlefish | https://old-releases.ubuntu.com/releases/18.10/   |
+| 19.04   | Disco Dingo       | https://old-releases.ubuntu.com/releases/19.04/   |
+| 19.10   | Eoan Ermine       | https://old-releases.ubuntu.com/releases/19.10/   |
+| 20.04   | Focal Fossa       | https://old-releases.ubuntu.com/releases/20.04/   |
+| 20.10   | Groovy Gorilla    | https://old-releases.ubuntu.com/releases/20.10/   |
+| 21.04   | Hirsute Hippo     | https://old-releases.ubuntu.com/releases/21.04/   |
+| 21.10   | Impish Indri      | https://old-releases.ubuntu.com/releases/21.10/   |
+| 22.04   | Jammy Jellyfish   | https://old-releases.ubuntu.com/releases/22.04.1/ |
+| 22.10   | Kinetic Kudu      | https://old-releases.ubuntu.com/releases/22.10/   |
+| 23.04   | Lunar Lobster     | https://releases.ubuntu.com/23.04/                |
--- a/docs/k8s-availability/prerequisite.md
+++ b/docs/k8s-availability/prerequisite.md
@@ -133,7 +133,7 @@ Kubernetes（k8s）高可用集群1：前提条件
    sudo yum install -y containerd
    
    # 启动 docker 时，会启动 containerd
-    # sudo systemctl status containerd.service
+    # sudo systemctl status containerd.service -n 0
    sudo systemctl stop containerd.service
    
    sudo cp /etc/containerd/config.toml /etc/containerd/config.toml.bak
@@ -152,11 +152,11 @@ Kubernetes（k8s）高可用集群1：前提条件
    
    
    sudo systemctl enable --now containerd.service
-    # sudo systemctl status containerd.service
+    # sudo systemctl status containerd.service -n 0
    
-    # sudo systemctl status docker.service
+    # sudo systemctl status docker.service -n 0
    sudo systemctl start docker.service
-    # sudo systemctl status docker.service
+    # sudo systemctl status docker.service -n 0
    sudo systemctl enable docker.service
    sudo systemctl enable docker.socket
    sudo systemctl list-unit-files | grep docker
@@ -174,6 +174,6 @@ Kubernetes（k8s）高可用集群1：前提条件
    sudo systemctl restart docker
    sudo docker info
    
-    sudo systemctl status docker.service
-    sudo systemctl status containerd.service
+    sudo systemctl status docker.service -n 0
+    sudo systemctl status containerd.service -n 0
    ```
--- a/docs/k8s-ui/dashboard-install.md
+++ b/docs/k8s-ui/dashboard-install.md
@@ -7,28 +7,29 @@ Kubernetes（k8s）Dashboard 安装
 1. Kubernetes Dashboard 是一个通用的、基于Web的UI，用于Kubernetes集群管理。
 2. 它允许用户管理群集中运行的应用程序并对其进行故障排除，以及管理群集本身。
 3. 不同 Kubernetes Dashboard 支持的 Kubernetes 版本不同，可查看 Kubernetes Dashboard
-   发版日志中的说明：[https://github.com/kubernetes/dashboard/releases](https://github.com/kubernetes/dashboard/releases)
+   发版日志中的说明：https://github.com/kubernetes/dashboard/releases
   ，下面列举最近几版的版本支持（仅列举了 **完全支持的版本范围**）
 4. **国内GitCode镜像仓库**：
-    1. [https://gitcode.net/mirrors/kubernetes/dashboard](https://gitcode.net/mirrors/kubernetes/dashboard)
-5. 使用网址如下：只需要换一下标签名
-    1. [https://gitcode.net/mirrors/kubernetes/dashboard/-/raw/v2.7.0/aio/deploy/recommended.yaml](https://gitcode.net/mirrors/kubernetes/dashboard/-/raw/v2.7.0/aio/deploy/recommended.yaml)
-
-| Kubernetes Dashboard 版本 | Kubernetes 版本 | 执行命令                                                                                                                                                                                                    |
-|-------------------------|---------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| 2.7.0                   | 1.25          | kubectl apply -f [https://raw.githubusercontent.com/kubernetes/dashboard/v2.7.0/aio/deploy/recommended.yaml](https://raw.githubusercontent.com/kubernetes/dashboard/v2.7.0/aio/deploy/recommended.yaml) |
-| 2.6.1                   | 1.24          | kubectl apply -f [https://raw.githubusercontent.com/kubernetes/dashboard/v2.6.1/aio/deploy/recommended.yaml](https://raw.githubusercontent.com/kubernetes/dashboard/v2.6.1/aio/deploy/recommended.yaml) |
-| 2.6.0                   | 1.24          | kubectl apply -f [https://raw.githubusercontent.com/kubernetes/dashboard/v2.6.0/aio/deploy/recommended.yaml](https://raw.githubusercontent.com/kubernetes/dashboard/v2.6.0/aio/deploy/recommended.yaml) |
-| 2.5.1                   | 1.23          | kubectl apply -f [https://raw.githubusercontent.com/kubernetes/dashboard/v2.5.1/aio/deploy/recommended.yaml](https://raw.githubusercontent.com/kubernetes/dashboard/v2.5.1/aio/deploy/recommended.yaml) |
-| 2.5.0                   | 1.23          | kubectl apply -f [https://raw.githubusercontent.com/kubernetes/dashboard/v2.5.0/aio/deploy/recommended.yaml](https://raw.githubusercontent.com/kubernetes/dashboard/v2.5.0/aio/deploy/recommended.yaml) |
-| 2.4.0                   | 1.20、1.21     | kubectl apply -f [https://raw.githubusercontent.com/kubernetes/dashboard/v2.4.0/aio/deploy/recommended.yaml](https://raw.githubusercontent.com/kubernetes/dashboard/v2.4.0/aio/deploy/recommended.yaml) |
+    1. https://gitcode.net/mirrors/kubernetes/dashboard
+5. 需要 [安装 Metrics Server](../k8s/metrics-server-install.md) 才能查看资源（内存、CPU）使用情况
+6. 使用网址如下：只需要换一下标签名
+    1. https://gitcode.net/mirrors/kubernetes/dashboard/-/raw/v2.7.0/aio/deploy/recommended.yaml
+
+| Kubernetes Dashboard 版本 | Kubernetes 版本 | 使用 GitHub 官方仓库文件执行命令                                                                                       | 使用 GitCode 镜像仓库文件执行命令                                                                                      |
+|-------------------------|---------------|------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------|
+| 2.7.0                   | 1.25          | kubectl apply -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.7.0/aio/deploy/recommended.yaml | kubectl apply -f https://gitcode.net/mirrors/kubernetes/dashboard/-/raw/v2.7.0/aio/deploy/recommended.yaml |
+| 2.6.1                   | 1.24          | kubectl apply -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.6.1/aio/deploy/recommended.yaml | kubectl apply -f https://gitcode.net/mirrors/kubernetes/dashboard/-/raw/v2.6.1/aio/deploy/recommended.yaml |
+| 2.6.0                   | 1.24          | kubectl apply -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.6.0/aio/deploy/recommended.yaml | kubectl apply -f https://gitcode.net/mirrors/kubernetes/dashboard/-/raw/v2.6.0/aio/deploy/recommended.yaml |
+| 2.5.1                   | 1.23          | kubectl apply -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.5.1/aio/deploy/recommended.yaml | kubectl apply -f https://gitcode.net/mirrors/kubernetes/dashboard/-/raw/v2.5.1/aio/deploy/recommended.yaml |
+| 2.5.0                   | 1.23          | kubectl apply -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.5.0/aio/deploy/recommended.yaml | kubectl apply -f https://gitcode.net/mirrors/kubernetes/dashboard/-/raw/v2.5.0/aio/deploy/recommended.yaml |
+| 2.4.0                   | 1.20、1.21     | kubectl apply -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.4.0/aio/deploy/recommended.yaml | kubectl apply -f https://gitcode.net/mirrors/kubernetes/dashboard/-/raw/v2.4.0/aio/deploy/recommended.yaml |

 ## 参考链接

-1. [https://github.com/kubernetes/dashboard/blob/master/docs/user/accessing-dashboard/README.md](https://github.com/kubernetes/dashboard/blob/master/docs/user/accessing-dashboard/README.md)
-2. [https://github.com/kubernetes/dashboard/blob/master/docs/user/access-control/README.md](https://github.com/kubernetes/dashboard/blob/master/docs/user/access-control/README.md)
-3. [https://github.com/kubernetes/dashboard/blob/master/docs/user/access-control/creating-sample-user.md](https://github.com/kubernetes/dashboard/blob/master/docs/user/access-control/creating-sample-user.md)
-4. 已上参考连接列举的都是最新版，请结合自身的版本选择对应的标签
+1. https://github.com/kubernetes/dashboard/blob/master/docs/user/accessing-dashboard/README.md
+2. https://github.com/kubernetes/dashboard/blob/master/docs/user/access-control/README.md
+3. https://github.com/kubernetes/dashboard/blob/master/docs/user/access-control/creating-sample-user.md
+4. 以上参考连接列举的都是最新版，请结合自身的版本选择对应的标签
 5. 国内 GitCode
   镜像仓库：[https://gitcode.net/mirrors/kubernetes/dashboard](https://gitcode.net/mirrors/kubernetes/dashboard)

@@ -37,6 +38,7 @@ Kubernetes（k8s）Dashboard 安装
 1. 在管理节点上执行

   ```shell
+   # GitCode 镜像：kubectl apply -f https://gitcode.net/mirrors/kubernetes/dashboard/-/raw/v2.7.0/aio/deploy/recommended.yaml
   kubectl apply -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.7.0/aio/deploy/recommended.yaml
   ```

@@ -89,7 +91,7 @@ Kubernetes（k8s）Dashboard 安装
   ```

 5. 由上一步执行的结果可以得出，使用 30320 即可访问 kubernetes-dashboard 服务
-   假如集群的IP为 192.168.80.14，访问地址为 [https://192.168.80.14:30320](https://192.168.80.14:30320/)
+   假如集群的IP为 192.168.80.14，访问地址为 https://192.168.80.14:30320
 6. 创建服务帐户

    ```shell
@@ -134,9 +136,49 @@ Kubernetes（k8s）Dashboard 安装
 8. 获取持有者令牌

   ```shell
-   # 指定有效期：--duration=315360000s
-   # 315360000s 代表 10年
   kubectl -n kubernetes-dashboard create token admin-user
+   
+   # 1 天
+   # kubectl -n kubernetes-dashboard create token admin-user --duration=86400s
+   
+   # 3 天
+   # kubectl -n kubernetes-dashboard create token admin-user --duration=259200s
+   
+   # 7 天
+   # kubectl -n kubernetes-dashboard create token admin-user --duration=604800s
+   
+   # 14 天
+   # kubectl -n kubernetes-dashboard create token admin-user --duration=1209600s
+   
+   # 1 个月
+   # kubectl -n kubernetes-dashboard create token admin-user --duration=2592000s
+   
+   # 2 个月
+   # kubectl -n kubernetes-dashboard create token admin-user --duration=5184000s
+   
+   # 3 个月
+   # kubectl -n kubernetes-dashboard create token admin-user --duration=7776000s
+   
+   # 6 个月
+   # kubectl -n kubernetes-dashboard create token admin-user --duration=15552000s
+   
+   # 1 年
+   # kubectl -n kubernetes-dashboard create token admin-user --duration=31536000s
+   
+   # 2 年
+   # kubectl -n kubernetes-dashboard create token admin-user --duration=62208000s
+   
+   # 3 年
+   # kubectl -n kubernetes-dashboard create token admin-user --duration=94608000s
+   
+   # 5 年
+   # kubectl -n kubernetes-dashboard create token admin-user --duration=157680000s
+   
+   # 10 年
+   # kubectl -n kubernetes-dashboard create token admin-user --duration=315360000s
+   
+   # 100 年
+   # kubectl -n kubernetes-dashboard create token admin-user --duration=3153600000s
   ```

 9. 使用上述令牌即可登录系统

--- a/docs/k8s/ca-openssl.md
+++ b/docs/k8s/ca-openssl.md
@@ -42,7 +42,9 @@ sidebar_position: 9
    28. [/etc/kubernetes/kubelet.conf](/ca/kubelet.conf)
    29. [/etc/kubernetes/controller-manager.conf](/ca/controller-manager.conf)
    30. [/etc/kubernetes/scheduler.conf](/ca/scheduler.conf)
-5. k8s 配置文件说明
+5. 证书之间的关系
+   ![kleopatra-1.png](static/kleopatra-1.png)
+6. k8s 配置文件说明
    1. [/etc/kubernetes/admin.conf](/ca/admin.conf)
        - clusters.cluster.certificate-authority-data
            1. [/etc/kubernetes/pki/ca.crt](/ca/pki/ca.crt) 文件内容计算 Base64 可得

--- a/docs/k8s/centos-install.md
+++ b/docs/k8s/centos-install.md
@@ -207,7 +207,7 @@ sidebar_position: 1
    sudo yum install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
    
    # 启动 docker 时，会启动 containerd
-    # sudo systemctl status containerd.service
+    # sudo systemctl status containerd.service -n 0
    sudo systemctl stop containerd.service
    
    sudo cp /etc/containerd/config.toml /etc/containerd/config.toml.bak
@@ -226,11 +226,11 @@ sidebar_position: 1
    
    
    sudo systemctl enable --now containerd.service
-    # sudo systemctl status containerd.service
+    # sudo systemctl status containerd.service -n 0
    
-    # sudo systemctl status docker.service
+    # sudo systemctl status docker.service -n 0
    sudo systemctl start docker.service
-    # sudo systemctl status docker.service
+    # sudo systemctl status docker.service -n 0
    sudo systemctl enable docker.service
    sudo systemctl enable docker.socket
    sudo systemctl list-unit-files | grep docker
@@ -248,8 +248,8 @@ sidebar_position: 1
    sudo systemctl restart docker
    sudo docker info
    
-    sudo systemctl status docker.service
-    sudo systemctl status containerd.service
+    sudo systemctl status docker.service -n 0
+    sudo systemctl status containerd.service -n 0
    ```

    ```shell
@@ -381,25 +381,25 @@ sidebar_position: 1
    sudo systemctl enable kubelet
    ```

-11. 查看kubelet日志
+11. 查看kubelet日志（***k8s 未初始化时，kubelet 日志可能存在持续报错***）

    ```shell
    # k8s 未初始化时，kubelet 可能无法启动
    journalctl -xefu kubelet
    ```

-12. 查看kubelet状态
+12. 查看kubelet状态（***k8s 未初始化时，kubelet 状态可能存在异常***）

    ```shell
    # k8s 未初始化时，kubelet 可能无法启动
    sudo systemctl status kubelet
    ```

-13. **已上命令需要在控制面板与node节点执行，并确保没有错误与警告**
+13. **以上命令需要在控制面板与node节点执行，并确保没有错误与警告**

-    **已上命令需要在控制面板与node节点执行，并确保没有错误与警告**
+    **以上命令需要在控制面板与node节点执行，并确保没有错误与警告**

-    **已上命令需要在控制面板与node节点执行，并确保没有错误与警告**
+    **以上命令需要在控制面板与node节点执行，并确保没有错误与警告**

 14. 控制面板：初始化
    1. `--kubernetes-version`
@@ -445,7 +445,8 @@ sidebar_position: 1
    sudo cp -i /etc/kubernetes/admin.conf $HOME/.kube/config
    sudo chown $(id -u):$(id -g) $HOME/.kube/config
    
-    # 或者在环境变量中添加：export KUBECONFIG=/etc/kubernetes/admin.conf
+    # 或者在环境变量文件 /etc/profile 中添加：export KUBECONFIG=/etc/kubernetes/admin.conf
+    # 添加环境变量的命令：echo 'export KUBECONFIG=/etc/kubernetes/admin.conf' >>/etc/profile
    # 添加完环境变量后，刷新环境变量：source /etc/profile
    
    kubectl cluster-info
@@ -456,7 +457,7 @@ sidebar_position: 1
    # kubeadm join 192.168.80.60:6443 --token f9lvrz.59mykzssqw6vjh32 \
    # --discovery-token-ca-cert-hash sha256:4e23156e2f71c5df52dfd2b9b198cce5db27c47707564684ea74986836900107 	
    
-    #
+    # 生成 node 节点加入集群的命令
    # kubeadm token create --print-join-command
    ```

@@ -538,6 +539,8 @@ sidebar_position: 1
    - name: CLUSTER_TYPE
      value: "k8s,bgp"
    # 下方为新增内容
+    # 如果集群服务器中存在不同的网卡名称，需要在这里将每台服务器所使用的网卡名称全部填写（使用英文逗号分隔），否则网络无法使用，一直报错
+    # 例如：集群一共存在10台机器，其中有些机器的网卡名称是 ens33，有些是 eth0，有些是 enp9s0f0，则网卡配置为 interface=ens33,eth0,enp9s0f0
    - name: IP_AUTODETECTION_METHOD
      value: "interface=网卡名称"
    

--- a/docs/k8s/metrics-server-install.md
+++ b/docs/k8s/metrics-server-install.md
@@ -9,29 +9,33 @@ sidebar_position: 2
 ## 说明

 1. 官方github仓库：[https://github.com/kubernetes-sigs/metrics-server](https://github.com/kubernetes-sigs/metrics-server)
-2. Metrics Server 是一个 Kubernetes 组件，用于收集群集中的容器和节点的资源度量指标，并将这些指标提供给用户和其他组件。Metrics
+2. 个人镜像：https://jihulab.com/xuxiaowei-com-cn/k8s.sh/-/tree/main/mirrors/kubernetes-sigs/metrics-server
+3. Metrics Server 是一个 Kubernetes 组件，用于收集群集中的容器和节点的资源度量指标，并将这些指标提供给用户和其他组件。Metrics
   Server 采集的指标包括CPU使用率、内存使用率、网络流量等。这些指标可以帮助用户了解应用程序、服务以及它们所在的节点和容器的健康情况，帮助用户优化资源使用和应用程序性能。
-3. Metrics Server 可以通过 Kubernetes API Server 提供度量指标查询接口，以支持其他组件、工具和应用程序对度量指标进行查询、监控、告警等操作。Metrics
+4. Metrics Server 可以通过 Kubernetes API Server 提供度量指标查询接口，以支持其他组件、工具和应用程序对度量指标进行查询、监控、告警等操作。Metrics
   Server 还支持自动横向扩展，以适应更大规模的 Kubernetes 集群。总之，Metrics Server
   可以帮助用户更好地管理和优化Kubernetes集群中的资源使用和应用程序性能。
-4. 不使用 helm，所以只需关注 `v*.*.*`的标签（即：不含 helm 的标签）
-5. 版本介绍：
-    1. [https://github.com/kubernetes-sigs/metrics-server#compatibility-matrix](https://github.com/kubernetes-sigs/metrics-server#compatibility-matrix)
-6. 本文以 v0.6.3 为例（其他版本仅需更换下面的链接中的 v0.6.3）
-
-   | 文件类型                 | 文件链接                                                                                                                                                                                                               |
-   |----------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-   | k8s 配置文件             | [https://github.com/kubernetes-sigs/metrics-server/releases/download/v0.6.3/components.yaml](https://github.com/kubernetes-sigs/metrics-server/releases/download/v0.6.3/components.yaml)                           |
-   | k8s 高可用配置文件          | [https://github.com/kubernetes-sigs/metrics-server/releases/download/v0.6.3/high-availability.yaml](https://github.com/kubernetes-sigs/metrics-server/releases/download/v0.6.3/high-availability.yaml)             |
-   | k8s 1.21+ 已上 高可用配置文件 | [https://github.com/kubernetes-sigs/metrics-server/releases/download/v0.6.3/high-availability-1.21+.yaml](https://github.com/kubernetes-sigs/metrics-server/releases/download/v0.6.3/high-availability-1.21+.yaml) |
-
-7. 未安装 Metrics Server 查看 pod 内存、CPU 将报错
-
-```shell
-[root@k8s ~]# kubectl top pods --all-namespaces
-error: Metrics API not available
-[root@k8s ~]# 
-```
+5. 不使用 helm，所以只需关注 `v*.*.*`的标签（即：不含 helm 的标签）
+6. 版本介绍：
+    1. [GitHub](https://github.com/kubernetes-sigs/metrics-server#compatibility-matrix)
+    2. [GitCode](https://gitcode.net/mirrors/kubernetes-sigs/metrics-server#compatibility-matrix)
+7. 本文以 v0.6.3 为例（其他版本仅需更换下面的链接中的 v0.6.3）
+
+   | 文件类型                 | 文件链接                                                                                                    | 个人镜像                                                                                                                              |
+   |----------------------|---------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------|
+   | k8s 配置文件             | https://github.com/kubernetes-sigs/metrics-server/releases/download/v0.6.3/components.yaml              | https://jihulab.com/xuxiaowei-com-cn/k8s.sh/-/raw/main/mirrors/kubernetes-sigs/metrics-server/v0.6.3/components.yaml              |
+   | k8s 高可用配置文件          | https://github.com/kubernetes-sigs/metrics-server/releases/download/v0.6.3/high-availability.yaml       | https://jihulab.com/xuxiaowei-com-cn/k8s.sh/-/raw/main/mirrors/kubernetes-sigs/metrics-server/v0.6.3/high-availability.yaml       |
+   | k8s 1.21+ 以上 高可用配置文件 | https://github.com/kubernetes-sigs/metrics-server/releases/download/v0.6.3/high-availability-1.21+.yaml | https://jihulab.com/xuxiaowei-com-cn/k8s.sh/-/raw/main/mirrors/kubernetes-sigs/metrics-server/v0.6.3/high-availability-1.21+.yaml |
+
+8. 未安装 Metrics Server 查看 pod 内存、CPU 将报错
+
+    ```shell
+    [root@k8s ~]# kubectl top pods --all-namespaces
+    error: Metrics API not available
+    [root@k8s ~]# 
+    ```
+
+9. 未安装 Metrics Server 时，Kubernetes Dashboard 无法查看资源（内存、CPU）使用情况

 ## 配置


--- a/docs/k8s/static/kleopatra-1.png
+++ b/docs/k8s/static/kleopatra-1.png
--- a/docs/nexus/docker-repository.md
+++ b/docs/nexus/docker-repository.md
@@ -18,8 +18,11 @@ sidebar_position: 6

   ![image.png](static/docker-repository-2.png)

-3. 访问 [阿里云-容器镜像服务](https://cr.console.aliyun.com)
-   ，查看镜像加速地址：[https://hnkfbj7x.mirror.aliyuncs.com](https://hnkfbj7x.mirror.aliyuncs.com)
+3. 访问 [阿里云-容器镜像服务](https://cr.console.aliyun.com)，查看自己账户下镜像加速地址
+    1. 作者本人 阿里云-容器镜像服务 加速地址：https://hnkfbj7x.mirror.aliyuncs.com
+    2. 网易 加速地址：https://hub-mirror.c.163.com
+    3. 阿里云 谷歌镜像（只能加速谷歌镜像，设置时只用域名，拉取时，需要带 google_containers
+       前缀）：https://registry.aliyuncs.com/google_containers

   ![image.png](static/docker-repository-3.png)


--- a/docs/offline/centos-k8s-install.md
+++ b/docs/offline/centos-k8s-install.md
@@ -272,7 +272,7 @@ sidebar_position: 5
    cd ..
    
    # 启动 docker 时，会启动 containerd
-    # sudo systemctl status containerd.service
+    # sudo systemctl status containerd.service -n 0
    sudo systemctl stop containerd.service
    
    sudo cp /etc/containerd/config.toml /etc/containerd/config.toml.bak
@@ -286,11 +286,11 @@ sidebar_position: 5
    sudo sed -i "s#SystemdCgroup = false#SystemdCgroup = true#g" /etc/containerd/config.toml
    
    sudo systemctl enable --now containerd.service
-    # sudo systemctl status containerd.service
+    # sudo systemctl status containerd.service -n 0
    
-    # sudo systemctl status docker.service
+    # sudo systemctl status docker.service -n 0
    sudo systemctl start docker.service
-    # sudo systemctl status docker.service
+    # sudo systemctl status docker.service -n 0
    sudo systemctl enable docker.service
    sudo systemctl enable docker.socket
    sudo systemctl list-unit-files | grep docker
@@ -308,11 +308,11 @@ sidebar_position: 5
    ```

    ```shell
-    sudo systemctl status docker.service
+    sudo systemctl status docker.service -n 0
    ```

    ```shell
-    sudo systemctl status containerd.service
+    sudo systemctl status containerd.service -n 0
    ```

 7. 安装 k8s