diff --git a/README.md b/README.md index cd912c0b650cce4101a3eee5750d9325957dd8b1..ff3fab482c6190924f5b729a5d5cc687b7d01f9b 100644 --- a/README.md +++ b/README.md @@ -1,181 +1,181 @@ ### 导读 -#### [GitLab 导读](/guide/gitlab.md) +#### [GitLab 导读](/docs/guide/gitlab.md) -#### [GitLab Runner 导读](/guide/gitlab-runner.md) +#### [GitLab Runner 导读](/docs/guide/gitlab-runner.md) -#### [kubernetes（k8s） 导读](/guide/k8s.md) +#### [kubernetes（k8s） 导读](/docs/guide/k8s.md) -#### [极狐GitLab 与 码云Gitee 价格对比](/guide/gitlab-gitee.md) +#### [极狐GitLab 与 码云Gitee 价格对比](/docs/guide/gitlab-gitee.md) ### GitLab -#### [CentOS 7.9 中安装 GitLab](/gitlab/centos-7.9-install.md) +#### [CentOS 7.9 中安装 GitLab](/docs/gitlab/centos-7.9-install.md) -#### [疑难解答：龙蜥 Anolis 8 中安装 GitLab](/gitlab/anolis-8-install.md) +#### [疑难解答：龙蜥 Anolis 8 中安装 GitLab](/docs/gitlab/anolis-8.4-install.md) -#### [GitLab 配置 SSL/https](/gitlab/https-configuration.md) +#### [GitLab 配置 SSL/https](/docs/gitlab/https-configuration.md) -#### [GitLab Pages 配置 SSL/https](/gitlab/pages-https-configuration.md) +#### [GitLab Pages 配置 SSL/https](/docs/gitlab/pages-https-configuration.md) #### GitLab Packages 仓库 -##### [GitLab Maven 仓库](/gitlab/packages/maven-configuration.md) +##### [GitLab Maven 仓库](/docs/gitlab-packages/maven-configuration.md) -##### [GitLab Docker 容器镜像仓库](/gitlab/packages/docker-configuration.md) +##### [GitLab Docker 容器镜像仓库](/docs/gitlab-packages/docker-configuration.md) -##### [GitLab npm 仓库（未完成）](/gitlab/packages/npm-configuration.md) +##### [GitLab npm 仓库（未完成）](/docs/gitlab-packages/npm-configuration.md) #### GitLab Object Store 对象储存 S3（MinIO） -##### [artifacts 使用对象储存](/gitlab/object-store/artifacts-configuration.md) +##### [artifacts 使用对象储存](/docs/gitlab-object-store/artifacts-configuration.md) -##### [pages 使用对象储存](/gitlab/object-store/pages-configuration.md) +##### [pages 使用对象储存](/docs/gitlab-object-store/pages-configuration.md) -##### [uploads 使用对象储存](/gitlab/object-store/uploads-configuration.md) +##### [uploads 使用对象储存](/docs/gitlab-object-store/uploads-configuration.md) -##### [backup_upload 使用对象储存（未完成）](/gitlab/object-store/backup_upload-configuration.md) +##### [backup_upload 使用对象储存（未完成）](/docs/gitlab-object-store/backup_upload-configuration.md) -##### [ci_secure_files 使用对象储存（未完成）](/gitlab/object-store/ci_secure_files-configuration.md) +##### [ci_secure_files 使用对象储存（未完成）](/docs/gitlab-object-store/ci_secure_files-configuration.md) -##### [dependency_proxy 使用对象储存（未完成）](/gitlab/object-store/dependency_proxy-configuration.md) +##### [dependency_proxy 使用对象储存（未完成）](/docs/gitlab-object-store/dependency_proxy-configuration.md) -##### [external_diffs 使用对象储存（未完成）](/gitlab/object-store/external_diffs-configuration.md) +##### [external_diffs 使用对象储存（未完成）](/docs/gitlab-object-store/external_diffs-configuration.md) -##### [LFS 使用对象储存（未完成）](/gitlab/object-store/lfs-configuration.md) +##### [LFS 使用对象储存（未完成）](/docs/gitlab-object-store/lfs-configuration.md) -##### [object_storage 使用对象储存（未完成）](/gitlab/object-store/object-store-configuration.md) +##### [object_storage 使用对象储存（未完成）](/docs/gitlab-object-store/object-store-configuration.md) -##### [packages 使用对象储存（未完成）](/gitlab/object-store/packages-configuration.md) +##### [packages 使用对象储存（未完成）](/docs/gitlab-object-store/packages-configuration.md) -##### [terraform_state 使用对象储存（未完成）](/gitlab/object-store/terraform_state-configuration.md) +##### [terraform_state 使用对象储存（未完成）](/docs/gitlab-object-store/terraform_state-configuration.md) ### GitLab Runner -#### [CentOS 安装 GitLab Runner](/gitlab-runner/centos-install.md) +#### [CentOS 安装 GitLab Runner](/docs/gitlab-runner/centos-install.md) -#### [疑难解答：龙蜥 Anolis 8 中安装 GitLab Runner](/gitlab-runner/anolis-8-install.md) +#### [疑难解答：龙蜥 Anolis 8 中安装 GitLab Runner](/docs/gitlab-runner/anolis-8.4-install.md) -#### [kubernetes（k8s）配置](/gitlab-runner/k8s-configuration.md) +#### [kubernetes（k8s）配置](/docs/gitlab-runner/k8s-configuration.md) -#### [Cache 配置 S3](/gitlab-runner/cache-s3-configuration.md) +#### [Cache 配置 S3](/docs/gitlab-runner/cache-s3-configuration.md) -#### [Docker-in-Docker（未完成）](/gitlab-runner/docker-in-docker-configuration.md) +#### [Docker-in-Docker（未完成）](/docs/gitlab-runner/docker-in-docker-configuration.md) -#### [疑难解答：fatal: git fetch-pack: expected shallow list](/gitlab-runner/fatal-git-fetch-pack.md) +#### [疑难解答：fatal: git fetch-pack: expected shallow list](/docs/gitlab-runner/fatal-git-fetch-pack.md) ### GitLab 依赖机器人 dependabot-gitlab -#### [docker compose 安装](/dependabot-gitlab/dependabot-gitlab-install.md) +#### [docker compose 安装](/docs/gitlab-dependabot/dependabot-gitlab-install.md) ### Docker -#### [Centos 安装 Docker](/docker/centos-install.md) +#### [Centos 安装 Docker](/docs/docker/centos-install.md) -#### [Docker 安装 PostgreSQL 15](/docker/postgresql-15-install.md) +#### [Docker 安装 PostgreSQL 15](/docs/docker/postgresql-15-install.md) -#### [Docker 安装 sonarqube](/docker/sonarqube-install.md) +#### [Docker 安装 sonarqube](/docs/docker/sonarqube-install.md) ### Kubernetes（k8s） -#### [Kubernetes（k8s）安装](/k8s/centos-install.md) +#### [Kubernetes（k8s）安装](/docs/k8s/centos-install.md) -#### [Metrics Server 安装](/k8s/metrics-server-install.md) +#### [Metrics Server 安装](/docs/k8s/metrics-server-install.md) -#### [Kube Prometheus 普罗米修斯 安装](/k8s/kube-prometheus-install.md) +#### [Kube Prometheus 普罗米修斯 安装](/docs/k8s/kube-prometheus-install.md) -#### [kubernetes（k8s）探针 配置](/k8s/probe-configuration.md) +#### [kubernetes（k8s）探针 配置](/docs/k8s/probe-configuration.md) -#### [Pod、Deployment、Service（未完成）](/k8s/pod-deployment-service.md) +#### [Pod、Deployment、Service（未完成）](/docs/k8s/pod-deployment-service.md) -#### [Ingress 安装](/k8s/ingress-install.md) +#### [Ingress 安装](/docs/k8s/ingress-install.md) -#### [Containerd 镜像配置](/k8s/containerd-mirrors.md) +#### [Containerd 镜像配置](/docs/k8s/containerd-mirrors.md) -#### [批量删除 k8s（ctr）使用的历史镜像](/k8s/containerd-rm.md) +#### [批量删除 k8s（ctr）使用的历史镜像](/docs/k8s/containerd-rm.md) -#### [使用 openssl 生成 k8s 新证书（未完成）](k8s/ca-openssl.md) +#### [使用 openssl 生成 k8s 新证书（未完成）](docs/k8s/ca-openssl.md) -#### [使用 kubeadm 生成 k8s 新证书](k8s/ca-kubeadm.md) +#### [使用 kubeadm 生成 k8s 新证书](docs/k8s/ca-kubeadm.md) 1. 可用于直接更新证书 2. 可用于 k8s 主节点 IP 切换时重新根据新 IP 生成新证书 #### Kubernetes（k8s） Availability 高可用 -##### [导读](/k8s/availability/guide.md) +##### [导读](/docs/k8s-availability/guide.md) -##### [前提条件](/k8s/availability/prerequisite.md) +##### [前提条件](/docs/k8s-availability/prerequisite.md) -##### [etcd 高可用集群（非必须）](/k8s/availability/etcd-install.md) +##### [etcd 高可用集群（非必须）](/docs/k8s-availability/etcd-install.md) -##### [VIP（HAProxy、keepalived）](/k8s/availability/vip.md) +##### [VIP（HAProxy、keepalived）](/docs/k8s-availability/vip.md) -##### [利用 kubeadm 创建高可用集群-堆叠（Stacked） etcd 拓扑](/k8s/availability/stacked-etcd.md) +##### [利用 kubeadm 创建高可用集群-堆叠（Stacked） etcd 拓扑](/docs/k8s-availability/stacked-etcd.md) -##### [利用 kubeadm 创建高可用集群-外部 etcd 拓扑](/k8s/availability/external-etcd.md) +##### [利用 kubeadm 创建高可用集群-外部 etcd 拓扑](/docs/k8s-availability/external-etcd.md) -##### [NFS 高可用（未完成）](/k8s/availability/nfs.md) +##### [NFS 高可用（未完成）](/docs/k8s-availability/nfs.md) #### Kubernetes（k8s） UI -##### [kubernetes（k8s）Dashboard 安装](/k8s/ui/dashboard-install.md) +##### [kubernetes（k8s）Dashboard 安装](/docs/k8s-ui/dashboard-install.md) #### Volumes 挂载卷/储存卷 -##### [挂载卷/储存卷 介绍](/k8s/volumes/volumes-intro.md) +##### [挂载卷/储存卷 介绍](/docs/k8s-volumes/volumes-intro.md) ##### 将资源对象映射为储存卷 -###### [ConfigMap](/k8s/volumes/resource-mapping/configmap.md) +###### [ConfigMap](/docs/k8s-volumes/resource-mapping/configmap.md) -###### [Secret](/k8s/volumes/resource-mapping/secret.md) +###### [Secret](/docs/k8s-volumes/resource-mapping/secret.md) -###### [Downward API](/k8s/volumes/resource-mapping/downward-api.md) +###### [Downward API](/docs/k8s-volumes/resource-mapping/downward-api.md) -###### [Projected Volume 投射卷](/k8s/volumes/resource-mapping/projected-volume.md) +###### [Projected Volume 投射卷](/docs/k8s-volumes/resource-mapping/projected-volume.md) ##### Node 本地储存卷 -###### [EmptyDir 空目录](/k8s/volumes/local/empty-dir.md) +###### [EmptyDir 空目录](/docs/k8s-volumes/local/empty-dir.md) -###### [HostPath 宿主机路径](/k8s/volumes/local/host-path.md) +###### [HostPath 宿主机路径](/docs/k8s-volumes/local/host-path.md) #### Kubernetes（k8s） PV -##### [Persistent Volume 持久卷（未完成）](/k8s/pv/persistent-volume.md) +##### [Persistent Volume 持久卷（未完成）](/docs/k8s-pv/persistent-volume.md) -##### [CentOS 7 中安装 NFS](/k8s/pv/centos-7-nfs-install.md) +##### [CentOS 7 中安装 NFS](/docs/k8s-pv/centos-7-nfs-install.md) #### Kubernetes（k8s） CSI -##### [kubernetes（k8s） CSI 插件列表](/k8s/csi/csi-list.md) +##### [kubernetes（k8s） CSI 插件列表](/docs/k8s-csi/csi-list.md) -##### [阿里云 Kubernetes OSS CSI 插件（未完成）](/k8s/csi/aliyun-oss-csi-configuration.md) +##### [阿里云 Kubernetes OSS CSI 插件（未完成）](/docs/k8s-csi/aliyun-oss-csi-configuration.md) #### helm -##### [helm 安装配置（未完成）](/k8s/helm/helm-install.md) +##### [helm 安装配置（未完成）](/docs/helm/helm-install.md) ### Nexus 私库 -#### [在 Docker 中安装 Nexus](/nexus/docker-install-nexus.md) +#### [在 Docker 中安装 Nexus](/docs/nexus/docker-install-nexus.md) -#### [Docker 容器 Nexus 配置 SSL/https](/nexus/docker-https-configuration.md) +#### [Docker 容器 Nexus 配置 SSL/https](/docs/nexus/docker-https-configuration.md) -#### [使用 Maven 私库](/nexus/use-maven-repository.md) +#### [使用 Maven 私库](/docs/nexus/use-maven-repository.md) -#### [S3 Blob Stores 配置](/nexus/s3-blob-stores.md) +#### [S3 Blob Stores 配置](/docs/nexus/s3-blob-stores.md) -#### [Maven 私库 自定义配置](/nexus/maven-repository.md) +#### [Maven 私库 自定义配置](/docs/nexus/maven-repository.md) -#### [Docker 私库 自定义配置](/nexus/docker-repository.md) +#### [Docker 私库 自定义配置](/docs/nexus/docker-repository.md) -#### [yum 私库 自定义配置](/nexus/yum-repository.md) +#### [yum 私库 自定义配置](/docs/nexus/yum-repository.md) -#### [apt 私库 自定义配置（未完成）](/nexus/apt-repository.md) +#### [apt 私库 自定义配置（未完成）](/docs/nexus/apt-repository.md) -#### [npm 私库 自定义配置（未完成）](/nexus/npm-repository.md) +#### [npm 私库 自定义配置（未完成）](/docs/nexus/npm-repository.md) ### 离线安装 diff --git a/docs/docker/_category_.json b/docs/docker/_category_.json new file mode 100644 index 0000000000000000000000000000000000000000..8cc059aba96296806e9c32e3b203e5863bbc15fe --- /dev/null +++ b/docs/docker/_category_.json @@ -0,0 +1,8 @@ +{ + "label": "Docker", + "position": 301, + "link": { + "type": "generated-index", + "description": "Docker 安装、配置、使用等" + } +} diff --git a/docker/centos-install.md b/docs/docker/centos-install.md similarity index 96% rename from docker/centos-install.md rename to docs/docker/centos-install.md index 1193aece2317ea569852e2994c98e1c37012be5e..7da9e237d179ed4c368e59d8505b66ec9500c94f 100644 --- a/docker/centos-install.md +++ b/docs/docker/centos-install.md @@ -1,3 +1,7 @@ +--- +sidebar_position: 1 +--- + # CentOS 安装 Docker ## 文档 @@ -23,7 +27,7 @@ ## 视频演示 - + ## 安装 Docker diff --git a/docker/postgresql-15-install.md b/docs/docker/postgresql-15-install.md similarity index 98% rename from docker/postgresql-15-install.md rename to docs/docker/postgresql-15-install.md index 308ff0737d4ce06d44014d58dd73ba6d602689ec..aac484efcefd6c88edff07d1421f7f3fe6d42933 100644 --- a/docker/postgresql-15-install.md +++ b/docs/docker/postgresql-15-install.md @@ -1,3 +1,7 @@ +--- +sidebar_position: 2 +--- + # Docker 安装 PostgreSQL 15 ## 说明 diff --git a/docker/sonarqube-install.md b/docs/docker/sonarqube-install.md similarity index 98% rename from docker/sonarqube-install.md rename to docs/docker/sonarqube-install.md index 9bedb31eab09c4b517f8cd66c6bba018be2aaf46..9efce25f0b9592b2d70ae314542f9177accb573e 100644 --- a/docker/sonarqube-install.md +++ b/docs/docker/sonarqube-install.md @@ -1,3 +1,7 @@ +--- +sidebar_position: 3 +--- + # Docker 安装 sonarqube ## 说明 diff --git a/docs/gitlab-dependabot/_category_.json b/docs/gitlab-dependabot/_category_.json new file mode 100644 index 0000000000000000000000000000000000000000..06cada5c232e3682aca48ab8b1cd9ee5b6a9199d --- /dev/null +++ b/docs/gitlab-dependabot/_category_.json @@ -0,0 +1,8 @@ +{ + "label": "GitLab Dependabot", + "position": 205, + "link": { + "type": "generated-index", + "description": "GitLab 依赖机器人" + } +} diff --git a/dependabot-gitlab/dependabot-gitlab-install.md b/docs/gitlab-dependabot/dependabot-gitlab-install.md similarity index 98% rename from dependabot-gitlab/dependabot-gitlab-install.md rename to docs/gitlab-dependabot/dependabot-gitlab-install.md index f626ba2a3f78829edb095d8c39f0bbe43567bbee..eefb99884ac820c2fb29d057ee91d48dffc3bb39 100644 --- a/dependabot-gitlab/dependabot-gitlab-install.md +++ b/docs/gitlab-dependabot/dependabot-gitlab-install.md @@ -1,4 +1,10 @@ -# GitLab 依赖机器人 dependabot-gitlab 使用 docker compose 安装 +--- +sidebar_position: 1 +--- + +# GitLab 依赖机器人 安装 + +GitLab 依赖机器人 dependabot-gitlab 使用 docker compose 安装 ## 说明 diff --git a/docs/gitlab-object-store/_category_.json b/docs/gitlab-object-store/_category_.json new file mode 100644 index 0000000000000000000000000000000000000000..3a7eb287cb5e1af6d08d892e57ec006dba25c401 --- /dev/null +++ b/docs/gitlab-object-store/_category_.json @@ -0,0 +1,8 @@ +{ + "label": "GitLab 对象储存", + "position": 202, + "link": { + "type": "generated-index", + "description": "GitLab 对象储存使用说明等" + } +} diff --git a/gitlab/object-store/artifacts-configuration.md b/docs/gitlab-object-store/artifacts-configuration.md similarity index 97% rename from gitlab/object-store/artifacts-configuration.md rename to docs/gitlab-object-store/artifacts-configuration.md index 361fd96c2d081f40dd00db94db018718ac4f3919..293029a1e9b14f64a2c1337e4ecb8765810198d1 100644 --- a/gitlab/object-store/artifacts-configuration.md +++ b/docs/gitlab-object-store/artifacts-configuration.md @@ -1,4 +1,10 @@ -# GitLab artifacts 使用对象储存 S3（MinIO） +--- +sidebar_position: 1 +--- + +# artifacts + +GitLab artifacts 使用对象储存 S3（MinIO） ## 文档 diff --git a/docs/gitlab-object-store/backup_upload-configuration.md b/docs/gitlab-object-store/backup_upload-configuration.md new file mode 100644 index 0000000000000000000000000000000000000000..95a7569752cfa0acbee7c45a8c9dfe667b7d960f --- /dev/null +++ b/docs/gitlab-object-store/backup_upload-configuration.md @@ -0,0 +1,7 @@ +--- +sidebar_position: 4 +--- + +# backup_upload + +GitLab backup_upload 使用对象储存 S3（MinIO）（未完成） diff --git a/docs/gitlab-object-store/ci_secure_files-configuration.md b/docs/gitlab-object-store/ci_secure_files-configuration.md new file mode 100644 index 0000000000000000000000000000000000000000..f8544d92392869164eefa467dc2805270649d38f --- /dev/null +++ b/docs/gitlab-object-store/ci_secure_files-configuration.md @@ -0,0 +1,7 @@ +--- +sidebar_position: 5 +--- + +# ci_secure_files + +GitLab ci_secure_files 使用对象储存 S3（MinIO）（未完成） diff --git a/gitlab/object-store/dependency_proxy-configuration.md b/docs/gitlab-object-store/dependency_proxy-configuration.md similarity index 77% rename from gitlab/object-store/dependency_proxy-configuration.md rename to docs/gitlab-object-store/dependency_proxy-configuration.md index 969a34e63f186becb8f91b86b5f6d26e559c2f50..aada13d1ea1de11045070bed857d7fe6d3aaf0d6 100644 --- a/gitlab/object-store/dependency_proxy-configuration.md +++ b/docs/gitlab-object-store/dependency_proxy-configuration.md @@ -1,4 +1,10 @@ -# GitLab dependency_proxy 使用对象储存 S3（MinIO）（未完成） +--- +sidebar_position: 6 +--- + +# dependency_proxy + +GitLab dependency_proxy 使用对象储存 S3（MinIO）（未完成） ## 文档 1. [管理极狐GitLab 依赖代理](https://docs.gitlab.cn/jh/administration/packages/dependency_proxy.html) diff --git a/docs/gitlab-object-store/external_diffs-configuration.md b/docs/gitlab-object-store/external_diffs-configuration.md new file mode 100644 index 0000000000000000000000000000000000000000..4306359908d4e7e49d567b9c2d47963b1198d295 --- /dev/null +++ b/docs/gitlab-object-store/external_diffs-configuration.md @@ -0,0 +1,12 @@ +--- +sidebar_position: 7 +--- + +# external_diffs + +GitLab external_diffs 使用对象储存 S3（MinIO）（未完成） + +## 文档 + +1. [合并请求差异存储](https://docs.gitlab.cn/jh/administration/merge_request_diffs.html) + diff --git a/gitlab/object-store/lfs-configuration.md b/docs/gitlab-object-store/lfs-configuration.md similarity index 84% rename from gitlab/object-store/lfs-configuration.md rename to docs/gitlab-object-store/lfs-configuration.md index 7a8f7f3e451c5cdf5905351f8cd59afd03e8785c..a8f71011e8f426f5dab05c7dcf33132766a0460e 100644 --- a/gitlab/object-store/lfs-configuration.md +++ b/docs/gitlab-object-store/lfs-configuration.md @@ -1,4 +1,10 @@ -# GitLab LFS 使用对象储存 S3（MinIO）（未完成） +--- +sidebar_position: 8 +--- + +# LFS + +GitLab LFS 使用对象储存 S3（MinIO）（未完成） ## 文档 diff --git a/gitlab/object-store/object-store-configuration.md b/docs/gitlab-object-store/object-store-configuration.md similarity index 63% rename from gitlab/object-store/object-store-configuration.md rename to docs/gitlab-object-store/object-store-configuration.md index 2d8c3d2b5dd78492ae749146465916cd5e982db3..2e32ca6d6901e7dbe201cbb843689dc632f2858a 100644 --- a/gitlab/object-store/object-store-configuration.md +++ b/docs/gitlab-object-store/object-store-configuration.md @@ -1,4 +1,10 @@ -# GitLab object_storage 使用对象储存 S3（MinIO）（未完成） +--- +sidebar_position: 9 +--- + +# object_storage + +GitLab object_storage 使用对象储存 S3（MinIO）（未完成） ## 说明 diff --git a/gitlab/object-store/packages-configuration.md b/docs/gitlab-object-store/packages-configuration.md similarity index 85% rename from gitlab/object-store/packages-configuration.md rename to docs/gitlab-object-store/packages-configuration.md index f356ab3a0b0846c8af4ecd2dc4118bf6cdc6d500..db4302000e84f3f5b310905461dd79cf72ddf2fd 100644 --- a/gitlab/object-store/packages-configuration.md +++ b/docs/gitlab-object-store/packages-configuration.md @@ -1,4 +1,10 @@ -# GitLab packages 使用对象储存 S3（MinIO）（未完成） +--- +sidebar_position: 10 +--- + +# packages + +GitLab packages 使用对象储存 S3（MinIO）（未完成） ## 文档 diff --git a/gitlab/object-store/pages-configuration.md b/docs/gitlab-object-store/pages-configuration.md similarity index 97% rename from gitlab/object-store/pages-configuration.md rename to docs/gitlab-object-store/pages-configuration.md index d4030aeac164783c679c8236890b7f8fe7d27b4b..b4ac1d4b3ee96fe1977d11889241d416bdd99b93 100644 --- a/gitlab/object-store/pages-configuration.md +++ b/docs/gitlab-object-store/pages-configuration.md @@ -1,4 +1,10 @@ -# GitLab pages 使用对象储存 S3（MinIO） +--- +sidebar_position: 2 +--- + +# pages + +GitLab pages 使用对象储存 S3（MinIO） ## 文档 diff --git a/gitlab/object-store/terraform_state-configuration.md b/docs/gitlab-object-store/terraform_state-configuration.md similarity index 68% rename from gitlab/object-store/terraform_state-configuration.md rename to docs/gitlab-object-store/terraform_state-configuration.md index 45432e5987f8047bd25a8b8d521e5c62a5d10c64..a1415ae4e37d99ac65ad62cf18403dcdbda2c6b9 100644 --- a/gitlab/object-store/terraform_state-configuration.md +++ b/docs/gitlab-object-store/terraform_state-configuration.md @@ -1,4 +1,10 @@ -# GitLab terraform_state 使用对象储存 S3（MinIO）（未完成） +--- +sidebar_position: 11 +--- + +# terraform_state + +GitLab terraform_state 使用对象储存 S3（MinIO）（未完成） ## 文档 diff --git a/gitlab/object-store/uploads-configuration.md b/docs/gitlab-object-store/uploads-configuration.md similarity index 97% rename from gitlab/object-store/uploads-configuration.md rename to docs/gitlab-object-store/uploads-configuration.md index f771fe26a35713c914f1fdde7e8987b8c5519410..c742ce7c748481de4e6364457429b8289fdefd92 100644 --- a/gitlab/object-store/uploads-configuration.md +++ b/docs/gitlab-object-store/uploads-configuration.md @@ -1,4 +1,10 @@ -# GitLab uploads 使用对象储存 S3（MinIO） +--- +sidebar_position: 3 +--- + +# uploads + +GitLab uploads 使用对象储存 S3（MinIO） ## 文档 diff --git a/docs/gitlab-packages/_category_.json b/docs/gitlab-packages/_category_.json new file mode 100644 index 0000000000000000000000000000000000000000..40ef4bd50c5843437462ec2053e464f1dac53806 --- /dev/null +++ b/docs/gitlab-packages/_category_.json @@ -0,0 +1,8 @@ +{ + "label": "GitLab 软件包库", + "position": 203, + "link": { + "type": "generated-index", + "description": "GitLab 软件包库，包含 Docker、Maven、npm 仓库使用说明等" + } +} diff --git a/gitlab/packages/docker-configuration.md b/docs/gitlab-packages/docker-configuration.md similarity index 98% rename from gitlab/packages/docker-configuration.md rename to docs/gitlab-packages/docker-configuration.md index be664a64d0cba612a04956a0e992b9cad1267fd7..7691952589078a7b3966d527c6bb8521c0b5668e 100644 --- a/gitlab/packages/docker-configuration.md +++ b/docs/gitlab-packages/docker-configuration.md @@ -114,7 +114,7 @@ 5. 访问 `项目地址/container_registry` ，如果返回的不是 `404` 说明已经配置好了 1. 如果使用域名，则需要添加DNS（或修改本地 hosts） 2. 如果是自己生成的证书，使用时需要忽略证书验证：参见： - 1. [Docker 容器 Nexus 配置 SSL/https](/nexus/docker-https-configuration.md) + 1. [Docker 容器 Nexus 配置 SSL/https](/docs/nexus/docker-https-configuration.md) 6. GitLab Docker 容器镜像库凭证（公开项目拉取镜像无需凭证） 其中 `$CI_REGISTRY` 是 GitLab `registry_external_url` 设置的域名，可访问 `项目地址/container_registry` 看到 1. 用户名/密码 @@ -156,7 +156,7 @@ docker login -u -p $CI_REGISTRY ``` -7. 域名证书验证失败：参见：[Docker 容器 Nexus 配置 SSL/https](/nexus/docker-https-configuration.md) +7. 域名证书验证失败：参见：[Docker 容器 Nexus 配置 SSL/https](/docs/nexus/docker-https-configuration.md) 先在宿主机上信任域名，然后使用挂载卷映射 `/etc/docker/certs.d` 到容器内即可 ```shell diff --git a/gitlab/packages/maven-configuration.md b/docs/gitlab-packages/maven-configuration.md similarity index 100% rename from gitlab/packages/maven-configuration.md rename to docs/gitlab-packages/maven-configuration.md diff --git a/gitlab/packages/npm-configuration.md b/docs/gitlab-packages/npm-configuration.md similarity index 100% rename from gitlab/packages/npm-configuration.md rename to docs/gitlab-packages/npm-configuration.md diff --git a/docs/gitlab-runner/_category_.json b/docs/gitlab-runner/_category_.json new file mode 100644 index 0000000000000000000000000000000000000000..44b78a455f05d171ec1b6fb150e2169967452145 --- /dev/null +++ b/docs/gitlab-runner/_category_.json @@ -0,0 +1,8 @@ +{ + "label": "GitLab Runner", + "position": 204, + "link": { + "type": "generated-index", + "description": "GitLab Runner CI/CD 安装、配置、使用说明等" + } +} diff --git a/gitlab-runner/anolis-8-install.md b/docs/gitlab-runner/anolis-8-install.md similarity index 95% rename from gitlab-runner/anolis-8-install.md rename to docs/gitlab-runner/anolis-8-install.md index bf94937ff2009057fb7d2d8f54832c62cc7810e6..ff28e09fe9e0e0a08ebd0075d518800af5689bcf 100644 --- a/gitlab-runner/anolis-8-install.md +++ b/docs/gitlab-runner/anolis-8-install.md @@ -1,8 +1,12 @@ -# 疑难解答：龙蜥 Anolis 8 中安装 GitLab Runner +--- +sidebar_position: 2 +--- + +# Anolis 8 安装 GitLab Runner ## 说明 -1. 原理参见上文 [龙蜥 Anolis 8 中安装 GitLab](/gitlab/anolis-8-install.md) +1. 原理参见上文 [龙蜥 Anolis 8 中安装 GitLab](/docs/gitlab/anolis-8.4-install.md) 2. 本文以 Anolis 8为例进行说明（**如果使用的是 Anolis 7，需要将下方链接中的参数 8 改为 7**） @@ -75,4 +79,4 @@ yum -y install gitlab-runner ``` -5. 后面就可以直接使用前面的文档 [CentOS 安装 GitLab Runner](/gitlab-runner/centos-install.md) 进行配置了 +5. 后面就可以直接使用前面的文档 [CentOS 安装 GitLab Runner](/docs/gitlab-runnerunner/centos-install.md) 进行配置了 diff --git a/gitlab-runner/cache-s3-configuration.md b/docs/gitlab-runner/cache-s3-configuration.md similarity index 97% rename from gitlab-runner/cache-s3-configuration.md rename to docs/gitlab-runner/cache-s3-configuration.md index 0127b39485ced113a3b2088fc3e1e2b667508305..ff4cf4e9003ed195ed1a30ba6f82ec2a0f3b209a 100644 --- a/gitlab-runner/cache-s3-configuration.md +++ b/docs/gitlab-runner/cache-s3-configuration.md @@ -1,8 +1,13 @@ -# GitLab Runner Cache 配置 S3（MinIO） +--- +sidebar_position: 4 +--- -1. 支持 MinIO -2. 支持 阿里云 OSS 对象储存 -3. 支持 天翼云 OOS 对象储存 +# GitLab Runner Cache 配置 + +1. 支持 S3 协议 +2. 支持 MinIO +3. 支持 阿里云 OSS 对象储存 +4. 支持 天翼云 OOS 对象储存 ## 说明 diff --git a/gitlab-runner/centos-install.md b/docs/gitlab-runner/centos-install.md similarity index 99% rename from gitlab-runner/centos-install.md rename to docs/gitlab-runner/centos-install.md index 6816731264fbd9509dfd12a541da4372401042aa..68292c6f42a8f2bfac4f8299451cbb72067228e1 100644 --- a/gitlab-runner/centos-install.md +++ b/docs/gitlab-runner/centos-install.md @@ -1,3 +1,7 @@ +--- +sidebar_position: 1 +--- + # CentOS 安装 GitLab Runner ## 文档 diff --git a/gitlab-runner/docker-in-docker-configuration.md b/docs/gitlab-runner/docker-in-docker-configuration.md similarity index 99% rename from gitlab-runner/docker-in-docker-configuration.md rename to docs/gitlab-runner/docker-in-docker-configuration.md index 5bf8dff728961f4d1888efb54f00995ca47f9ef4..b92f1bdd7ee0405c05ee37b468a7b1e82728d15b 100644 --- a/gitlab-runner/docker-in-docker-configuration.md +++ b/docs/gitlab-runner/docker-in-docker-configuration.md @@ -1,3 +1,7 @@ +--- +sidebar_position: 5 +--- + # Docker-in-Docker（未完成） ## 说明 diff --git a/gitlab-runner/fatal-git-fetch-pack.md b/docs/gitlab-runner/fatal-git-fetch-pack.md similarity index 86% rename from gitlab-runner/fatal-git-fetch-pack.md rename to docs/gitlab-runner/fatal-git-fetch-pack.md index e0554650df8a6a566a2769e97eaadef7d5ae4c52..e3514601cac22d77db70fa835514df8bf9334317 100644 --- a/gitlab-runner/fatal-git-fetch-pack.md +++ b/docs/gitlab-runner/fatal-git-fetch-pack.md @@ -1,4 +1,10 @@ -# 疑难解答：GitLab Runner CI/CD 在 CentOS/Anolis 中使用 shell 执行器时，出现：fatal: git fetch-pack: expected shallow list +--- +sidebar_position: 6 +--- + +# fatal: git fetch-pack: expected shallow list + +GitLab Runner CI/CD 在 CentOS/Anolis 中使用 shell 执行器时，出现：fatal: git fetch-pack: expected shallow list ## 说明 diff --git a/gitlab-runner/k8s-configuration.md b/docs/gitlab-runner/k8s-configuration.md similarity index 98% rename from gitlab-runner/k8s-configuration.md rename to docs/gitlab-runner/k8s-configuration.md index 72d904d1fce72d277a13fa8e4d5d3627409f9abb..b96f2fa40ebf0448ca1fec14852549fb05c6bf34 100644 --- a/gitlab-runner/k8s-configuration.md +++ b/docs/gitlab-runner/k8s-configuration.md @@ -1,4 +1,8 @@ -# GitLab Runner、kubernetes（k8s）配置 +--- +sidebar_position: 3 +--- + +# GitLab Runner kubernetes（k8s）配置 ## 资料 @@ -19,7 +23,7 @@ ## 说明 -1. GitLab Runner 注册到 GitLab 的操作请参见上面章节中的[CentOS 安装 GitLab Runner](/gitlab-runner/centos-install.md) +1. GitLab Runner 注册到 GitLab 的操作请参见上面章节中的[CentOS 安装 GitLab Runner](/docs/gitlab-runnerunner/centos-install.md) ，只需要将**流水线的执行器**设置成**kubernetes**即可，然后执行流水线，会出现问题，按照下方内容去解决 2. 本文采用遇见什么错误，增加对应的配置来介绍 GitLab Runner、kubernetes 的配置 diff --git a/gitlab-runner/static/fatal-git-fetch-pack-1.png b/docs/gitlab-runner/static/fatal-git-fetch-pack-1.png similarity index 100% rename from gitlab-runner/static/fatal-git-fetch-pack-1.png rename to docs/gitlab-runner/static/fatal-git-fetch-pack-1.png diff --git a/gitlab-runner/static/fatal-git-fetch-pack-2.png b/docs/gitlab-runner/static/fatal-git-fetch-pack-2.png similarity index 100% rename from gitlab-runner/static/fatal-git-fetch-pack-2.png rename to docs/gitlab-runner/static/fatal-git-fetch-pack-2.png diff --git a/gitlab-runner/static/fatal-git-fetch-pack-3.png b/docs/gitlab-runner/static/fatal-git-fetch-pack-3.png similarity index 100% rename from gitlab-runner/static/fatal-git-fetch-pack-3.png rename to docs/gitlab-runner/static/fatal-git-fetch-pack-3.png diff --git a/docs/gitlab/_category_.json b/docs/gitlab/_category_.json new file mode 100644 index 0000000000000000000000000000000000000000..f1ce905a4c6d667f917ee55fdfd9ac351ab52f80 --- /dev/null +++ b/docs/gitlab/_category_.json @@ -0,0 +1,8 @@ +{ + "label": "GitLab", + "position": 201, + "link": { + "type": "generated-index", + "description": "GitLab 安装、配置、使用说明等" + } +} diff --git a/gitlab/anolis-8-install.md b/docs/gitlab/anolis-8.4-install.md similarity index 98% rename from gitlab/anolis-8-install.md rename to docs/gitlab/anolis-8.4-install.md index 1a35d4333d8582918f3fa01aff6ef77746054ea8..e4ddbde405ff0690c929d9f228566b71a7badb05 100644 --- a/gitlab/anolis-8-install.md +++ b/docs/gitlab/anolis-8.4-install.md @@ -1,4 +1,8 @@ -# 疑难解答：龙蜥 Anolis 8 中安装 GitLab +--- +sidebar_position: 2 +--- + +# Anolis 8.4 中安装 GitLab ## 说明与文档 @@ -116,4 +120,4 @@ # sudo EXTERNAL_URL="http://gitlab.example.com" yum install -y gitlab-ee ``` -5. 后面就可以直接使用前面的文档 [CentOS 7 中安装 GitLab](/gitlab/centos-7.9-install.md) 进行配置了 +5. 后面就可以直接使用前面的文档 [CentOS 7 中安装 GitLab](/docs/gitlab/centos-7.9-install.md) 进行配置了 diff --git a/gitlab/centos-7.9-install.md b/docs/gitlab/centos-7.9-install.md similarity index 99% rename from gitlab/centos-7.9-install.md rename to docs/gitlab/centos-7.9-install.md index 4a35c9191630990263eed91781dc782cca5e6307..afe538611850eb4b1bb47659deff4f7427266ea4 100644 --- a/gitlab/centos-7.9-install.md +++ b/docs/gitlab/centos-7.9-install.md @@ -1,3 +1,7 @@ +--- +sidebar_position: 1 +--- + # CentOS 7.9 中安装 GitLab ## 参考文档 diff --git a/gitlab/https-configuration.md b/docs/gitlab/https-configuration.md similarity index 99% rename from gitlab/https-configuration.md rename to docs/gitlab/https-configuration.md index 40a9806fc7a85fd1f39cbc23dbd5c8e6ddd6ca43..6f174559d9dd794e6929f42a47fa05702e55d335 100644 --- a/gitlab/https-configuration.md +++ b/docs/gitlab/https-configuration.md @@ -1,3 +1,7 @@ +--- +sidebar_position: 3 +--- + # GitLab 配置 SSL/https ## 参考文档 diff --git a/gitlab/pages-https-configuration.md b/docs/gitlab/pages-https-configuration.md similarity index 99% rename from gitlab/pages-https-configuration.md rename to docs/gitlab/pages-https-configuration.md index ae3897f0b0b5e6dff53566f848cc67684caa706f..44d34c0e3832df82129468c8ea0223fe37a5c744 100644 --- a/gitlab/pages-https-configuration.md +++ b/docs/gitlab/pages-https-configuration.md @@ -1,3 +1,7 @@ +--- +sidebar_position: 4 +--- + # GitLab Pages 配置 SSL/https ## 文档 diff --git a/gitlab/static/pages-https-configuration-1.png b/docs/gitlab/static/pages-https-configuration-1.png similarity index 100% rename from gitlab/static/pages-https-configuration-1.png rename to docs/gitlab/static/pages-https-configuration-1.png diff --git a/docs/guide/_category_.json b/docs/guide/_category_.json new file mode 100644 index 0000000000000000000000000000000000000000..d791dee03588b378ccc06da7a1db79c7b1b06a52 --- /dev/null +++ b/docs/guide/_category_.json @@ -0,0 +1,8 @@ +{ + "label": "导读", + "position": 101, + "link": { + "type": "generated-index", + "description": "软件介绍" + } +} diff --git a/guide/gitlab-gitee.md b/docs/guide/gitlab-gitee.md similarity index 99% rename from guide/gitlab-gitee.md rename to docs/guide/gitlab-gitee.md index 6f9dc3abc1623bd2df4e323aacfe583c960f443e..789ba39ca920889f2b34614352421102d68bd09a 100644 --- a/guide/gitlab-gitee.md +++ b/docs/guide/gitlab-gitee.md @@ -1,3 +1,7 @@ +--- +sidebar_position: 4 +--- + # 极狐GitLab 与 码云Gitee 价格对比 ## 说明 diff --git a/guide/gitlab-runner.md b/docs/guide/gitlab-runner.md similarity index 99% rename from guide/gitlab-runner.md rename to docs/guide/gitlab-runner.md index 4b5150530ce6c22f568a36997666f279e700d97e..891fe24e392c9884470862f298d3f9e69692054e 100644 --- a/guide/gitlab-runner.md +++ b/docs/guide/gitlab-runner.md @@ -1,3 +1,7 @@ +--- +sidebar_position: 2 +--- + # GitLab Runner 导读 1. GitLab Runner 是专为 GitLab 设计的流水线：`持续集成(CI)`、`持续交付(CD)`、`持续部署(CD)` diff --git a/guide/gitlab.md b/docs/guide/gitlab.md similarity index 98% rename from guide/gitlab.md rename to docs/guide/gitlab.md index 9087f8e3c6e12a3cfa62a95a791dea7fb759e171..6e1e69f96c304c3079f415d4f0d700210267f984 100644 --- a/guide/gitlab.md +++ b/docs/guide/gitlab.md @@ -1,3 +1,7 @@ +--- +sidebar_position: 1 +--- + # GitLab 导读 ## 资料 diff --git a/guide/k8s.md b/docs/guide/k8s.md similarity index 99% rename from guide/k8s.md rename to docs/guide/k8s.md index 11a3a15c32e5ebf6e7a653d71b267eec1c51b683..d2438c4d2ea92e1d5e880b70f30d10b1accc44e8 100644 --- a/guide/k8s.md +++ b/docs/guide/k8s.md @@ -1,3 +1,7 @@ +--- +sidebar_position: 3 +--- + # kubernetes（k8s） 导读 ## kubernetes 是什么？ diff --git a/guide/static/price/gitee-1.png b/docs/guide/static/price/gitee-1.png similarity index 100% rename from guide/static/price/gitee-1.png rename to docs/guide/static/price/gitee-1.png diff --git a/guide/static/price/jihulab-1.png b/docs/guide/static/price/jihulab-1.png similarity index 100% rename from guide/static/price/jihulab-1.png rename to docs/guide/static/price/jihulab-1.png diff --git a/guide/static/price/jihulab-2.png b/docs/guide/static/price/jihulab-2.png similarity index 100% rename from guide/static/price/jihulab-2.png rename to docs/guide/static/price/jihulab-2.png diff --git a/docs/helm/_category_.json b/docs/helm/_category_.json new file mode 100644 index 0000000000000000000000000000000000000000..51598ba226122a38f2cac7b671f2992a5169f5e9 --- /dev/null +++ b/docs/helm/_category_.json @@ -0,0 +1,8 @@ +{ + "label": "helm", + "position": 409, + "link": { + "type": "generated-index", + "description": "helm" + } +} diff --git a/k8s/helm/helm-install.md b/docs/helm/helm-install.md similarity index 100% rename from k8s/helm/helm-install.md rename to docs/helm/helm-install.md diff --git a/docs/intro.md b/docs/intro.md index 8a2e69d95f9f7de70b8fb31dbf98fbb27deb7012..918e76677b5ead4d2bd5faa43673533d5644b50e 100644 --- a/docs/intro.md +++ b/docs/intro.md @@ -2,7 +2,7 @@ sidebar_position: 1 --- -# Tutorial Intro +# 文档简介 Let's discover **Docusaurus in less than 5 minutes**. @@ -15,7 +15,7 @@ Or **try Docusaurus immediately** with **[docusaurus.new](https://docusaurus.new ### What you'll need - [Node.js](https://nodejs.org/en/download/) version 16.14 or above: - - When installing Node.js, you are recommended to check all checkboxes related to dependencies. + - When installing Node.js, you are recommended to check all checkboxes related to dependencies. ## Generate a new site @@ -27,7 +27,8 @@ The classic template will automatically be added to your project after you run t npm init docusaurus@latest my-website classic ``` -You can type this command into Command Prompt, Powershell, Terminal, or any other integrated terminal of your code editor. +You can type this command into Command Prompt, Powershell, Terminal, or any other integrated terminal of your code +editor. The command also installs all necessary dependencies you need to run Docusaurus. @@ -40,8 +41,10 @@ cd my-website npm run start ``` -The `cd` command changes the directory you're working with. In order to work with your newly created Docusaurus site, you'll need to navigate the terminal there. +The `cd` command changes the directory you're working with. In order to work with your newly created Docusaurus site, +you'll need to navigate the terminal there. -The `npm run start` command builds your website locally and serves it through a development server, ready for you to view at http://localhost:3000/. +The `npm run start` command builds your website locally and serves it through a development server, ready for you to +view at http://localhost:3000/. Open `docs/intro.md` (this page) and edit some lines: the site **reloads automatically** and displays your changes. diff --git a/docs/k8s-availability/_category_.json b/docs/k8s-availability/_category_.json new file mode 100644 index 0000000000000000000000000000000000000000..c3673721b1cdaf18a2a425e1408cc942b571d877 --- /dev/null +++ b/docs/k8s-availability/_category_.json @@ -0,0 +1,8 @@ +{ + "label": "Kubernetes（k8s）高可用", + "position": 402, + "link": { + "type": "generated-index", + "description": "Kubernetes（k8s）高可用 安装、配置、使用等" + } +} diff --git a/k8s/availability/etcd-install.md b/docs/k8s-availability/etcd-install.md similarity index 100% rename from k8s/availability/etcd-install.md rename to docs/k8s-availability/etcd-install.md diff --git a/k8s/availability/external-etcd.md b/docs/k8s-availability/external-etcd.md similarity index 64% rename from k8s/availability/external-etcd.md rename to docs/k8s-availability/external-etcd.md index 71986c318b542a800b98098ff819a79dfea34c89..f8e0b5610c5ec100b4458980b61e22d4cbe1e39a 100644 --- a/k8s/availability/external-etcd.md +++ b/docs/k8s-availability/external-etcd.md @@ -3,7 +3,7 @@ ## 说明 1. **本文使用“外部 etcd 拓扑”，即：自建高可用etcd集群，需要：** - 1. [kubernetes（k8s）高可用集群2：etcd 高可用集群（非必须）](/k8s/availability/etcd-install.md) + 1. [kubernetes（k8s）高可用集群2：etcd 高可用集群（非必须）](/docs/k8s-availability/etcd-install.md) 2. **如果不需要“外部 etcd 拓扑”，即：不需要自建高可用etcd集群，请参考：** - 1. [kubernetes（k8s）高可用集群4：利用 kubeadm 创建高可用集群-堆叠（Stacked） etcd 拓扑](/k8s/availability/stacked-etcd.md) -3. [使用两种 etcd 拓展时的区别](/k8s/availability/stacked-etcd.md) + 1. [kubernetes（k8s）高可用集群4：利用 kubeadm 创建高可用集群-堆叠（Stacked） etcd 拓扑](/docs/k8s-availability/stacked-etcd.md) +3. [使用两种 etcd 拓展时的区别](/docs/k8s-availability/stacked-etcd.md) diff --git a/k8s/availability/guide.md b/docs/k8s-availability/guide.md similarity index 100% rename from k8s/availability/guide.md rename to docs/k8s-availability/guide.md diff --git a/k8s/availability/nfs.md b/docs/k8s-availability/nfs.md similarity index 100% rename from k8s/availability/nfs.md rename to docs/k8s-availability/nfs.md diff --git a/k8s/availability/prerequisite.md b/docs/k8s-availability/prerequisite.md similarity index 100% rename from k8s/availability/prerequisite.md rename to docs/k8s-availability/prerequisite.md diff --git a/k8s/availability/stacked-etcd.md b/docs/k8s-availability/stacked-etcd.md similarity index 96% rename from k8s/availability/stacked-etcd.md rename to docs/k8s-availability/stacked-etcd.md index c71d6197b5a56ac1ddf0fcbe581da8b79a5eab19..23aa26b11d1594e54bf7e012cd5b55b65eaabdfe 100644 --- a/k8s/availability/stacked-etcd.md +++ b/docs/k8s-availability/stacked-etcd.md @@ -3,9 +3,9 @@ ## 说明 1. **本文使用“堆叠（Stacked） etcd 拓扑”，即：不需要自建etcd高可用集群，不需要** - 1. [kubernetes（k8s）高可用集群2：etcd 高可用集群（非必须）](/k8s/availability/etcd-install.md)** + 1. [kubernetes（k8s）高可用集群2：etcd 高可用集群（非必须）](/docs/k8s-availability/etcd-install.md)** 2. **如需使用“外部 etcd 拓扑”，即：自建etcd高可用集群，请参考：** - 1. [kubernetes（k8s）高可用集群5：利用 kubeadm 创建高可用集群-外部 etcd 拓扑](/k8s/availability/stacked-etcd.md) + 1. [kubernetes（k8s）高可用集群5：利用 kubeadm 创建高可用集群-外部 etcd 拓扑](/docs/k8s-availability/stacked-etcd.md) 3. 使用两种 etcd 拓展时的区别 由于两种方式操作时，仅存在首个 Master（Control Plane）初始化命令的区别，故仅提供更复杂的“外部 etcd 拓扑”（自建etcd高可用集群）的具体文章步骤，本文仅介绍区别。 diff --git a/k8s/availability/static/availability-1.png b/docs/k8s-availability/static/availability-1.png similarity index 100% rename from k8s/availability/static/availability-1.png rename to docs/k8s-availability/static/availability-1.png diff --git a/k8s/availability/static/availability-2.png b/docs/k8s-availability/static/availability-2.png similarity index 100% rename from k8s/availability/static/availability-2.png rename to docs/k8s-availability/static/availability-2.png diff --git a/k8s/availability/static/availability-3.png b/docs/k8s-availability/static/availability-3.png similarity index 100% rename from k8s/availability/static/availability-3.png rename to docs/k8s-availability/static/availability-3.png diff --git a/k8s/availability/static/availability-4.png b/docs/k8s-availability/static/availability-4.png similarity index 100% rename from k8s/availability/static/availability-4.png rename to docs/k8s-availability/static/availability-4.png diff --git a/k8s/availability/static/availability-5.png b/docs/k8s-availability/static/availability-5.png similarity index 100% rename from k8s/availability/static/availability-5.png rename to docs/k8s-availability/static/availability-5.png diff --git a/k8s/availability/vip.md b/docs/k8s-availability/vip.md similarity index 100% rename from k8s/availability/vip.md rename to docs/k8s-availability/vip.md diff --git a/docs/k8s-csi/_category_.json b/docs/k8s-csi/_category_.json new file mode 100644 index 0000000000000000000000000000000000000000..5736e34fb1db2a8b5b5f57120823cf57cbf722f4 --- /dev/null +++ b/docs/k8s-csi/_category_.json @@ -0,0 +1,8 @@ +{ + "label": "Kubernetes（k8s）CSI", + "position": 404, + "link": { + "type": "generated-index", + "description": "Kubernetes（k8s）CSI 安装、配置、使用等" + } +} diff --git a/k8s/csi/aliyun-oss-csi-configuration.md b/docs/k8s-csi/aliyun-oss-csi-configuration.md similarity index 100% rename from k8s/csi/aliyun-oss-csi-configuration.md rename to docs/k8s-csi/aliyun-oss-csi-configuration.md diff --git a/k8s/csi/csi-list.md b/docs/k8s-csi/csi-list.md similarity index 100% rename from k8s/csi/csi-list.md rename to docs/k8s-csi/csi-list.md diff --git a/docs/k8s-pv/_category_.json b/docs/k8s-pv/_category_.json new file mode 100644 index 0000000000000000000000000000000000000000..9dd1e40e5c6c21d7bbb905754f40a0b7025f8f6c --- /dev/null +++ b/docs/k8s-pv/_category_.json @@ -0,0 +1,8 @@ +{ + "label": "Kubernetes（k8s）PV", + "position": 405, + "link": { + "type": "generated-index", + "description": "Kubernetes（k8s）PV" + } +} diff --git a/k8s/pv/centos-7-nfs-install.md b/docs/k8s-pv/centos-7-nfs-install.md similarity index 100% rename from k8s/pv/centos-7-nfs-install.md rename to docs/k8s-pv/centos-7-nfs-install.md diff --git a/k8s/pv/persistent-volume.md b/docs/k8s-pv/persistent-volume.md similarity index 100% rename from k8s/pv/persistent-volume.md rename to docs/k8s-pv/persistent-volume.md diff --git a/k8s/pv/static/centos-7-nfs-install-1.png b/docs/k8s-pv/static/centos-7-nfs-install-1.png similarity index 100% rename from k8s/pv/static/centos-7-nfs-install-1.png rename to docs/k8s-pv/static/centos-7-nfs-install-1.png diff --git a/k8s/pv/static/centos-7-nfs-install-2.png b/docs/k8s-pv/static/centos-7-nfs-install-2.png similarity index 100% rename from k8s/pv/static/centos-7-nfs-install-2.png rename to docs/k8s-pv/static/centos-7-nfs-install-2.png diff --git a/docs/k8s-ui/_category_.json b/docs/k8s-ui/_category_.json new file mode 100644 index 0000000000000000000000000000000000000000..834ae2881d8275dec4d9602fad8a668d124a93d9 --- /dev/null +++ b/docs/k8s-ui/_category_.json @@ -0,0 +1,8 @@ +{ + "label": "Kubernetes（k8s）UI", + "position": 403, + "link": { + "type": "generated-index", + "description": "Kubernetes（k8s）UI 安装、配置、使用等" + } +} diff --git a/k8s/ui/dashboard-install.md b/docs/k8s-ui/dashboard-install.md similarity index 100% rename from k8s/ui/dashboard-install.md rename to docs/k8s-ui/dashboard-install.md diff --git a/docs/k8s-volumes/_category_.json b/docs/k8s-volumes/_category_.json new file mode 100644 index 0000000000000000000000000000000000000000..ca44fbe799713884ebc448cfb55deab3380d8647 --- /dev/null +++ b/docs/k8s-volumes/_category_.json @@ -0,0 +1,8 @@ +{ + "label": "Kubernetes（k8s）Volumes", + "position": 406, + "link": { + "type": "generated-index", + "description": "Kubernetes（k8s）Volumes" + } +} diff --git a/k8s/volumes/local/empty-dir.md b/docs/k8s-volumes/local/empty-dir.md similarity index 100% rename from k8s/volumes/local/empty-dir.md rename to docs/k8s-volumes/local/empty-dir.md diff --git a/k8s/volumes/local/host-path.md b/docs/k8s-volumes/local/host-path.md similarity index 100% rename from k8s/volumes/local/host-path.md rename to docs/k8s-volumes/local/host-path.md diff --git a/k8s/volumes/resource-mapping/configmap.md b/docs/k8s-volumes/resource-mapping/configmap.md similarity index 100% rename from k8s/volumes/resource-mapping/configmap.md rename to docs/k8s-volumes/resource-mapping/configmap.md diff --git a/k8s/volumes/resource-mapping/downward-api.md b/docs/k8s-volumes/resource-mapping/downward-api.md similarity index 100% rename from k8s/volumes/resource-mapping/downward-api.md rename to docs/k8s-volumes/resource-mapping/downward-api.md diff --git a/k8s/volumes/resource-mapping/projected-volume.md b/docs/k8s-volumes/resource-mapping/projected-volume.md similarity index 100% rename from k8s/volumes/resource-mapping/projected-volume.md rename to docs/k8s-volumes/resource-mapping/projected-volume.md diff --git a/k8s/volumes/resource-mapping/secret.md b/docs/k8s-volumes/resource-mapping/secret.md similarity index 100% rename from k8s/volumes/resource-mapping/secret.md rename to docs/k8s-volumes/resource-mapping/secret.md diff --git a/k8s/volumes/volumes-intro.md b/docs/k8s-volumes/volumes-intro.md similarity index 100% rename from k8s/volumes/volumes-intro.md rename to docs/k8s-volumes/volumes-intro.md diff --git a/docs/k8s/_category_.json b/docs/k8s/_category_.json new file mode 100644 index 0000000000000000000000000000000000000000..299ffd9143e820a64651b9765e7209189f1df92f --- /dev/null +++ b/docs/k8s/_category_.json @@ -0,0 +1,8 @@ +{ + "label": "Kubernetes（k8s）", + "position": 401, + "link": { + "type": "generated-index", + "description": "Kubernetes（k8s）安装、配置、使用等" + } +} diff --git a/k8s/ca-kubeadm.md b/docs/k8s/ca-kubeadm.md similarity index 99% rename from k8s/ca-kubeadm.md rename to docs/k8s/ca-kubeadm.md index b325a30fc9d2c39a79b7fd23f74f4eebe9f65fff..3a0adbd34c33000925917fff7a0faae1d9dbd61a 100644 --- a/k8s/ca-kubeadm.md +++ b/docs/k8s/ca-kubeadm.md @@ -1,3 +1,7 @@ +--- +sidebar_position: 10 +--- + # 使用 kubeadm 生成 Kubernetes（k8s） 新证书 1. 可用于直接更新证书 diff --git a/k8s/ca-openssl.md b/docs/k8s/ca-openssl.md similarity index 68% rename from k8s/ca-openssl.md rename to docs/k8s/ca-openssl.md index 401536f1ea5316a12f322f0aba64f50218596c7d..d39f44d9e32dad5ba193c6c5f2e838fd8a4bde5b 100644 --- a/k8s/ca-openssl.md +++ b/docs/k8s/ca-openssl.md @@ -1,3 +1,7 @@ +--- +sidebar_position: 9 +--- + # 使用 openssl 生成 Kubernetes（k8s） 新证书（未完成） ## 说明 @@ -6,47 +10,49 @@ 2. 不推荐使用此方式，此方式要求对 k8s 配置文件比较了解 3. 此方式仅用学习 `openssl` 相关命令 4. k8s ca 原始文件、k8s 配置文件 - 1. /etc/kubernetes/manifests/kube-apiserver.yaml - 2. + 1. + /etc/kubernetes/manifests/kube-apiserver.yaml + 2. /etc/kubernetes/manifests/kube-controller-manager.yaml - 3. /etc/kubernetes/manifests/kube-scheduler.yaml - 4. /etc/kubernetes/manifests/etcd.yaml - 5. /etc/kubernetes/pki/etcd/ca.key - 6. /etc/kubernetes/pki/etcd/ca.crt - 7. /etc/kubernetes/pki/etcd/server.key - 8. /etc/kubernetes/pki/etcd/server.crt - 9. /etc/kubernetes/pki/etcd/peer.key - 10. /etc/kubernetes/pki/etcd/peer.crt - 11. + 3. + /etc/kubernetes/manifests/kube-scheduler.yaml + 4. /etc/kubernetes/manifests/etcd.yaml + 5. /etc/kubernetes/pki/etcd/ca.key + 6. /etc/kubernetes/pki/etcd/ca.crt + 7. /etc/kubernetes/pki/etcd/server.key + 8. /etc/kubernetes/pki/etcd/server.crt + 9. /etc/kubernetes/pki/etcd/peer.key + 10. /etc/kubernetes/pki/etcd/peer.crt + 11. /etc/kubernetes/pki/etcd/healthcheck-client.key - 12. + 12. /etc/kubernetes/pki/etcd/healthcheck-client.crt - 13. /etc/kubernetes/pki/ca.key - 14. /etc/kubernetes/pki/ca.crt - 15. /etc/kubernetes/pki/apiserver.key - 16. /etc/kubernetes/pki/apiserver.crt - 17. + 13. /etc/kubernetes/pki/ca.key + 14. /etc/kubernetes/pki/ca.crt + 15. /etc/kubernetes/pki/apiserver.key + 16. /etc/kubernetes/pki/apiserver.crt + 17. /etc/kubernetes/pki/apiserver-kubelet-client.key - 18. + 18. /etc/kubernetes/pki/apiserver-kubelet-client.crt - 19. /etc/kubernetes/pki/front-proxy-ca.key - 20. /etc/kubernetes/pki/front-proxy-ca.crt - 21. /etc/kubernetes/pki/front-proxy-client.key - 22. /etc/kubernetes/pki/front-proxy-client.crt - 23. + 19. /etc/kubernetes/pki/front-proxy-ca.key + 20. /etc/kubernetes/pki/front-proxy-ca.crt + 21. /etc/kubernetes/pki/front-proxy-client.key + 22. /etc/kubernetes/pki/front-proxy-client.crt + 23. /etc/kubernetes/pki/apiserver-etcd-client.key - 24. + 24. /etc/kubernetes/pki/apiserver-etcd-client.crt - 25. /etc/kubernetes/pki/sa.key - 26. /etc/kubernetes/pki/sa.pub - 27. /etc/kubernetes/admin.conf - 28. /etc/kubernetes/kubelet.conf - 29. /etc/kubernetes/controller-manager.conf - 30. /etc/kubernetes/scheduler.conf + 25. /etc/kubernetes/pki/sa.key + 26. /etc/kubernetes/pki/sa.pub + 27. /etc/kubernetes/admin.conf + 28. /etc/kubernetes/kubelet.conf + 29. /etc/kubernetes/controller-manager.conf + 30. /etc/kubernetes/scheduler.conf 5. k8s 配置文件说明 - 1. /etc/kubernetes/admin.conf + 1. /etc/kubernetes/admin.conf - clusters.cluster.certificate-authority-data - 1. /etc/kubernetes/pki/ca.crt 文件内容计算 Base64 可得 + 1. /etc/kubernetes/pki/ca.crt 文件内容计算 Base64 可得 ```shell cat /etc/kubernetes/pki/etcd/ca.crt | base64 -w 0 ``` @@ -56,9 +62,9 @@ 3. O：system:masters - users.user.client-key-data 1. users.user.client-certificate-data 的秘钥 - 2. /etc/kubernetes/kubelet.conf + 2. /etc/kubernetes/kubelet.conf - clusters.cluster.certificate-authority-data - 1. /etc/kubernetes/pki/ca.crt 文件内容计算 Base64 可得 + 1. /etc/kubernetes/pki/ca.crt 文件内容计算 Base64 可得 ```shell cat /etc/kubernetes/pki/etcd/ca.crt | base64 -w 0 ``` @@ -67,15 +73,15 @@ 2. 颁发给、使用者 CN：system:kube-controller-manager - users.user.client-key-data 1. users.user.client-certificate-data 的秘钥 - 3. /etc/kubernetes/controller-manager.conf + 3. /etc/kubernetes/controller-manager.conf - clusters.cluster.certificate-authority-data - 1. /etc/kubernetes/pki/ca.crt 文件内容计算 Base64 可得 + 1. /etc/kubernetes/pki/ca.crt 文件内容计算 Base64 可得 ```shell cat /etc/kubernetes/pki/etcd/ca.crt | base64 -w 0 ``` - 4. /etc/kubernetes/scheduler.conf + 4. /etc/kubernetes/scheduler.conf - clusters.cluster.certificate-authority-data - 1. /etc/kubernetes/pki/ca.crt 文件内容计算 Base64 可得 + 1. /etc/kubernetes/pki/ca.crt 文件内容计算 Base64 可得 ```shell cat /etc/kubernetes/pki/etcd/ca.crt | base64 -w 0 ``` diff --git a/k8s/ca/admin.conf b/docs/k8s/ca/admin.conf similarity index 100% rename from k8s/ca/admin.conf rename to docs/k8s/ca/admin.conf diff --git a/k8s/ca/conf/admin/clusters-cluster-certificate-authority-data.crt b/docs/k8s/ca/conf/admin/clusters-cluster-certificate-authority-data.crt similarity index 100% rename from k8s/ca/conf/admin/clusters-cluster-certificate-authority-data.crt rename to docs/k8s/ca/conf/admin/clusters-cluster-certificate-authority-data.crt diff --git a/k8s/ca/conf/admin/users-user-client-certificate-data.crt b/docs/k8s/ca/conf/admin/users-user-client-certificate-data.crt similarity index 100% rename from k8s/ca/conf/admin/users-user-client-certificate-data.crt rename to docs/k8s/ca/conf/admin/users-user-client-certificate-data.crt diff --git a/k8s/ca/conf/admin/users-user-client-key-data.key b/docs/k8s/ca/conf/admin/users-user-client-key-data.key similarity index 100% rename from k8s/ca/conf/admin/users-user-client-key-data.key rename to docs/k8s/ca/conf/admin/users-user-client-key-data.key diff --git a/k8s/ca/conf/controller-manager/clusters-cluster-certificate-authority-data.crt b/docs/k8s/ca/conf/controller-manager/clusters-cluster-certificate-authority-data.crt similarity index 100% rename from k8s/ca/conf/controller-manager/clusters-cluster-certificate-authority-data.crt rename to docs/k8s/ca/conf/controller-manager/clusters-cluster-certificate-authority-data.crt diff --git a/k8s/ca/conf/controller-manager/users-user-client-certificate-data.crt b/docs/k8s/ca/conf/controller-manager/users-user-client-certificate-data.crt similarity index 100% rename from k8s/ca/conf/controller-manager/users-user-client-certificate-data.crt rename to docs/k8s/ca/conf/controller-manager/users-user-client-certificate-data.crt diff --git a/k8s/ca/conf/controller-manager/users-user-client-key-data.key b/docs/k8s/ca/conf/controller-manager/users-user-client-key-data.key similarity index 100% rename from k8s/ca/conf/controller-manager/users-user-client-key-data.key rename to docs/k8s/ca/conf/controller-manager/users-user-client-key-data.key diff --git a/k8s/ca/conf/kubelet/clusters-cluster-certificate-authority-data.crt b/docs/k8s/ca/conf/kubelet/clusters-cluster-certificate-authority-data.crt similarity index 100% rename from k8s/ca/conf/kubelet/clusters-cluster-certificate-authority-data.crt rename to docs/k8s/ca/conf/kubelet/clusters-cluster-certificate-authority-data.crt diff --git a/k8s/ca/conf/scheduler/clusters-cluster-certificate-authority-data.crt b/docs/k8s/ca/conf/scheduler/clusters-cluster-certificate-authority-data.crt similarity index 100% rename from k8s/ca/conf/scheduler/clusters-cluster-certificate-authority-data.crt rename to docs/k8s/ca/conf/scheduler/clusters-cluster-certificate-authority-data.crt diff --git a/k8s/ca/conf/scheduler/users-user-client-certificate-data.crt b/docs/k8s/ca/conf/scheduler/users-user-client-certificate-data.crt similarity index 100% rename from k8s/ca/conf/scheduler/users-user-client-certificate-data.crt rename to docs/k8s/ca/conf/scheduler/users-user-client-certificate-data.crt diff --git a/k8s/ca/conf/scheduler/users-user-client-key-data.key b/docs/k8s/ca/conf/scheduler/users-user-client-key-data.key similarity index 100% rename from k8s/ca/conf/scheduler/users-user-client-key-data.key rename to docs/k8s/ca/conf/scheduler/users-user-client-key-data.key diff --git a/k8s/ca/controller-manager.conf b/docs/k8s/ca/controller-manager.conf similarity index 100% rename from k8s/ca/controller-manager.conf rename to docs/k8s/ca/controller-manager.conf diff --git a/k8s/ca/kubelet.conf b/docs/k8s/ca/kubelet.conf similarity index 100% rename from k8s/ca/kubelet.conf rename to docs/k8s/ca/kubelet.conf diff --git a/k8s/ca/manifests/etcd.yaml b/docs/k8s/ca/manifests/etcd.yaml similarity index 100% rename from k8s/ca/manifests/etcd.yaml rename to docs/k8s/ca/manifests/etcd.yaml diff --git a/k8s/ca/manifests/kube-apiserver.yaml b/docs/k8s/ca/manifests/kube-apiserver.yaml similarity index 100% rename from k8s/ca/manifests/kube-apiserver.yaml rename to docs/k8s/ca/manifests/kube-apiserver.yaml diff --git a/k8s/ca/manifests/kube-controller-manager.yaml b/docs/k8s/ca/manifests/kube-controller-manager.yaml similarity index 100% rename from k8s/ca/manifests/kube-controller-manager.yaml rename to docs/k8s/ca/manifests/kube-controller-manager.yaml diff --git a/k8s/ca/manifests/kube-scheduler.yaml b/docs/k8s/ca/manifests/kube-scheduler.yaml similarity index 100% rename from k8s/ca/manifests/kube-scheduler.yaml rename to docs/k8s/ca/manifests/kube-scheduler.yaml diff --git a/k8s/ca/pki/apiserver-etcd-client.crt b/docs/k8s/ca/pki/apiserver-etcd-client.crt similarity index 100% rename from k8s/ca/pki/apiserver-etcd-client.crt rename to docs/k8s/ca/pki/apiserver-etcd-client.crt diff --git a/k8s/ca/pki/apiserver-etcd-client.key b/docs/k8s/ca/pki/apiserver-etcd-client.key similarity index 100% rename from k8s/ca/pki/apiserver-etcd-client.key rename to docs/k8s/ca/pki/apiserver-etcd-client.key diff --git a/k8s/ca/pki/apiserver-kubelet-client.crt b/docs/k8s/ca/pki/apiserver-kubelet-client.crt similarity index 100% rename from k8s/ca/pki/apiserver-kubelet-client.crt rename to docs/k8s/ca/pki/apiserver-kubelet-client.crt diff --git a/k8s/ca/pki/apiserver-kubelet-client.key b/docs/k8s/ca/pki/apiserver-kubelet-client.key similarity index 100% rename from k8s/ca/pki/apiserver-kubelet-client.key rename to docs/k8s/ca/pki/apiserver-kubelet-client.key diff --git a/k8s/ca/pki/apiserver.crt b/docs/k8s/ca/pki/apiserver.crt similarity index 100% rename from k8s/ca/pki/apiserver.crt rename to docs/k8s/ca/pki/apiserver.crt diff --git a/k8s/ca/pki/apiserver.key b/docs/k8s/ca/pki/apiserver.key similarity index 100% rename from k8s/ca/pki/apiserver.key rename to docs/k8s/ca/pki/apiserver.key diff --git a/k8s/ca/pki/ca.crt b/docs/k8s/ca/pki/ca.crt similarity index 100% rename from k8s/ca/pki/ca.crt rename to docs/k8s/ca/pki/ca.crt diff --git a/k8s/ca/pki/ca.key b/docs/k8s/ca/pki/ca.key similarity index 100% rename from k8s/ca/pki/ca.key rename to docs/k8s/ca/pki/ca.key diff --git a/k8s/ca/pki/etcd/ca.crt b/docs/k8s/ca/pki/etcd/ca.crt similarity index 100% rename from k8s/ca/pki/etcd/ca.crt rename to docs/k8s/ca/pki/etcd/ca.crt diff --git a/k8s/ca/pki/etcd/ca.key b/docs/k8s/ca/pki/etcd/ca.key similarity index 100% rename from k8s/ca/pki/etcd/ca.key rename to docs/k8s/ca/pki/etcd/ca.key diff --git a/k8s/ca/pki/etcd/healthcheck-client.crt b/docs/k8s/ca/pki/etcd/healthcheck-client.crt similarity index 100% rename from k8s/ca/pki/etcd/healthcheck-client.crt rename to docs/k8s/ca/pki/etcd/healthcheck-client.crt diff --git a/k8s/ca/pki/etcd/healthcheck-client.key b/docs/k8s/ca/pki/etcd/healthcheck-client.key similarity index 100% rename from k8s/ca/pki/etcd/healthcheck-client.key rename to docs/k8s/ca/pki/etcd/healthcheck-client.key diff --git a/k8s/ca/pki/etcd/peer.crt b/docs/k8s/ca/pki/etcd/peer.crt similarity index 100% rename from k8s/ca/pki/etcd/peer.crt rename to docs/k8s/ca/pki/etcd/peer.crt diff --git a/k8s/ca/pki/etcd/peer.key b/docs/k8s/ca/pki/etcd/peer.key similarity index 100% rename from k8s/ca/pki/etcd/peer.key rename to docs/k8s/ca/pki/etcd/peer.key diff --git a/k8s/ca/pki/etcd/server.crt b/docs/k8s/ca/pki/etcd/server.crt similarity index 100% rename from k8s/ca/pki/etcd/server.crt rename to docs/k8s/ca/pki/etcd/server.crt diff --git a/k8s/ca/pki/etcd/server.key b/docs/k8s/ca/pki/etcd/server.key similarity index 100% rename from k8s/ca/pki/etcd/server.key rename to docs/k8s/ca/pki/etcd/server.key diff --git a/k8s/ca/pki/front-proxy-ca.crt b/docs/k8s/ca/pki/front-proxy-ca.crt similarity index 100% rename from k8s/ca/pki/front-proxy-ca.crt rename to docs/k8s/ca/pki/front-proxy-ca.crt diff --git a/k8s/ca/pki/front-proxy-ca.key b/docs/k8s/ca/pki/front-proxy-ca.key similarity index 100% rename from k8s/ca/pki/front-proxy-ca.key rename to docs/k8s/ca/pki/front-proxy-ca.key diff --git a/k8s/ca/pki/front-proxy-client.crt b/docs/k8s/ca/pki/front-proxy-client.crt similarity index 100% rename from k8s/ca/pki/front-proxy-client.crt rename to docs/k8s/ca/pki/front-proxy-client.crt diff --git a/k8s/ca/pki/front-proxy-client.key b/docs/k8s/ca/pki/front-proxy-client.key similarity index 100% rename from k8s/ca/pki/front-proxy-client.key rename to docs/k8s/ca/pki/front-proxy-client.key diff --git a/k8s/ca/pki/sa.key b/docs/k8s/ca/pki/sa.key similarity index 100% rename from k8s/ca/pki/sa.key rename to docs/k8s/ca/pki/sa.key diff --git a/k8s/ca/pki/sa.pub b/docs/k8s/ca/pki/sa.pub similarity index 100% rename from k8s/ca/pki/sa.pub rename to docs/k8s/ca/pki/sa.pub diff --git a/k8s/ca/scheduler.conf b/docs/k8s/ca/scheduler.conf similarity index 100% rename from k8s/ca/scheduler.conf rename to docs/k8s/ca/scheduler.conf diff --git a/k8s/centos-install.md b/docs/k8s/centos-install.md similarity index 99% rename from k8s/centos-install.md rename to docs/k8s/centos-install.md index 69dd53847c3e2ba2aadd283910bedb631a849e7c..83dd41392ae641e66b1bc902455165353c8e240a 100644 --- a/k8s/centos-install.md +++ b/docs/k8s/centos-install.md @@ -1,3 +1,7 @@ +--- +sidebar_position: 1 +--- + # Kubernetes（k8s）安装 ## 文档 @@ -43,7 +47,7 @@ ## 视频演示 - + ## 安装 @@ -164,7 +168,7 @@ 8. 安装 Containerd、Docker **Docker 不是必须的，k8s 1.24.0 开始使用 Containerd 替代 Docker，但还是推荐安装 Docker，原因：在k8s中构建Docker镜像时使用，需要在GitLab Runner 中配置如下，详情参见：** - [GitLab Runner、kubernetes（k8s）配置](/gitlab-runner/k8s-configuration.md) + [GitLab Runner、kubernetes（k8s）配置](/docs/gitlab-runner/k8s-configuration.md) ```shell [[runners]] diff --git a/k8s/containerd-mirrors.md b/docs/k8s/containerd-mirrors.md similarity index 99% rename from k8s/containerd-mirrors.md rename to docs/k8s/containerd-mirrors.md index 3b75a5a8f65840a08f23c6ca0f6111e29179e4dc..39b1dd518419f00bfaa1f15c37f846c0a3a09aad 100644 --- a/k8s/containerd-mirrors.md +++ b/docs/k8s/containerd-mirrors.md @@ -1,3 +1,7 @@ +--- +sidebar_position: 7 +--- + # Containerd 镜像配置 ## 说明 diff --git a/k8s/containerd-rm.md b/docs/k8s/containerd-rm.md similarity index 98% rename from k8s/containerd-rm.md rename to docs/k8s/containerd-rm.md index 69160dca650e4f7aa9f7d3bd30f2fc73e9259087..4594f449a701e36e75ab887b7323dce0628d97d2 100644 --- a/k8s/containerd-rm.md +++ b/docs/k8s/containerd-rm.md @@ -1,3 +1,7 @@ +--- +sidebar_position: 8 +--- + # 批量删除 k8s（ctr）使用的历史镜像 ## 说明 diff --git a/k8s/ingress-install.md b/docs/k8s/ingress-install.md similarity index 99% rename from k8s/ingress-install.md rename to docs/k8s/ingress-install.md index 48b2b487aacf5bdec3dd4919f98bd2a55be9f402..6d9a5de0ce73edab75b5d3d0cfe9262586c57ff3 100644 --- a/k8s/ingress-install.md +++ b/docs/k8s/ingress-install.md @@ -1,3 +1,7 @@ +--- +sidebar_position: 6 +--- + # Ingress 安装 ## 说明 diff --git a/k8s/kube-prometheus-install.md b/docs/k8s/kube-prometheus-install.md similarity index 99% rename from k8s/kube-prometheus-install.md rename to docs/k8s/kube-prometheus-install.md index 739c58035f2db0e977abab865dd16b32c7a7404f..62cac024157692d10fe1c8613934958f7274ecf2 100644 --- a/k8s/kube-prometheus-install.md +++ b/docs/k8s/kube-prometheus-install.md @@ -1,3 +1,7 @@ +--- +sidebar_position: 3 +--- + # Kube Prometheus 普罗米修斯 安装 ## 说明 diff --git a/k8s/metrics-server-install.md b/docs/k8s/metrics-server-install.md similarity index 99% rename from k8s/metrics-server-install.md rename to docs/k8s/metrics-server-install.md index f8186489cc9199f70e02a6b79ccc82b418eaf812..28b57bff26ccb2c52147d5797a1cb50b844c0450 100644 --- a/k8s/metrics-server-install.md +++ b/docs/k8s/metrics-server-install.md @@ -1,3 +1,7 @@ +--- +sidebar_position: 2 +--- + # Metrics Server 安装 ## 说明 diff --git a/k8s/pod-deployment-service.md b/docs/k8s/pod-deployment-service.md similarity index 99% rename from k8s/pod-deployment-service.md rename to docs/k8s/pod-deployment-service.md index d70435bd681422d9e3a12bb80884e3d3e65e81a4..08907f4702fb8fbe543ce9aaaa938e2415feed03 100644 --- a/k8s/pod-deployment-service.md +++ b/docs/k8s/pod-deployment-service.md @@ -1,3 +1,7 @@ +--- +sidebar_position: 5 +--- + # Pod、Deployment、Service（未完成） ## 说明 diff --git a/k8s/probe-configuration.md b/docs/k8s/probe-configuration.md similarity index 99% rename from k8s/probe-configuration.md rename to docs/k8s/probe-configuration.md index 7c042658d669fd370fe0b9981a0bb10e59d697f7..469c8933c292debafaa27801993b354b4100ba01 100644 --- a/k8s/probe-configuration.md +++ b/docs/k8s/probe-configuration.md @@ -1,3 +1,7 @@ +--- +sidebar_position: 4 +--- + # kubernetes（k8s）探针 配置 ## 说明 diff --git a/k8s/static/ingress-install-1.png b/docs/k8s/static/ingress-install-1.png similarity index 100% rename from k8s/static/ingress-install-1.png rename to docs/k8s/static/ingress-install-1.png diff --git a/k8s/static/ingress-install-2.png b/docs/k8s/static/ingress-install-2.png similarity index 100% rename from k8s/static/ingress-install-2.png rename to docs/k8s/static/ingress-install-2.png diff --git a/k8s/static/kube-prometheus-install-01.png b/docs/k8s/static/kube-prometheus-install-01.png similarity index 100% rename from k8s/static/kube-prometheus-install-01.png rename to docs/k8s/static/kube-prometheus-install-01.png diff --git a/k8s/static/kube-prometheus-install-02.png b/docs/k8s/static/kube-prometheus-install-02.png similarity index 100% rename from k8s/static/kube-prometheus-install-02.png rename to docs/k8s/static/kube-prometheus-install-02.png diff --git a/k8s/static/kube-prometheus-install-03.png b/docs/k8s/static/kube-prometheus-install-03.png similarity index 100% rename from k8s/static/kube-prometheus-install-03.png rename to docs/k8s/static/kube-prometheus-install-03.png diff --git a/k8s/static/kube-prometheus-install-04.png b/docs/k8s/static/kube-prometheus-install-04.png similarity index 100% rename from k8s/static/kube-prometheus-install-04.png rename to docs/k8s/static/kube-prometheus-install-04.png diff --git a/k8s/static/kube-prometheus-install-05.png b/docs/k8s/static/kube-prometheus-install-05.png similarity index 100% rename from k8s/static/kube-prometheus-install-05.png rename to docs/k8s/static/kube-prometheus-install-05.png diff --git a/k8s/static/kube-prometheus-install-06.png b/docs/k8s/static/kube-prometheus-install-06.png similarity index 100% rename from k8s/static/kube-prometheus-install-06.png rename to docs/k8s/static/kube-prometheus-install-06.png diff --git a/k8s/static/kube-prometheus-install-07.png b/docs/k8s/static/kube-prometheus-install-07.png similarity index 100% rename from k8s/static/kube-prometheus-install-07.png rename to docs/k8s/static/kube-prometheus-install-07.png diff --git a/k8s/static/kube-prometheus-install-08.png b/docs/k8s/static/kube-prometheus-install-08.png similarity index 100% rename from k8s/static/kube-prometheus-install-08.png rename to docs/k8s/static/kube-prometheus-install-08.png diff --git a/k8s/static/kube-prometheus-install-09.png b/docs/k8s/static/kube-prometheus-install-09.png similarity index 100% rename from k8s/static/kube-prometheus-install-09.png rename to docs/k8s/static/kube-prometheus-install-09.png diff --git a/k8s/static/kube-prometheus-install-10.png b/docs/k8s/static/kube-prometheus-install-10.png similarity index 100% rename from k8s/static/kube-prometheus-install-10.png rename to docs/k8s/static/kube-prometheus-install-10.png diff --git a/k8s/static/kube-prometheus-install-11.png b/docs/k8s/static/kube-prometheus-install-11.png similarity index 100% rename from k8s/static/kube-prometheus-install-11.png rename to docs/k8s/static/kube-prometheus-install-11.png diff --git a/k8s/static/kube-prometheus-install-12.png b/docs/k8s/static/kube-prometheus-install-12.png similarity index 100% rename from k8s/static/kube-prometheus-install-12.png rename to docs/k8s/static/kube-prometheus-install-12.png diff --git a/k8s/static/kube-prometheus-install-13.png b/docs/k8s/static/kube-prometheus-install-13.png similarity index 100% rename from k8s/static/kube-prometheus-install-13.png rename to docs/k8s/static/kube-prometheus-install-13.png diff --git a/k8s/static/kube-prometheus-install-14.png b/docs/k8s/static/kube-prometheus-install-14.png similarity index 100% rename from k8s/static/kube-prometheus-install-14.png rename to docs/k8s/static/kube-prometheus-install-14.png diff --git a/k8s/static/kube-prometheus-install-15.png b/docs/k8s/static/kube-prometheus-install-15.png similarity index 100% rename from k8s/static/kube-prometheus-install-15.png rename to docs/k8s/static/kube-prometheus-install-15.png diff --git a/k8s/static/kube-prometheus-install-16.png b/docs/k8s/static/kube-prometheus-install-16.png similarity index 100% rename from k8s/static/kube-prometheus-install-16.png rename to docs/k8s/static/kube-prometheus-install-16.png diff --git a/k8s/static/kube-prometheus-install-17.png b/docs/k8s/static/kube-prometheus-install-17.png similarity index 100% rename from k8s/static/kube-prometheus-install-17.png rename to docs/k8s/static/kube-prometheus-install-17.png diff --git a/k8s/static/kube-prometheus-install-18.png b/docs/k8s/static/kube-prometheus-install-18.png similarity index 100% rename from k8s/static/kube-prometheus-install-18.png rename to docs/k8s/static/kube-prometheus-install-18.png diff --git a/k8s/static/kube-prometheus-install-19.png b/docs/k8s/static/kube-prometheus-install-19.png similarity index 100% rename from k8s/static/kube-prometheus-install-19.png rename to docs/k8s/static/kube-prometheus-install-19.png diff --git a/nexus/apt-repository.md b/docs/nexus/apt-repository.md similarity index 100% rename from nexus/apt-repository.md rename to docs/nexus/apt-repository.md diff --git a/nexus/docker-https-configuration.md b/docs/nexus/docker-https-configuration.md similarity index 99% rename from nexus/docker-https-configuration.md rename to docs/nexus/docker-https-configuration.md index 04d79a2a8f6fa8b7ad33ddfc4d25b0a3fb2ce1b5..6cd5e24158b7d866210328333d6e9a03d0fd5385 100644 --- a/nexus/docker-https-configuration.md +++ b/docs/nexus/docker-https-configuration.md @@ -130,7 +130,7 @@ 无法验证的情况** 2. **如果使用Nginx代理Nexus，在配置Nginx中SSL时，需要 .crt、.key 证书** 3. **如果使用配置Nexus中SSL时，需要 .jks 证书** - 4. [GitLab https 配置](/gitlab/https-configuration.md) 中的证书申请 + 4. [GitLab https 配置](/docs/gitlab/https-configuration.md) 中的证书申请 （内涵颁布给域名、IP，证书类型为：**.crt、.key**） 5. 本文上方的生成域名的类型为：**.jks** diff --git a/nexus/docker-install-nexus.md b/docs/nexus/docker-install-nexus.md similarity index 98% rename from nexus/docker-install-nexus.md rename to docs/nexus/docker-install-nexus.md index 9cea90213803e88157fc3963a040a74d95de6056..64775fed2e4cdc8b4afd27e73cc69cca5fff6696 100644 --- a/nexus/docker-install-nexus.md +++ b/docs/nexus/docker-install-nexus.md @@ -4,7 +4,7 @@ 1. [https://hub.docker.com/r/sonatype/nexus3](https://hub.docker.com/r/sonatype/nexus3) 2. Docker 安装 - 1. [CentOS 安装 Docker](/docker/centos-install.md) + 1. [CentOS 安装 Docker](/docs/docker/centos-install.md) ## 安装 diff --git a/nexus/docker-repository.md b/docs/nexus/docker-repository.md similarity index 97% rename from nexus/docker-repository.md rename to docs/nexus/docker-repository.md index e3cd6027f28ee9d70402e48b105065cf0ba19993..0e728bded62e66a3850a1885863ce9bc1f27db6b 100644 --- a/nexus/docker-repository.md +++ b/docs/nexus/docker-repository.md @@ -40,7 +40,7 @@ 7. 拉取镜像（使用域名） 如果出现 Error response from daemon: Get "[https://nexus.example.com:8000/v2/":](https://nexus.example.com:8000/v2/":) x509: certificate signed by unknown - authority，请参考 [私库搭建2：Nexus 配置 Docker 版 https](/nexus/docker-https-configuration.md) 进行证书信任 + authority，请参考 [私库搭建2：Nexus 配置 Docker 版 https](/docs/nexusnexus/docker-https-configuration.md) 进行证书信任 ```shell docker pull nexus.example.com:8000/library/maven:3.6.3-jdk-8 diff --git a/nexus/maven-repository.md b/docs/nexus/maven-repository.md similarity index 88% rename from nexus/maven-repository.md rename to docs/nexus/maven-repository.md index 91a0f7767d257bd9dbde029bea1b6234eaa45b2a..349e6fc0624c7223002a5618ed02320039cab1ae 100644 --- a/nexus/maven-repository.md +++ b/docs/nexus/maven-repository.md @@ -24,7 +24,7 @@ 6. 使用代理仓库下载依赖 - 使用方式参见：[私库搭建3：Maven 私库](/nexus/use-maven-repository.md) + 使用方式参见：[私库搭建3：Maven 私库](/docs/nexusnexus/use-maven-repository.md) ![image.png](static/maven-repository-6.png) diff --git a/nexus/npm-repository.md b/docs/nexus/npm-repository.md similarity index 100% rename from nexus/npm-repository.md rename to docs/nexus/npm-repository.md diff --git a/nexus/s3-blob-stores.md b/docs/nexus/s3-blob-stores.md similarity index 93% rename from nexus/s3-blob-stores.md rename to docs/nexus/s3-blob-stores.md index 9ca519ed70dd017b7c7e5c4f9ddc1675592c53e9..db4e21a048082aa969fa586e46e571cad00df3ff 100644 --- a/nexus/s3-blob-stores.md +++ b/docs/nexus/s3-blob-stores.md @@ -2,7 +2,7 @@ ## 说明 -1. [GitLab Runner Cache 配置 S3（MinIO）](/gitlab-runner/cache-s3-configuration.md) +1. [GitLab Runner Cache 配置 S3（MinIO）](/docs/gitlab-runner/cache-s3-configuration.md) 2. 并不是非要使用 S3 来配置 Blob Stores 才行，学习时可以直接使用 File。S3 储存的好处在于方便迁移、容灾、备份等等。阿里、腾讯等对象存储均支持 S3 协议，故可将 Nexus 与云厂商的对象存储或自己搭建S3结合使用，提高数据可靠性、安全性。 3. 阿里云 OSS 对象储存作者未能完成配置（2023-06-29） diff --git a/nexus/static/apt-repository-1.png b/docs/nexus/static/apt-repository-1.png similarity index 100% rename from nexus/static/apt-repository-1.png rename to docs/nexus/static/apt-repository-1.png diff --git a/nexus/static/apt-repository-2.png b/docs/nexus/static/apt-repository-2.png similarity index 100% rename from nexus/static/apt-repository-2.png rename to docs/nexus/static/apt-repository-2.png diff --git a/nexus/static/apt-repository-3.png b/docs/nexus/static/apt-repository-3.png similarity index 100% rename from nexus/static/apt-repository-3.png rename to docs/nexus/static/apt-repository-3.png diff --git a/nexus/static/docker-https-configuration-1.png b/docs/nexus/static/docker-https-configuration-1.png similarity index 100% rename from nexus/static/docker-https-configuration-1.png rename to docs/nexus/static/docker-https-configuration-1.png diff --git a/nexus/static/docker-repository-1.png b/docs/nexus/static/docker-repository-1.png similarity index 100% rename from nexus/static/docker-repository-1.png rename to docs/nexus/static/docker-repository-1.png diff --git a/nexus/static/docker-repository-2.png b/docs/nexus/static/docker-repository-2.png similarity index 100% rename from nexus/static/docker-repository-2.png rename to docs/nexus/static/docker-repository-2.png diff --git a/nexus/static/docker-repository-3.png b/docs/nexus/static/docker-repository-3.png similarity index 100% rename from nexus/static/docker-repository-3.png rename to docs/nexus/static/docker-repository-3.png diff --git a/nexus/static/docker-repository-4.png b/docs/nexus/static/docker-repository-4.png similarity index 100% rename from nexus/static/docker-repository-4.png rename to docs/nexus/static/docker-repository-4.png diff --git a/nexus/static/docker-repository-5.png b/docs/nexus/static/docker-repository-5.png similarity index 100% rename from nexus/static/docker-repository-5.png rename to docs/nexus/static/docker-repository-5.png diff --git a/nexus/static/docker-repository-6.png b/docs/nexus/static/docker-repository-6.png similarity index 100% rename from nexus/static/docker-repository-6.png rename to docs/nexus/static/docker-repository-6.png diff --git a/nexus/static/docker-repository-7.png b/docs/nexus/static/docker-repository-7.png similarity index 100% rename from nexus/static/docker-repository-7.png rename to docs/nexus/static/docker-repository-7.png diff --git a/nexus/static/docker-repository-8.png b/docs/nexus/static/docker-repository-8.png similarity index 100% rename from nexus/static/docker-repository-8.png rename to docs/nexus/static/docker-repository-8.png diff --git a/nexus/static/docker-repository-9.png b/docs/nexus/static/docker-repository-9.png similarity index 100% rename from nexus/static/docker-repository-9.png rename to docs/nexus/static/docker-repository-9.png diff --git a/nexus/static/maven-repository-1.png b/docs/nexus/static/maven-repository-1.png similarity index 100% rename from nexus/static/maven-repository-1.png rename to docs/nexus/static/maven-repository-1.png diff --git a/nexus/static/maven-repository-2.png b/docs/nexus/static/maven-repository-2.png similarity index 100% rename from nexus/static/maven-repository-2.png rename to docs/nexus/static/maven-repository-2.png diff --git a/nexus/static/maven-repository-3.png b/docs/nexus/static/maven-repository-3.png similarity index 100% rename from nexus/static/maven-repository-3.png rename to docs/nexus/static/maven-repository-3.png diff --git a/nexus/static/maven-repository-4.png b/docs/nexus/static/maven-repository-4.png similarity index 100% rename from nexus/static/maven-repository-4.png rename to docs/nexus/static/maven-repository-4.png diff --git a/nexus/static/maven-repository-5.png b/docs/nexus/static/maven-repository-5.png similarity index 100% rename from nexus/static/maven-repository-5.png rename to docs/nexus/static/maven-repository-5.png diff --git a/nexus/static/maven-repository-6.png b/docs/nexus/static/maven-repository-6.png similarity index 100% rename from nexus/static/maven-repository-6.png rename to docs/nexus/static/maven-repository-6.png diff --git a/nexus/static/maven-repository-7.png b/docs/nexus/static/maven-repository-7.png similarity index 100% rename from nexus/static/maven-repository-7.png rename to docs/nexus/static/maven-repository-7.png diff --git a/nexus/static/maven-repository-8.png b/docs/nexus/static/maven-repository-8.png similarity index 100% rename from nexus/static/maven-repository-8.png rename to docs/nexus/static/maven-repository-8.png diff --git a/nexus/static/s3-blob-stores-1.png b/docs/nexus/static/s3-blob-stores-1.png similarity index 100% rename from nexus/static/s3-blob-stores-1.png rename to docs/nexus/static/s3-blob-stores-1.png diff --git a/nexus/static/s3-blob-stores-2.png b/docs/nexus/static/s3-blob-stores-2.png similarity index 100% rename from nexus/static/s3-blob-stores-2.png rename to docs/nexus/static/s3-blob-stores-2.png diff --git a/nexus/static/s3-blob-stores-3.png b/docs/nexus/static/s3-blob-stores-3.png similarity index 100% rename from nexus/static/s3-blob-stores-3.png rename to docs/nexus/static/s3-blob-stores-3.png diff --git a/nexus/static/s3-blob-stores-4.png b/docs/nexus/static/s3-blob-stores-4.png similarity index 100% rename from nexus/static/s3-blob-stores-4.png rename to docs/nexus/static/s3-blob-stores-4.png diff --git a/nexus/static/s3-blob-stores-5.png b/docs/nexus/static/s3-blob-stores-5.png similarity index 100% rename from nexus/static/s3-blob-stores-5.png rename to docs/nexus/static/s3-blob-stores-5.png diff --git a/nexus/static/s3-blob-stores-6.png b/docs/nexus/static/s3-blob-stores-6.png similarity index 100% rename from nexus/static/s3-blob-stores-6.png rename to docs/nexus/static/s3-blob-stores-6.png diff --git a/nexus/static/s3-blob-stores-7.png b/docs/nexus/static/s3-blob-stores-7.png similarity index 100% rename from nexus/static/s3-blob-stores-7.png rename to docs/nexus/static/s3-blob-stores-7.png diff --git a/nexus/static/use-maven-repository-01.png b/docs/nexus/static/use-maven-repository-01.png similarity index 100% rename from nexus/static/use-maven-repository-01.png rename to docs/nexus/static/use-maven-repository-01.png diff --git a/nexus/static/use-maven-repository-02.png b/docs/nexus/static/use-maven-repository-02.png similarity index 100% rename from nexus/static/use-maven-repository-02.png rename to docs/nexus/static/use-maven-repository-02.png diff --git a/nexus/static/use-maven-repository-03.png b/docs/nexus/static/use-maven-repository-03.png similarity index 100% rename from nexus/static/use-maven-repository-03.png rename to docs/nexus/static/use-maven-repository-03.png diff --git a/nexus/static/use-maven-repository-04.png b/docs/nexus/static/use-maven-repository-04.png similarity index 100% rename from nexus/static/use-maven-repository-04.png rename to docs/nexus/static/use-maven-repository-04.png diff --git a/nexus/static/use-maven-repository-05.png b/docs/nexus/static/use-maven-repository-05.png similarity index 100% rename from nexus/static/use-maven-repository-05.png rename to docs/nexus/static/use-maven-repository-05.png diff --git a/nexus/static/use-maven-repository-06.png b/docs/nexus/static/use-maven-repository-06.png similarity index 100% rename from nexus/static/use-maven-repository-06.png rename to docs/nexus/static/use-maven-repository-06.png diff --git a/nexus/static/use-maven-repository-07.png b/docs/nexus/static/use-maven-repository-07.png similarity index 100% rename from nexus/static/use-maven-repository-07.png rename to docs/nexus/static/use-maven-repository-07.png diff --git a/nexus/static/use-maven-repository-08.png b/docs/nexus/static/use-maven-repository-08.png similarity index 100% rename from nexus/static/use-maven-repository-08.png rename to docs/nexus/static/use-maven-repository-08.png diff --git a/nexus/static/use-maven-repository-09.png b/docs/nexus/static/use-maven-repository-09.png similarity index 100% rename from nexus/static/use-maven-repository-09.png rename to docs/nexus/static/use-maven-repository-09.png diff --git a/nexus/static/use-maven-repository-10.png b/docs/nexus/static/use-maven-repository-10.png similarity index 100% rename from nexus/static/use-maven-repository-10.png rename to docs/nexus/static/use-maven-repository-10.png diff --git a/nexus/static/use-maven-repository-11.png b/docs/nexus/static/use-maven-repository-11.png similarity index 100% rename from nexus/static/use-maven-repository-11.png rename to docs/nexus/static/use-maven-repository-11.png diff --git a/nexus/static/use-maven-repository-12.png b/docs/nexus/static/use-maven-repository-12.png similarity index 100% rename from nexus/static/use-maven-repository-12.png rename to docs/nexus/static/use-maven-repository-12.png diff --git a/nexus/static/use-maven-repository-13.png b/docs/nexus/static/use-maven-repository-13.png similarity index 100% rename from nexus/static/use-maven-repository-13.png rename to docs/nexus/static/use-maven-repository-13.png diff --git a/nexus/static/use-maven-repository-14.png b/docs/nexus/static/use-maven-repository-14.png similarity index 100% rename from nexus/static/use-maven-repository-14.png rename to docs/nexus/static/use-maven-repository-14.png diff --git a/nexus/static/use-maven-repository-15.png b/docs/nexus/static/use-maven-repository-15.png similarity index 100% rename from nexus/static/use-maven-repository-15.png rename to docs/nexus/static/use-maven-repository-15.png diff --git a/nexus/static/use-maven-repository-16.png b/docs/nexus/static/use-maven-repository-16.png similarity index 100% rename from nexus/static/use-maven-repository-16.png rename to docs/nexus/static/use-maven-repository-16.png diff --git a/nexus/static/yum-repository-1.png b/docs/nexus/static/yum-repository-1.png similarity index 100% rename from nexus/static/yum-repository-1.png rename to docs/nexus/static/yum-repository-1.png diff --git a/nexus/static/yum-repository-2.png b/docs/nexus/static/yum-repository-2.png similarity index 100% rename from nexus/static/yum-repository-2.png rename to docs/nexus/static/yum-repository-2.png diff --git a/nexus/static/yum-repository-3.png b/docs/nexus/static/yum-repository-3.png similarity index 100% rename from nexus/static/yum-repository-3.png rename to docs/nexus/static/yum-repository-3.png diff --git a/nexus/static/yum-repository-4.png b/docs/nexus/static/yum-repository-4.png similarity index 100% rename from nexus/static/yum-repository-4.png rename to docs/nexus/static/yum-repository-4.png diff --git a/nexus/static/yum-repository-5.png b/docs/nexus/static/yum-repository-5.png similarity index 100% rename from nexus/static/yum-repository-5.png rename to docs/nexus/static/yum-repository-5.png diff --git a/nexus/static/yum-repository-6.png b/docs/nexus/static/yum-repository-6.png similarity index 100% rename from nexus/static/yum-repository-6.png rename to docs/nexus/static/yum-repository-6.png diff --git a/nexus/static/yum-repository-7.png b/docs/nexus/static/yum-repository-7.png similarity index 100% rename from nexus/static/yum-repository-7.png rename to docs/nexus/static/yum-repository-7.png diff --git a/nexus/use-maven-repository.md b/docs/nexus/use-maven-repository.md similarity index 100% rename from nexus/use-maven-repository.md rename to docs/nexus/use-maven-repository.md diff --git a/nexus/yum-repository.md b/docs/nexus/yum-repository.md similarity index 100% rename from nexus/yum-repository.md rename to docs/nexus/yum-repository.md diff --git a/docs/tutorial-basics/_category_.json b/docs/tutorial-basics/_category_.json index 2e6db55b1eb61147f3aef1965dbdd79fdd505406..eaebe02a8efb5334aa56677e14be289c0d40f266 100644 --- a/docs/tutorial-basics/_category_.json +++ b/docs/tutorial-basics/_category_.json @@ -1,6 +1,6 @@ { "label": "Tutorial - Basics", - "position": 2, + "position": 902, "link": { "type": "generated-index", "description": "5 minutes to learn the most important Docusaurus concepts." diff --git a/docs/tutorial-extras/_category_.json b/docs/tutorial-extras/_category_.json index a8ffcc19300ec5973db4c87090a2bc9e5cf73aa0..0551c8078a523e4f6c2648a1f3265cef83b6f338 100644 --- a/docs/tutorial-extras/_category_.json +++ b/docs/tutorial-extras/_category_.json @@ -1,6 +1,6 @@ { "label": "Tutorial - Extras", - "position": 3, + "position": 903, "link": { "type": "generated-index" } diff --git a/docs/tutorial-extras/img/docsVersionDropdown.png b/docs/tutorial-extras/img/docsVersionDropdown.png index 97e4164618b5f8beda34cfa699720aba0ad2e342..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 Binary files a/docs/tutorial-extras/img/docsVersionDropdown.png and b/docs/tutorial-extras/img/docsVersionDropdown.png differ diff --git a/docs/tutorial-extras/img/localeDropdown.png b/docs/tutorial-extras/img/localeDropdown.png index e257edc1f932985396bf59584c7ccfaddf955779..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 Binary files a/docs/tutorial-extras/img/localeDropdown.png and b/docs/tutorial-extras/img/localeDropdown.png differ diff --git a/docusaurus.config.js b/docusaurus.config.js index 3f1189038b88cb50907ebe606d684d10d43505bb..a5fbbce7e6add27d40404b20158ed48efdef4e66 100644 --- a/docusaurus.config.js +++ b/docusaurus.config.js @@ -7,7 +7,7 @@ const darkCodeTheme = require('prism-react-renderer/themes/dracula'); /** @type {import('@docusaurus/types').Config} */ const config = { title: 'GitLab/Kubernetes 知识库', - tagline: 'Dinosaurs are cool', + tagline: '为简化开发工作、提高生产率、解决常见问题而生', favicon: 'img/favicon.ico', // Set the production url of your site here diff --git a/gitlab/object-store/backup_upload-configuration.md b/gitlab/object-store/backup_upload-configuration.md deleted file mode 100644 index 998ec916823b81f19ca39b3975e33cf0da0dc0dd..0000000000000000000000000000000000000000 --- a/gitlab/object-store/backup_upload-configuration.md +++ /dev/null @@ -1 +0,0 @@ -# GitLab backup_upload 使用对象储存 S3（MinIO）（未完成） diff --git a/gitlab/object-store/ci_secure_files-configuration.md b/gitlab/object-store/ci_secure_files-configuration.md deleted file mode 100644 index 5967292557184c36560877857c29f89c71df4529..0000000000000000000000000000000000000000 --- a/gitlab/object-store/ci_secure_files-configuration.md +++ /dev/null @@ -1 +0,0 @@ -# GitLab ci_secure_files 使用对象储存 S3（MinIO）（未完成） diff --git a/gitlab/object-store/external_diffs-configuration.md b/gitlab/object-store/external_diffs-configuration.md deleted file mode 100644 index 59baf0a0082ed8c8c5fbd6d4f14b1ec48d32317e..0000000000000000000000000000000000000000 --- a/gitlab/object-store/external_diffs-configuration.md +++ /dev/null @@ -1,6 +0,0 @@ -# GitLab external_diffs 使用对象储存 S3（MinIO）（未完成） - -## 文档 - -1. [合并请求差异存储](https://docs.gitlab.cn/jh/administration/merge_request_diffs.html) - diff --git a/offline/centos-7-gitlab-install.md b/offline/centos-7-gitlab-install.md index dbe39b40d45d73866db522e2127f0f2af989e2cb..7c08ce3ab8ca06ae16a4c43a398b75d90a9b6673 100644 --- a/offline/centos-7-gitlab-install.md +++ b/offline/centos-7-gitlab-install.md @@ -8,7 +8,7 @@ 3. 本文以 CentOS 7.9 最小化安装，gitlab-ee 最新版为例（其他 CentOS、gitlab 版本类似） -4. yum 包准备：可通过查阅 [CentOS 7 中安装 GitLab](/gitlab/centos-7.9-install.md) +4. yum 包准备：可通过查阅 [CentOS 7 中安装 GitLab](/docs/gitlab/centos-7.9-install.md) 文中的 `yum install ***` 命令在后面添加 `--downloadonly --downloaddir=./下载的文件夹` 下载到指定文件夹中获取。 diff --git a/offline/centos-k8s-install.md b/offline/centos-k8s-install.md index 9dd930dc291f1c2f6f6807ff36c8bd289508c7ac..7fd0f5a269bcc5b04b452e9b4b508bfeabfd4dbd 100644 --- a/offline/centos-k8s-install.md +++ b/offline/centos-k8s-install.md @@ -5,9 +5,9 @@ 1. 本文以 CentOS 7.9 最小化安装、kubernetes（k8s）1.25.3 为例（其他 CentOS、k8s 版本类似），离线包（免费下载）：[https://download.csdn.net/download/qq_32596527/87127488](https://download.csdn.net/download/qq_32596527/87127488)。 2. 如果没有在有网的环境下安装 kubernetes（k8s）成功过，也不影响本文离线安装的阅读与学习。 -3. yum 包准备：可通过查阅 [kubernetes（k8s）安装](/k8s/centos-install.md) +3. yum 包准备：可通过查阅 [kubernetes（k8s）安装](/docs/k8s/centos-install.md) 文中的 `yum install ***` 命令在后面添加 `--downloadonly --downloaddir=./下载的文件夹` 下载到指定文件夹中获取，或者使用作者提供安装包。 -4. Docker 镜像准备：可通过学习 [kubernetes（k8s）安装](/k8s/centos-install.md) +4. Docker 镜像准备：可通过学习 [kubernetes（k8s）安装](/docs/k8s/centos-install.md) 安装成功后，使用命令 `ctr -n=k8s.io image list` 查询 k8s 安装成功后，当前使用的 Docker 镜像，使用命令 `ctr -n=k8s.io image export 导出Docker镜像到磁盘的文件名 Docker镜像名` 5. Docer 镜像导入：`ctr -n=k8s.io image import Docker镜像导出到磁盘的文件名 Docker镜像名` @@ -176,7 +176,7 @@ Docker 镜像就可 不同 calico 支持的 k8s 版本不同，请查看 calico 与 k8s - 版本的对应关系：[kubernetes（k8s）安装](/k8s/centos-install.md) + 版本的对应关系：[kubernetes（k8s）安装](/docs/k8s/centos-install.md) 1. [GitHub](https://github.com/projectcalico/calico/blob/v3.24.5/manifests/calico.yaml) 2. [GitCode](https://gitcode.net/mirrors/projectcalico/calico/-/blob/v3.24.5/manifests/calico.yaml) @@ -470,5 +470,5 @@ kubectl get nodes -o wide ``` -15. 关于去污、创建实例、其他命令，参见 [kubernetes（k8s）安装](/k8s/centos-install.md) +15. 关于去污、创建实例、其他命令，参见 [kubernetes（k8s）安装](/docs/k8s/centos-install.md) diff --git a/offline/ubuntu-gitlab-install.md b/offline/ubuntu-gitlab-install.md index 196d7c2d018f678e5bdcc4dfb387f956047a5ad0..bd58375671fe4865f9d60415ce3797025a06df5a 100644 --- a/offline/ubuntu-gitlab-install.md +++ b/offline/ubuntu-gitlab-install.md @@ -8,7 +8,7 @@ 2. 系统安装时，全称无互联网网络，即：未更新。 3. 本文使用虚拟机操作。 4. 本文使用的 gitlab 域名为：[http://gitlab.example.com](http://gitlab.example.com) - 5. 本文以 gitlab-ee 企业版为例（区别参见：[GitLab 导读](/guide/gitlab.md)），会安装两遍 + 5. 本文以 gitlab-ee 企业版为例（区别参见：[GitLab 导读](/docs/guide/gitlab.md)），会安装两遍 1. 第一遍有网，用于下载依赖、备份依赖、安装测试等 2. 第二遍断网，使用第一遍备份的依赖，进行安装 diff --git a/src/pages/index.tsx b/src/pages/index.tsx index 305139fba009239529992c2cd0d7949b57fd9efe..c3ee8025c56808b196ad34757ebea3b043dff388 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -18,7 +18,7 @@ function HomepageHeader() { - Docusaurus Tutorial - 5min ⏱️ + 文档简介