From 6da76ba9a63b6e441c398366011e885bcfff2226 Mon Sep 17 00:00:00 2001 From: Evawudonger Date: Wed, 10 Sep 2025 12:06:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=93=BE=E6=8E=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../public_sys-resources/icon-note.gif | Bin 394 -> 0 bytes .../{isulad+k8s => isulad_k8s}/_toc.yaml | 24 +- .../figures/1.view-required-images.png | Bin ...1\347\233\256\345\220\215\347\247\260.jpg" | Bin ....\350\256\276\347\275\256-cicd-runner.png" | Bin ...0\344\270\216\344\273\244\347\211\214.jpg" | Bin .../figures/13.view-cert-config.png | Bin .../figures/14.import-cert.png | Bin .../figures/15.register-gitlab-runner.jpg | Bin ...45\267\262\345\212\240\345\205\245_LI.jpg" | Bin .../{isulad+k8s => isulad_k8s}/figures/17.png | Bin .../figures/18.dns-config.png | Bin .../19.CICD\347\225\214\351\235\242.png" | Bin .../2.calico\351\205\215\347\275\256.png" | Bin .../figures/20.yaml.png | Bin ...4\347\272\277\347\212\266\346\200\201.png" | Bin .../{isulad+k8s => isulad_k8s}/figures/3.png | Bin .../figures/4.gitlab-entrance.jpg | Bin .../figures/5.view-password.jpg | Bin .../figures/6.logged-in.png | Bin .../figures/7.image.png | Bin ...0\345\273\272\351\241\271\347\233\256.png" | Bin ...2\347\231\275\351\241\271\347\233\256.png" | Bin .../gitlab_deploy.md | 622 +++++++------- .../gitlab_runner_deploy.md | 356 ++++---- .../isulad_k8s_environment_deploy.md} | 764 +++++++++--------- .../{isulad+k8s => isulad_k8s}/overview.md | 46 +- .../kubernetes/kubernetes_containerd.md | 2 +- .../public_sys-resources/icon-note.gif | Bin 394 -> 0 bytes .../container_resource_management.md | 2 +- .../installation_configuration.md | 4 +- .../interconnection_with_the_cni_network.md | 4 +- .../installation_and_deployment_2.md | 2 +- .../kuasar/kuasar_install_config.md | 2 +- .../docs/hybrid_deployment/rubik/overview.md | 2 +- .../kubeos/installation_and_deployment.md | 4 +- .../kubeos/public_sys-resources/icon-note.gif | Bin 394 -> 0 bytes .../nestos/nestos/nestos_for_container.md | 36 +- docs/en/docs/nestos/nestos/overview.md | 2 +- .../public_sys-resources/icon-note.gif | Bin 394 -> 0 bytes .../{isulad+k8s => isulad_k8s}/_toc.yaml | 2 +- ...0\350\246\201\351\225\234\345\203\217.png" | Bin ...1\347\233\256\345\220\215\347\247\260.jpg" | Bin ....\350\256\276\347\275\256-cicd-runner.png" | Bin ...0\344\270\216\344\273\244\347\211\214.jpg" | Bin ...5\347\275\256\346\226\207\344\273\266.png" | Bin ...4\345\205\245\346\226\207\344\273\266.png" | Bin ...\346\263\250\345\206\214gitlab-runner.jpg" | Bin ...45\267\262\345\212\240\345\205\245_LI.jpg" | Bin .../{isulad+k8s => isulad_k8s}/figures/17.png | Bin .../18.dns\351\205\215\347\275\256.png" | Bin .../19.CICD\347\225\214\351\235\242.png" | Bin .../2.calico\351\205\215\347\275\256.png" | Bin .../20.yaml\346\226\207\344\273\266.png" | Bin ...4\347\272\277\347\212\266\346\200\201.png" | Bin .../{isulad+k8s => isulad_k8s}/figures/3.png | Bin ...1\351\241\265\345\205\245\345\217\243.jpg" | Bin ...5\350\257\242\345\257\206\347\240\201.jpg" | Bin ...5\345\220\216\351\241\265\351\235\242.png" | Bin .../figures/7.\351\225\234\345\203\217.png" | Bin ...0\345\273\272\351\241\271\347\233\256.png" | Bin ...2\347\231\275\351\241\271\347\233\256.png" | Bin .../gitlab_deploy.md | 0 .../gitlab_runner_deploy.md | 0 .../isulad_k8s_environment_deploy.md} | 0 .../{isulad+k8s => isulad_k8s}/overview.md | 0 .../cluster_deployment/kubernetes/_toc.yaml | 5 +- ...eploying_a_kubernetes_cluster_manually.md} | 0 ...containerd.md => kubernetes_containerd.md} | 2 +- .../docker_engine/container_management_1.md | 2 +- .../installation_and_configuration_3.md | 2 +- .../docs/container_runtime/kuasar/_toc.yaml | 2 +- ...nfidential_containers_deployment_guide.md} | 0 .../kuasar/kuasar_install_config.md | 2 +- .../rubik/feature_introduction.md | 14 +- .../docs/hybrid_deployment/rubik/overview.md | 24 +- .../kubeos/installation_and_deployment.md | 4 +- .../kubeos/kubeos/kubeos_image_creation.md | 8 +- .../docs/kubeos/kubeos/usage_instructions.md | 6 +- docs/zh/docs/nestos/nestos/overview.md | 2 +- 80 files changed, 973 insertions(+), 974 deletions(-) delete mode 100644 docs/en/docs/cluster_deployment/isulad+k8s/figures/public_sys-resources/icon-note.gif rename docs/en/docs/cluster_deployment/{isulad+k8s => isulad_k8s}/_toc.yaml (87%) rename docs/en/docs/cluster_deployment/{isulad+k8s => isulad_k8s}/figures/1.view-required-images.png (100%) rename "docs/en/docs/cluster_deployment/isulad+k8s/figures/10.\350\207\252\345\256\232\344\271\211\351\241\271\347\233\256\345\220\215\347\247\260.jpg" => "docs/en/docs/cluster_deployment/isulad_k8s/figures/10.\350\207\252\345\256\232\344\271\211\351\241\271\347\233\256\345\220\215\347\247\260.jpg" (100%) rename "docs/en/docs/cluster_deployment/isulad+k8s/figures/11.\350\256\276\347\275\256-cicd-runner.png" => "docs/en/docs/cluster_deployment/isulad_k8s/figures/11.\350\256\276\347\275\256-cicd-runner.png" (100%) rename "docs/en/docs/cluster_deployment/isulad+k8s/figures/12.\350\256\260\344\270\213runner\345\234\260\345\235\200\344\270\216\344\273\244\347\211\214.jpg" => "docs/en/docs/cluster_deployment/isulad_k8s/figures/12.\350\256\260\344\270\213runner\345\234\260\345\235\200\344\270\216\344\273\244\347\211\214.jpg" (100%) rename docs/en/docs/cluster_deployment/{isulad+k8s => isulad_k8s}/figures/13.view-cert-config.png (100%) rename docs/en/docs/cluster_deployment/{isulad+k8s => isulad_k8s}/figures/14.import-cert.png (100%) rename docs/en/docs/cluster_deployment/{isulad+k8s => isulad_k8s}/figures/15.register-gitlab-runner.jpg (100%) rename "docs/en/docs/cluster_deployment/isulad+k8s/figures/16.web\347\253\257\345\267\262\345\212\240\345\205\245_LI.jpg" => "docs/en/docs/cluster_deployment/isulad_k8s/figures/16.web\347\253\257\345\267\262\345\212\240\345\205\245_LI.jpg" (100%) rename docs/en/docs/cluster_deployment/{isulad+k8s => isulad_k8s}/figures/17.png (100%) rename docs/en/docs/cluster_deployment/{isulad+k8s => isulad_k8s}/figures/18.dns-config.png (100%) rename "docs/en/docs/cluster_deployment/isulad+k8s/figures/19.CICD\347\225\214\351\235\242.png" => "docs/en/docs/cluster_deployment/isulad_k8s/figures/19.CICD\347\225\214\351\235\242.png" (100%) rename "docs/en/docs/cluster_deployment/isulad+k8s/figures/2.calico\351\205\215\347\275\256.png" => "docs/en/docs/cluster_deployment/isulad_k8s/figures/2.calico\351\205\215\347\275\256.png" (100%) rename docs/en/docs/cluster_deployment/{isulad+k8s => isulad_k8s}/figures/20.yaml.png (100%) rename "docs/en/docs/cluster_deployment/isulad+k8s/figures/21.\346\265\201\346\260\264\347\272\277\347\212\266\346\200\201.png" => "docs/en/docs/cluster_deployment/isulad_k8s/figures/21.\346\265\201\346\260\264\347\272\277\347\212\266\346\200\201.png" (100%) rename docs/en/docs/cluster_deployment/{isulad+k8s => isulad_k8s}/figures/3.png (100%) rename docs/en/docs/cluster_deployment/{isulad+k8s => isulad_k8s}/figures/4.gitlab-entrance.jpg (100%) rename docs/en/docs/cluster_deployment/{isulad+k8s => isulad_k8s}/figures/5.view-password.jpg (100%) rename docs/en/docs/cluster_deployment/{isulad+k8s => isulad_k8s}/figures/6.logged-in.png (100%) rename docs/en/docs/cluster_deployment/{isulad+k8s => isulad_k8s}/figures/7.image.png (100%) rename "docs/en/docs/cluster_deployment/isulad+k8s/figures/8.\346\226\260\345\273\272\351\241\271\347\233\256.png" => "docs/en/docs/cluster_deployment/isulad_k8s/figures/8.\346\226\260\345\273\272\351\241\271\347\233\256.png" (100%) rename "docs/en/docs/cluster_deployment/isulad+k8s/figures/9.\345\210\233\345\273\272\347\251\272\347\231\275\351\241\271\347\233\256.png" => "docs/en/docs/cluster_deployment/isulad_k8s/figures/9.\345\210\233\345\273\272\347\251\272\347\231\275\351\241\271\347\233\256.png" (100%) rename docs/en/docs/cluster_deployment/{isulad+k8s => isulad_k8s}/gitlab_deploy.md (95%) rename docs/en/docs/cluster_deployment/{isulad+k8s => isulad_k8s}/gitlab_runner_deploy.md (96%) rename docs/en/docs/cluster_deployment/{isulad+k8s/isulad+k8s_environment_deploy.md => isulad_k8s/isulad_k8s_environment_deploy.md} (96%) rename docs/en/docs/cluster_deployment/{isulad+k8s => isulad_k8s}/overview.md (97%) delete mode 100644 docs/en/docs/cluster_deployment/kubernetes/public_sys-resources/icon-note.gif delete mode 100644 docs/en/docs/kubeos/kubeos/public_sys-resources/icon-note.gif delete mode 100644 docs/zh/docs/cluster_deployment/isulad+k8s/figures/public_sys-resources/icon-note.gif rename docs/zh/docs/cluster_deployment/{isulad+k8s => isulad_k8s}/_toc.yaml (88%) rename "docs/zh/docs/cluster_deployment/isulad+k8s/figures/1.\346\237\245\347\234\213\351\234\200\350\246\201\351\225\234\345\203\217.png" => "docs/zh/docs/cluster_deployment/isulad_k8s/figures/1.\346\237\245\347\234\213\351\234\200\350\246\201\351\225\234\345\203\217.png" (100%) rename "docs/zh/docs/cluster_deployment/isulad+k8s/figures/10.\350\207\252\345\256\232\344\271\211\351\241\271\347\233\256\345\220\215\347\247\260.jpg" => "docs/zh/docs/cluster_deployment/isulad_k8s/figures/10.\350\207\252\345\256\232\344\271\211\351\241\271\347\233\256\345\220\215\347\247\260.jpg" (100%) rename "docs/zh/docs/cluster_deployment/isulad+k8s/figures/11.\350\256\276\347\275\256-cicd-runner.png" => "docs/zh/docs/cluster_deployment/isulad_k8s/figures/11.\350\256\276\347\275\256-cicd-runner.png" (100%) rename "docs/zh/docs/cluster_deployment/isulad+k8s/figures/12.\350\256\260\344\270\213runner\345\234\260\345\235\200\344\270\216\344\273\244\347\211\214.jpg" => "docs/zh/docs/cluster_deployment/isulad_k8s/figures/12.\350\256\260\344\270\213runner\345\234\260\345\235\200\344\270\216\344\273\244\347\211\214.jpg" (100%) rename "docs/zh/docs/cluster_deployment/isulad+k8s/figures/13.\346\237\245\347\234\213\350\257\201\344\271\246\351\205\215\347\275\256\346\226\207\344\273\266.png" => "docs/zh/docs/cluster_deployment/isulad_k8s/figures/13.\346\237\245\347\234\213\350\257\201\344\271\246\351\205\215\347\275\256\346\226\207\344\273\266.png" (100%) rename "docs/zh/docs/cluster_deployment/isulad+k8s/figures/14.\350\257\201\344\271\246\345\257\274\345\205\245\346\226\207\344\273\266.png" => "docs/zh/docs/cluster_deployment/isulad_k8s/figures/14.\350\257\201\344\271\246\345\257\274\345\205\245\346\226\207\344\273\266.png" (100%) rename "docs/zh/docs/cluster_deployment/isulad+k8s/figures/15.\346\263\250\345\206\214gitlab-runner.jpg" => "docs/zh/docs/cluster_deployment/isulad_k8s/figures/15.\346\263\250\345\206\214gitlab-runner.jpg" (100%) rename "docs/zh/docs/cluster_deployment/isulad+k8s/figures/16.web\347\253\257\345\267\262\345\212\240\345\205\245_LI.jpg" => "docs/zh/docs/cluster_deployment/isulad_k8s/figures/16.web\347\253\257\345\267\262\345\212\240\345\205\245_LI.jpg" (100%) rename docs/zh/docs/cluster_deployment/{isulad+k8s => isulad_k8s}/figures/17.png (100%) rename "docs/zh/docs/cluster_deployment/isulad+k8s/figures/18.dns\351\205\215\347\275\256.png" => "docs/zh/docs/cluster_deployment/isulad_k8s/figures/18.dns\351\205\215\347\275\256.png" (100%) rename "docs/zh/docs/cluster_deployment/isulad+k8s/figures/19.CICD\347\225\214\351\235\242.png" => "docs/zh/docs/cluster_deployment/isulad_k8s/figures/19.CICD\347\225\214\351\235\242.png" (100%) rename "docs/zh/docs/cluster_deployment/isulad+k8s/figures/2.calico\351\205\215\347\275\256.png" => "docs/zh/docs/cluster_deployment/isulad_k8s/figures/2.calico\351\205\215\347\275\256.png" (100%) rename "docs/zh/docs/cluster_deployment/isulad+k8s/figures/20.yaml\346\226\207\344\273\266.png" => "docs/zh/docs/cluster_deployment/isulad_k8s/figures/20.yaml\346\226\207\344\273\266.png" (100%) rename "docs/zh/docs/cluster_deployment/isulad+k8s/figures/21.\346\265\201\346\260\264\347\272\277\347\212\266\346\200\201.png" => "docs/zh/docs/cluster_deployment/isulad_k8s/figures/21.\346\265\201\346\260\264\347\272\277\347\212\266\346\200\201.png" (100%) rename docs/zh/docs/cluster_deployment/{isulad+k8s => isulad_k8s}/figures/3.png (100%) rename "docs/zh/docs/cluster_deployment/isulad+k8s/figures/4.gitlab\347\275\221\351\241\265\345\205\245\345\217\243.jpg" => "docs/zh/docs/cluster_deployment/isulad_k8s/figures/4.gitlab\347\275\221\351\241\265\345\205\245\345\217\243.jpg" (100%) rename "docs/zh/docs/cluster_deployment/isulad+k8s/figures/5.\346\237\245\350\257\242\345\257\206\347\240\201.jpg" => "docs/zh/docs/cluster_deployment/isulad_k8s/figures/5.\346\237\245\350\257\242\345\257\206\347\240\201.jpg" (100%) rename "docs/zh/docs/cluster_deployment/isulad+k8s/figures/6.\347\231\273\345\275\225\345\220\216\351\241\265\351\235\242.png" => "docs/zh/docs/cluster_deployment/isulad_k8s/figures/6.\347\231\273\345\275\225\345\220\216\351\241\265\351\235\242.png" (100%) rename "docs/zh/docs/cluster_deployment/isulad+k8s/figures/7.\351\225\234\345\203\217.png" => "docs/zh/docs/cluster_deployment/isulad_k8s/figures/7.\351\225\234\345\203\217.png" (100%) rename "docs/zh/docs/cluster_deployment/isulad+k8s/figures/8.\346\226\260\345\273\272\351\241\271\347\233\256.png" => "docs/zh/docs/cluster_deployment/isulad_k8s/figures/8.\346\226\260\345\273\272\351\241\271\347\233\256.png" (100%) rename "docs/zh/docs/cluster_deployment/isulad+k8s/figures/9.\345\210\233\345\273\272\347\251\272\347\231\275\351\241\271\347\233\256.png" => "docs/zh/docs/cluster_deployment/isulad_k8s/figures/9.\345\210\233\345\273\272\347\251\272\347\231\275\351\241\271\347\233\256.png" (100%) rename docs/zh/docs/cluster_deployment/{isulad+k8s => isulad_k8s}/gitlab_deploy.md (100%) rename docs/zh/docs/cluster_deployment/{isulad+k8s => isulad_k8s}/gitlab_runner_deploy.md (100%) rename docs/zh/docs/cluster_deployment/{isulad+k8s/isulad+k8s_environment_deploy.md => isulad_k8s/isulad_k8s_environment_deploy.md} (100%) rename docs/zh/docs/cluster_deployment/{isulad+k8s => isulad_k8s}/overview.md (100%) rename docs/zh/docs/cluster_deployment/kubernetes/{deploying_a_kubernets_cluster_manually.md => deploying_a_kubernetes_cluster_manually.md} (100%) rename docs/zh/docs/cluster_deployment/kubernetes/{kubernetes-containerd.md => kubernetes_containerd.md} (99%) rename docs/zh/docs/container_runtime/kuasar/{isulad+kuasar-confidential-containers-deployment-guide.md => isulad_kuasar_confidential_containers_deployment_guide.md} (100%) diff --git a/docs/en/docs/cluster_deployment/isulad+k8s/figures/public_sys-resources/icon-note.gif b/docs/en/docs/cluster_deployment/isulad+k8s/figures/public_sys-resources/icon-note.gif deleted file mode 100644 index 6314297e45c1de184204098efd4814d6dc8b1cda..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 394 zcmZ?wbhEHblx7fPSjxcg=ii?@_wH=jwxy=7CMGH-B`L+l$wfv=#>UF#$gv|VY%C^b zCQFtrnKN(Bo_%|sJbO}7RAORe!otL&qo<>yq_Sq+8Xqqo5h0P3w3Lvb5E(g{p01vl zxR@)KuDH0l^z`+-dH3eaw=XqSH7aTIx{kzVBN;X&hha0dQSgWuiw0NWUvMRmkD|> diff --git a/docs/en/docs/cluster_deployment/isulad+k8s/_toc.yaml b/docs/en/docs/cluster_deployment/isulad_k8s/_toc.yaml similarity index 87% rename from docs/en/docs/cluster_deployment/isulad+k8s/_toc.yaml rename to docs/en/docs/cluster_deployment/isulad_k8s/_toc.yaml index 5e02575..3f4baf8 100644 --- a/docs/en/docs/cluster_deployment/isulad+k8s/_toc.yaml +++ b/docs/en/docs/cluster_deployment/isulad_k8s/_toc.yaml @@ -1,12 +1,12 @@ -label: iSulad + Kubernetes Cluster Deployment Guide -isManual: true -description: Deploy a Kubernetes cluster using the iSulad container engine on openEuler. -sections: - - label: Overview - href: ./overview.md - - label: iSulad + Kubernetes Environment Deployment - href: ./isulad+k8s_environment_deploy.md - - label: GitLab Deployment - href: ./gitlab_deploy.md - - label: GitLab Runner Deployment - href: ./gitlab_runner_deploy.md +label: iSulad + Kubernetes Cluster Deployment Guide +isManual: true +description: Deploy a Kubernetes cluster using the iSulad container engine on openEuler. +sections: + - label: Overview + href: ./overview.md + - label: iSulad + Kubernetes Environment Deployment + href: ./isulad_k8s_environment_deploy.md + - label: GitLab Deployment + href: ./gitlab_deploy.md + - label: GitLab Runner Deployment + href: ./gitlab_runner_deploy.md diff --git a/docs/en/docs/cluster_deployment/isulad+k8s/figures/1.view-required-images.png b/docs/en/docs/cluster_deployment/isulad_k8s/figures/1.view-required-images.png similarity index 100% rename from docs/en/docs/cluster_deployment/isulad+k8s/figures/1.view-required-images.png rename to docs/en/docs/cluster_deployment/isulad_k8s/figures/1.view-required-images.png diff --git "a/docs/en/docs/cluster_deployment/isulad+k8s/figures/10.\350\207\252\345\256\232\344\271\211\351\241\271\347\233\256\345\220\215\347\247\260.jpg" "b/docs/en/docs/cluster_deployment/isulad_k8s/figures/10.\350\207\252\345\256\232\344\271\211\351\241\271\347\233\256\345\220\215\347\247\260.jpg" similarity index 100% rename from "docs/en/docs/cluster_deployment/isulad+k8s/figures/10.\350\207\252\345\256\232\344\271\211\351\241\271\347\233\256\345\220\215\347\247\260.jpg" rename to "docs/en/docs/cluster_deployment/isulad_k8s/figures/10.\350\207\252\345\256\232\344\271\211\351\241\271\347\233\256\345\220\215\347\247\260.jpg" diff --git "a/docs/en/docs/cluster_deployment/isulad+k8s/figures/11.\350\256\276\347\275\256-cicd-runner.png" "b/docs/en/docs/cluster_deployment/isulad_k8s/figures/11.\350\256\276\347\275\256-cicd-runner.png" similarity index 100% rename from "docs/en/docs/cluster_deployment/isulad+k8s/figures/11.\350\256\276\347\275\256-cicd-runner.png" rename to "docs/en/docs/cluster_deployment/isulad_k8s/figures/11.\350\256\276\347\275\256-cicd-runner.png" diff --git "a/docs/en/docs/cluster_deployment/isulad+k8s/figures/12.\350\256\260\344\270\213runner\345\234\260\345\235\200\344\270\216\344\273\244\347\211\214.jpg" "b/docs/en/docs/cluster_deployment/isulad_k8s/figures/12.\350\256\260\344\270\213runner\345\234\260\345\235\200\344\270\216\344\273\244\347\211\214.jpg" similarity index 100% rename from "docs/en/docs/cluster_deployment/isulad+k8s/figures/12.\350\256\260\344\270\213runner\345\234\260\345\235\200\344\270\216\344\273\244\347\211\214.jpg" rename to "docs/en/docs/cluster_deployment/isulad_k8s/figures/12.\350\256\260\344\270\213runner\345\234\260\345\235\200\344\270\216\344\273\244\347\211\214.jpg" diff --git a/docs/en/docs/cluster_deployment/isulad+k8s/figures/13.view-cert-config.png b/docs/en/docs/cluster_deployment/isulad_k8s/figures/13.view-cert-config.png similarity index 100% rename from docs/en/docs/cluster_deployment/isulad+k8s/figures/13.view-cert-config.png rename to docs/en/docs/cluster_deployment/isulad_k8s/figures/13.view-cert-config.png diff --git a/docs/en/docs/cluster_deployment/isulad+k8s/figures/14.import-cert.png b/docs/en/docs/cluster_deployment/isulad_k8s/figures/14.import-cert.png similarity index 100% rename from docs/en/docs/cluster_deployment/isulad+k8s/figures/14.import-cert.png rename to docs/en/docs/cluster_deployment/isulad_k8s/figures/14.import-cert.png diff --git a/docs/en/docs/cluster_deployment/isulad+k8s/figures/15.register-gitlab-runner.jpg b/docs/en/docs/cluster_deployment/isulad_k8s/figures/15.register-gitlab-runner.jpg similarity index 100% rename from docs/en/docs/cluster_deployment/isulad+k8s/figures/15.register-gitlab-runner.jpg rename to docs/en/docs/cluster_deployment/isulad_k8s/figures/15.register-gitlab-runner.jpg diff --git "a/docs/en/docs/cluster_deployment/isulad+k8s/figures/16.web\347\253\257\345\267\262\345\212\240\345\205\245_LI.jpg" "b/docs/en/docs/cluster_deployment/isulad_k8s/figures/16.web\347\253\257\345\267\262\345\212\240\345\205\245_LI.jpg" similarity index 100% rename from "docs/en/docs/cluster_deployment/isulad+k8s/figures/16.web\347\253\257\345\267\262\345\212\240\345\205\245_LI.jpg" rename to "docs/en/docs/cluster_deployment/isulad_k8s/figures/16.web\347\253\257\345\267\262\345\212\240\345\205\245_LI.jpg" diff --git a/docs/en/docs/cluster_deployment/isulad+k8s/figures/17.png b/docs/en/docs/cluster_deployment/isulad_k8s/figures/17.png similarity index 100% rename from docs/en/docs/cluster_deployment/isulad+k8s/figures/17.png rename to docs/en/docs/cluster_deployment/isulad_k8s/figures/17.png diff --git a/docs/en/docs/cluster_deployment/isulad+k8s/figures/18.dns-config.png b/docs/en/docs/cluster_deployment/isulad_k8s/figures/18.dns-config.png similarity index 100% rename from docs/en/docs/cluster_deployment/isulad+k8s/figures/18.dns-config.png rename to docs/en/docs/cluster_deployment/isulad_k8s/figures/18.dns-config.png diff --git "a/docs/en/docs/cluster_deployment/isulad+k8s/figures/19.CICD\347\225\214\351\235\242.png" "b/docs/en/docs/cluster_deployment/isulad_k8s/figures/19.CICD\347\225\214\351\235\242.png" similarity index 100% rename from "docs/en/docs/cluster_deployment/isulad+k8s/figures/19.CICD\347\225\214\351\235\242.png" rename to "docs/en/docs/cluster_deployment/isulad_k8s/figures/19.CICD\347\225\214\351\235\242.png" diff --git "a/docs/en/docs/cluster_deployment/isulad+k8s/figures/2.calico\351\205\215\347\275\256.png" "b/docs/en/docs/cluster_deployment/isulad_k8s/figures/2.calico\351\205\215\347\275\256.png" similarity index 100% rename from "docs/en/docs/cluster_deployment/isulad+k8s/figures/2.calico\351\205\215\347\275\256.png" rename to "docs/en/docs/cluster_deployment/isulad_k8s/figures/2.calico\351\205\215\347\275\256.png" diff --git a/docs/en/docs/cluster_deployment/isulad+k8s/figures/20.yaml.png b/docs/en/docs/cluster_deployment/isulad_k8s/figures/20.yaml.png similarity index 100% rename from docs/en/docs/cluster_deployment/isulad+k8s/figures/20.yaml.png rename to docs/en/docs/cluster_deployment/isulad_k8s/figures/20.yaml.png diff --git "a/docs/en/docs/cluster_deployment/isulad+k8s/figures/21.\346\265\201\346\260\264\347\272\277\347\212\266\346\200\201.png" "b/docs/en/docs/cluster_deployment/isulad_k8s/figures/21.\346\265\201\346\260\264\347\272\277\347\212\266\346\200\201.png" similarity index 100% rename from "docs/en/docs/cluster_deployment/isulad+k8s/figures/21.\346\265\201\346\260\264\347\272\277\347\212\266\346\200\201.png" rename to "docs/en/docs/cluster_deployment/isulad_k8s/figures/21.\346\265\201\346\260\264\347\272\277\347\212\266\346\200\201.png" diff --git a/docs/en/docs/cluster_deployment/isulad+k8s/figures/3.png b/docs/en/docs/cluster_deployment/isulad_k8s/figures/3.png similarity index 100% rename from docs/en/docs/cluster_deployment/isulad+k8s/figures/3.png rename to docs/en/docs/cluster_deployment/isulad_k8s/figures/3.png diff --git a/docs/en/docs/cluster_deployment/isulad+k8s/figures/4.gitlab-entrance.jpg b/docs/en/docs/cluster_deployment/isulad_k8s/figures/4.gitlab-entrance.jpg similarity index 100% rename from docs/en/docs/cluster_deployment/isulad+k8s/figures/4.gitlab-entrance.jpg rename to docs/en/docs/cluster_deployment/isulad_k8s/figures/4.gitlab-entrance.jpg diff --git a/docs/en/docs/cluster_deployment/isulad+k8s/figures/5.view-password.jpg b/docs/en/docs/cluster_deployment/isulad_k8s/figures/5.view-password.jpg similarity index 100% rename from docs/en/docs/cluster_deployment/isulad+k8s/figures/5.view-password.jpg rename to docs/en/docs/cluster_deployment/isulad_k8s/figures/5.view-password.jpg diff --git a/docs/en/docs/cluster_deployment/isulad+k8s/figures/6.logged-in.png b/docs/en/docs/cluster_deployment/isulad_k8s/figures/6.logged-in.png similarity index 100% rename from docs/en/docs/cluster_deployment/isulad+k8s/figures/6.logged-in.png rename to docs/en/docs/cluster_deployment/isulad_k8s/figures/6.logged-in.png diff --git a/docs/en/docs/cluster_deployment/isulad+k8s/figures/7.image.png b/docs/en/docs/cluster_deployment/isulad_k8s/figures/7.image.png similarity index 100% rename from docs/en/docs/cluster_deployment/isulad+k8s/figures/7.image.png rename to docs/en/docs/cluster_deployment/isulad_k8s/figures/7.image.png diff --git "a/docs/en/docs/cluster_deployment/isulad+k8s/figures/8.\346\226\260\345\273\272\351\241\271\347\233\256.png" "b/docs/en/docs/cluster_deployment/isulad_k8s/figures/8.\346\226\260\345\273\272\351\241\271\347\233\256.png" similarity index 100% rename from "docs/en/docs/cluster_deployment/isulad+k8s/figures/8.\346\226\260\345\273\272\351\241\271\347\233\256.png" rename to "docs/en/docs/cluster_deployment/isulad_k8s/figures/8.\346\226\260\345\273\272\351\241\271\347\233\256.png" diff --git "a/docs/en/docs/cluster_deployment/isulad+k8s/figures/9.\345\210\233\345\273\272\347\251\272\347\231\275\351\241\271\347\233\256.png" "b/docs/en/docs/cluster_deployment/isulad_k8s/figures/9.\345\210\233\345\273\272\347\251\272\347\231\275\351\241\271\347\233\256.png" similarity index 100% rename from "docs/en/docs/cluster_deployment/isulad+k8s/figures/9.\345\210\233\345\273\272\347\251\272\347\231\275\351\241\271\347\233\256.png" rename to "docs/en/docs/cluster_deployment/isulad_k8s/figures/9.\345\210\233\345\273\272\347\251\272\347\231\275\351\241\271\347\233\256.png" diff --git a/docs/en/docs/cluster_deployment/isulad+k8s/gitlab_deploy.md b/docs/en/docs/cluster_deployment/isulad_k8s/gitlab_deploy.md similarity index 95% rename from docs/en/docs/cluster_deployment/isulad+k8s/gitlab_deploy.md rename to docs/en/docs/cluster_deployment/isulad_k8s/gitlab_deploy.md index c284afc..ea24d80 100644 --- a/docs/en/docs/cluster_deployment/isulad+k8s/gitlab_deploy.md +++ b/docs/en/docs/cluster_deployment/isulad_k8s/gitlab_deploy.md @@ -1,311 +1,311 @@ -# GitLab Deployment - -## Description - -GitLab deployment is required in Scenario 1 (openEuler native deployment CI/CD based on GitLab CI/CD). In Scenario 2 (openEuler native development cluster managed by GitLab CI/CD), skip this step. - -## Preparing the Server - -Prepare a machine running openEuler 20.03 LTS or later versions. - -## Starting GitLab - -Copy the required YAML files to the **/home** directory and start the related pod. -> **Note**: The YAML files related to GitLab can be obtained from the GitLab official site. - -Example YAML files are as follows. Modify them as required. - -gitlab-redis.yaml - -```yaml -apiVersion: apps/v1 -kind: Deployment -metadata: - name: redis - namespace: default - labels: - name: redis -spec: - selector: - matchLabels: - name: redis - template: - metadata: - name: redis - labels: - name: redis - spec: - containers: - - name: redis - image: 10.35.111.11:5000/redis:latest - imagePullPolicy: IfNotPresent - ports: - - name: redis - containerPort: 6379 - volumeMounts: - - mountPath: /var/lib/redis - name: data - livenessProbe: - exec: - command: - - redis-cli - - ping - initialDelaySeconds: 30 - timeoutSeconds: 5 - readinessProbe: - exec: - command: - - redis-cli - - ping - initialDelaySeconds: 5 - timeoutSeconds: 1 - volumes: - - name: data - emptyDir: {} - ---- -apiVersion: v1 -kind: Service -metadata: - name: redis - namespace: default - labels: - name: redis -spec: - ports: - - name: redis - port: 6379 - targetPort: redis - selector: - name: redis -``` - -gitlab-postgresql.yaml - -```yaml -apiVersion: apps/v1 -kind: Deployment -metadata: - name: postgresql - namespace: default - labels: - name: postgresql -spec: - selector: - matchLabels: - name: postgresql - template: - metadata: - name: postgresql - labels: - name: postgresql - spec: - containers: - - name: postgresql - image: 10.35.111.11:5000/postgres:13.6 - imagePullPolicy: IfNotPresent - env: - - name: POSTGRES_HOST_AUTH_METHOD - value: trust - - name: DB_USER - value: gitlab - - name: DB_PASS - value: passw0rd - - name: DB_NAME - value: gitlab_production - - name: DB_EXTENSION - value: pg_trgm - ports: - - name: postgres - containerPort: 5432 - volumeMounts: - - mountPath: /var/lib/postgresql - name: data - livenessProbe: - exec: - command: - - pg_isready - - -h - - localhost - - -U - - postgres - initialDelaySeconds: 30 - timeoutSeconds: 5 - readinessProbe: - exec: - command: - - pg_isready - - -h - - localhost - - -U - - postgres - initialDelaySeconds: 5 - timeoutSeconds: 1 - volumes: - - name: data - emptyDir: {} - ---- -apiVersion: v1 -kind: Service -metadata: - name: postgresql - namespace: default - labels: - name: postgresql -spec: - ports: - - name: postgres - port: 5432 - targetPort: postgres - selector: - name: postgresql -``` - -gitlab.yaml - -```yaml -apiVersion: apps/v1 -kind: Deployment -metadata: - name: gitlab - namespace: default - labels: - name: gitlab -spec: - selector: - matchLabels: - name: gitlab - template: - metadata: - name: gitlab - labels: - name: gitlab - spec: - containers: - - name: gitlab - image: 10.35.111.11:5000/yrzr/gitlab-ce-arm64v8:14.3.2-ce.0 - imagePullPolicy: IfNotPresent - env: - - name: TZ - value: Asia/Shanghai - - name: GITLAB_TIMEZONE - value: Beijing - - name: GITLAB_SECRETS_DB_KEY_BASE - value: long-and-random-alpha-numeric-string - - name: GITLAB_SECRETS_SECRET_KEY_BASE - value: long-and-random-alpha-numeric-string - - name: GITLAB_SECRETS_OTP_KEY_BASE - value: long-and-random-alpha-numeric-string - - name: GITLAB_ROOT_PASSWORD - value: admin321 - - name: GITLAB_ROOT_EMAIL - value: 517554016@qq.com - - name: GITLAB_HOST - value: git.qikqiak.com - - name: GITLAB_PORT - value: "80" - - name: GITLAB_SSH_PORT - value: "22" - - name: GITLAB_NOTIFY_ON_BROKEN_BUILDS - value: "true" - - name: GITLAB_NOTIFY_PUSHER - value: "false" - - name: GITLAB_BACKUP_SCHEDULE - value: daily - - name: GITLAB_BACKUP_TIME - value: 01:00 - - name: DB_TYPE - value: postgres - - name: DB_HOST - value: postgresql - - name: DB_PORT - value: "5432" - - name: DB_USER - value: gitlab - - name: DB_PASS - value: passw0rd - - name: DB_NAME - value: gitlab_production - - name: REDIS_HOST - value: redis - - name: REDIS_PORT - value: "6379" - ports: - - name: http - containerPort: 80 - - name: ssh - containerPort: 22 - volumeMounts: - - mountPath: /home/git/data - name: data - livenessProbe: - httpGet: - path: / - port: 80 - initialDelaySeconds: 180 - timeoutSeconds: 5 - readinessProbe: - httpGet: - path: / - port: 80 - initialDelaySeconds: 5 - timeoutSeconds: 1 - volumes: - - name: data - emptyDir: {} - ---- -apiVersion: v1 -kind: Service -metadata: - name: gitlab - namespace: default - labels: - name: gitlab -spec: - ports: - - name: http - port: 80 - targetPort: http - nodePort: 30852 - - name: ssh - port: 22 - nodePort: 32353 - targetPort: ssh - selector: - name: gitlab - type: NodePort -``` - -Start the containers. - -```shell -kubectl apply -f gitlab-redis.yaml -kubectl apply -f gitlab-postgresql.yaml -kubectl apply -f gitlab.yaml -``` - -Check whether the GitLab pod is set up successfully. - -```shell -kubectl get pod -A -owide -``` - -## Logging in to GitLab - -Log in to the GitLab Web UI. The address is the IP address and the configured port. - -![](figures/4.gitlab-entrance.jpg) -The user name is **root**. The default password can be viewed in the password file in the container. - -```shell -kubectl exec -it gitlab-lab -n default /bin/sh -cat /etc/gitlab/initial_root_password -``` - -![](figures/5.view-password.jpg) - -- After you log in, this page is displayed: - -![](figures/6.logged-in.png) +# GitLab Deployment + +## Description + +GitLab deployment is required in Scenario 1 (openEuler native deployment CI/CD based on GitLab CI/CD). In Scenario 2 (openEuler native development cluster managed by GitLab CI/CD), skip this step. + +## Preparing the Server + +Prepare a machine running openEuler 20.03 LTS or later versions. + +## Starting GitLab + +Copy the required YAML files to the **/home** directory and start the related pod. +> **Note**: The YAML files related to GitLab can be obtained from the GitLab official site. + +Example YAML files are as follows. Modify them as required. + +gitlab-redis.yaml + +```yaml +apiVersion: apps/v1 +kind: Deployment +metadata: + name: redis + namespace: default + labels: + name: redis +spec: + selector: + matchLabels: + name: redis + template: + metadata: + name: redis + labels: + name: redis + spec: + containers: + - name: redis + image: 10.35.111.11:5000/redis:latest + imagePullPolicy: IfNotPresent + ports: + - name: redis + containerPort: 6379 + volumeMounts: + - mountPath: /var/lib/redis + name: data + livenessProbe: + exec: + command: + - redis-cli + - ping + initialDelaySeconds: 30 + timeoutSeconds: 5 + readinessProbe: + exec: + command: + - redis-cli + - ping + initialDelaySeconds: 5 + timeoutSeconds: 1 + volumes: + - name: data + emptyDir: {} + +--- +apiVersion: v1 +kind: Service +metadata: + name: redis + namespace: default + labels: + name: redis +spec: + ports: + - name: redis + port: 6379 + targetPort: redis + selector: + name: redis +``` + +gitlab-postgresql.yaml + +```yaml +apiVersion: apps/v1 +kind: Deployment +metadata: + name: postgresql + namespace: default + labels: + name: postgresql +spec: + selector: + matchLabels: + name: postgresql + template: + metadata: + name: postgresql + labels: + name: postgresql + spec: + containers: + - name: postgresql + image: 10.35.111.11:5000/postgres:13.6 + imagePullPolicy: IfNotPresent + env: + - name: POSTGRES_HOST_AUTH_METHOD + value: trust + - name: DB_USER + value: gitlab + - name: DB_PASS + value: passw0rd + - name: DB_NAME + value: gitlab_production + - name: DB_EXTENSION + value: pg_trgm + ports: + - name: postgres + containerPort: 5432 + volumeMounts: + - mountPath: /var/lib/postgresql + name: data + livenessProbe: + exec: + command: + - pg_isready + - -h + - localhost + - -U + - postgres + initialDelaySeconds: 30 + timeoutSeconds: 5 + readinessProbe: + exec: + command: + - pg_isready + - -h + - localhost + - -U + - postgres + initialDelaySeconds: 5 + timeoutSeconds: 1 + volumes: + - name: data + emptyDir: {} + +--- +apiVersion: v1 +kind: Service +metadata: + name: postgresql + namespace: default + labels: + name: postgresql +spec: + ports: + - name: postgres + port: 5432 + targetPort: postgres + selector: + name: postgresql +``` + +gitlab.yaml + +```yaml +apiVersion: apps/v1 +kind: Deployment +metadata: + name: gitlab + namespace: default + labels: + name: gitlab +spec: + selector: + matchLabels: + name: gitlab + template: + metadata: + name: gitlab + labels: + name: gitlab + spec: + containers: + - name: gitlab + image: 10.35.111.11:5000/yrzr/gitlab-ce-arm64v8:14.3.2-ce.0 + imagePullPolicy: IfNotPresent + env: + - name: TZ + value: Asia/Shanghai + - name: GITLAB_TIMEZONE + value: Beijing + - name: GITLAB_SECRETS_DB_KEY_BASE + value: long-and-random-alpha-numeric-string + - name: GITLAB_SECRETS_SECRET_KEY_BASE + value: long-and-random-alpha-numeric-string + - name: GITLAB_SECRETS_OTP_KEY_BASE + value: long-and-random-alpha-numeric-string + - name: GITLAB_ROOT_PASSWORD + value: admin321 + - name: GITLAB_ROOT_EMAIL + value: 517554016@qq.com + - name: GITLAB_HOST + value: git.qikqiak.com + - name: GITLAB_PORT + value: "80" + - name: GITLAB_SSH_PORT + value: "22" + - name: GITLAB_NOTIFY_ON_BROKEN_BUILDS + value: "true" + - name: GITLAB_NOTIFY_PUSHER + value: "false" + - name: GITLAB_BACKUP_SCHEDULE + value: daily + - name: GITLAB_BACKUP_TIME + value: 01:00 + - name: DB_TYPE + value: postgres + - name: DB_HOST + value: postgresql + - name: DB_PORT + value: "5432" + - name: DB_USER + value: gitlab + - name: DB_PASS + value: passw0rd + - name: DB_NAME + value: gitlab_production + - name: REDIS_HOST + value: redis + - name: REDIS_PORT + value: "6379" + ports: + - name: http + containerPort: 80 + - name: ssh + containerPort: 22 + volumeMounts: + - mountPath: /home/git/data + name: data + livenessProbe: + httpGet: + path: / + port: 80 + initialDelaySeconds: 180 + timeoutSeconds: 5 + readinessProbe: + httpGet: + path: / + port: 80 + initialDelaySeconds: 5 + timeoutSeconds: 1 + volumes: + - name: data + emptyDir: {} + +--- +apiVersion: v1 +kind: Service +metadata: + name: gitlab + namespace: default + labels: + name: gitlab +spec: + ports: + - name: http + port: 80 + targetPort: http + nodePort: 30852 + - name: ssh + port: 22 + nodePort: 32353 + targetPort: ssh + selector: + name: gitlab + type: NodePort +``` + +Start the containers. + +```shell +kubectl apply -f gitlab-redis.yaml +kubectl apply -f gitlab-postgresql.yaml +kubectl apply -f gitlab.yaml +``` + +Check whether the GitLab pod is set up successfully. + +```shell +kubectl get pod -A -owide +``` + +## Logging in to GitLab + +Log in to the GitLab Web UI. The address is the IP address and the configured port. + +![](figures/4.gitlab-entrance.jpg) +The user name is **root**. The default password can be viewed in the password file in the container. + +```shell +kubectl exec -it gitlab-lab -n default /bin/sh +cat /etc/gitlab/initial_root_password +``` + +![](figures/5.view-password.jpg) + +- After you log in, this page is displayed: + +![](figures/6.logged-in.png) diff --git a/docs/en/docs/cluster_deployment/isulad+k8s/gitlab_runner_deploy.md b/docs/en/docs/cluster_deployment/isulad_k8s/gitlab_runner_deploy.md similarity index 96% rename from docs/en/docs/cluster_deployment/isulad+k8s/gitlab_runner_deploy.md rename to docs/en/docs/cluster_deployment/isulad_k8s/gitlab_runner_deploy.md index eadbba9..770f165 100644 --- a/docs/en/docs/cluster_deployment/isulad+k8s/gitlab_runner_deploy.md +++ b/docs/en/docs/cluster_deployment/isulad_k8s/gitlab_runner_deploy.md @@ -1,178 +1,178 @@ -# GitLab Runner Deployment and Testing - -## Images and Software - -The following table lists the images required during installation. The version numbers are for reference only. - -| Image | Version | -|------------------------------------|----------| -| gitlab/gitlab-runner | alpine-v14.4.0 | -| gitlab/gitlab-runner-helper | x86_64-54944146 | - -> If the Internet is unavailable in the environment, download the required images in advance. -> Download the images from the Docker Hub official website . - -## Using gitlab-runner.yaml to Start the Runner Container - -In the **gitlab-runner.yaml** file, change the image name. The following is an example of the **.yaml** file. Modify the file as required. - -```shell -vim gitlab-runner.yaml -``` - -```yaml -apiVersion: apps/v1 -kind: Deployment -metadata: - name: gitlab-runner - namespace: default -spec: - replicas: 1 - selector: - matchLabels: - name: gitlab-runner - template: - metadata: - labels: - name: gitlab-runner - spec: - containers: - - args: - - run - image: gitlab/gitlab-runner:alpine-v14.4.0 - imagePullPolicy: IfNotPresent - name: gitlab-runner - volumeMounts: - - mountPath: /etc/gitlab-runner - name: config - readOnly: false - - mountPath: /etc/ssl/certs - name: cacerts - readOnly: true - restartPolicy: Always - volumes: - - hostPath: - path: /etc/gitlab-runner - name: config - - hostPath: - path: /etc/ssl/key - name: cacerts - -```shell - -Start the container. - -```shell -# kubectl apply -f gitlab-runner.yaml -# kubectl get pod -A -o wide -``` - -![image](figures/7.image.png) - -## Creating a Container Project That Uses User Certificates for Authentication in GitLab - -1. Click **New project**. - -2. Select **Create blank project**. - -3. Enter a name for the project. - -4. Choose **Settings** > **CI/CD** > **Runners** > **Expand**. - -5. Record the address and token for registering the Runner. - -6. Import certificate files. - - Check and generate certificate files **admin.crt**, **admin.key**, and **ca.crt** on the master node. - - - View certificate information. - - ```shell - # cat /etc/kubernetes/admin.conf - ``` - - ![view-cert-config](figures/13.view-cert-config.png) - - - Generate the encrypted **admin.crt**. - - ```shell - # echo "${client-certificate-data}" | base64 -d > admin.crt - ``` - - - Generate the encrypted **admin.key**. - - ```shell - # echo "${client-key-data}" | base64 -d > admin.key - ``` - - - Obtain the CA certificate on the manager node. - - ```shell - # cp /etc/kubernetes/pki/ca.crt ./ - ``` - -7. Import the three certificate files to the GitLab Runner container on the node where the Runner is running. - - > **Note**: To import the certificate files, check the node where the GitLab Runner is running, copy the certificate files to the node, and run the **isula cp** command to import the certificate files. - - ```shell - # isula cp admin.crt [Container ID]:Storage path - # isula cp admin.key [Container ID]:Storage path - # isula cp ca.crt [Container ID]:Storage path - ``` - - Note: The **isula cp** command can copy only one file at a time. - - ![import-cert](figures/14.import-cert.png) - -## Registering the GitLab Runner - -Perform registration in the GitLab Runner container. Currently, interactive registration is used. Obtain the registration information from GitLab. Choose **GitLab** > **Group runners** > **Settings** > **CI/CD** > **Runners**. - -![register-gitlab-runner](figures/15.register-gitlab-runner.jpg) - -Upload the prepared **gitlab-runner-helper** image to the private image repository in advance, go to the GitLab Runner container, and modify the configuration file. - -```shell -# cd /etc/gitlab-runner -# mkdir kubessl -# cp /home/admin.crt /etc/gitlab-runner/kubessl -# cp /home/ca.crt /etc/gitlab-runner/kubessl -# cp /home/admin.key /etc/gitlab-runner/kubessl -# vim /etc/gitlab-runner/config.toml -``` - -![](figures/17.png) - -## Adding the DNS Record of the GitLab Container to the Manager Node - -1. View the IP address of the GitLab container. - - ```shell - # kubectl get pods -Aowide - ``` - -2. Add the IP address of the GitLab container to the Kubernetes DNS configuration file. - - ```shell - # kubectl edit configmaps coredns -n kube-system - ``` - - ![dns](figures/18.dns-config.png) - -3. Restart the CoreDNS service. - - ```shell - # kubectl scale deployment coredns -n kube-system --replicas=0 - # kubectl scale deployment coredns -n kube-system --replicas=2 - ``` - -## GitLab Running Testing - -Return to the GitLab web IDE and choose **CI/CD** > **Editor** > **Create new CI/CD pipeline**. - -- Compile the YAML file as follows: - -![yaml](figures/20.yaml.png) - -- Choose **Pipelines** and view the status. +# GitLab Runner Deployment and Testing + +## Images and Software + +The following table lists the images required during installation. The version numbers are for reference only. + +| Image | Version | +|------------------------------------|----------| +| gitlab/gitlab-runner | alpine-v14.4.0 | +| gitlab/gitlab-runner-helper | x86_64-54944146 | + +> If the Internet is unavailable in the environment, download the required images in advance. +> Download the images from the Docker Hub official website . + +## Using gitlab-runner.yaml to Start the Runner Container + +In the **gitlab-runner.yaml** file, change the image name. The following is an example of the **.yaml** file. Modify the file as required. + +```shell +vim gitlab-runner.yaml +``` + +```yaml +apiVersion: apps/v1 +kind: Deployment +metadata: + name: gitlab-runner + namespace: default +spec: + replicas: 1 + selector: + matchLabels: + name: gitlab-runner + template: + metadata: + labels: + name: gitlab-runner + spec: + containers: + - args: + - run + image: gitlab/gitlab-runner:alpine-v14.4.0 + imagePullPolicy: IfNotPresent + name: gitlab-runner + volumeMounts: + - mountPath: /etc/gitlab-runner + name: config + readOnly: false + - mountPath: /etc/ssl/certs + name: cacerts + readOnly: true + restartPolicy: Always + volumes: + - hostPath: + path: /etc/gitlab-runner + name: config + - hostPath: + path: /etc/ssl/key + name: cacerts + +```shell + +Start the container. + +```shell +# kubectl apply -f gitlab-runner.yaml +# kubectl get pod -A -o wide +``` + +![image](figures/7.image.png) + +## Creating a Container Project That Uses User Certificates for Authentication in GitLab + +1. Click **New project**. + +2. Select **Create blank project**. + +3. Enter a name for the project. + +4. Choose **Settings** > **CI/CD** > **Runners** > **Expand**. + +5. Record the address and token for registering the Runner. + +6. Import certificate files. + + Check and generate certificate files **admin.crt**, **admin.key**, and **ca.crt** on the master node. + + - View certificate information. + + ```shell + # cat /etc/kubernetes/admin.conf + ``` + + ![view-cert-config](figures/13.view-cert-config.png) + + - Generate the encrypted **admin.crt**. + + ```shell + # echo "${client-certificate-data}" | base64 -d > admin.crt + ``` + + - Generate the encrypted **admin.key**. + + ```shell + # echo "${client-key-data}" | base64 -d > admin.key + ``` + + - Obtain the CA certificate on the manager node. + + ```shell + # cp /etc/kubernetes/pki/ca.crt ./ + ``` + +7. Import the three certificate files to the GitLab Runner container on the node where the Runner is running. + + > **Note**: To import the certificate files, check the node where the GitLab Runner is running, copy the certificate files to the node, and run the **isula cp** command to import the certificate files. + + ```shell + # isula cp admin.crt [Container ID]:Storage path + # isula cp admin.key [Container ID]:Storage path + # isula cp ca.crt [Container ID]:Storage path + ``` + + Note: The **isula cp** command can copy only one file at a time. + + ![import-cert](figures/14.import-cert.png) + +## Registering the GitLab Runner + +Perform registration in the GitLab Runner container. Currently, interactive registration is used. Obtain the registration information from GitLab. Choose **GitLab** > **Group runners** > **Settings** > **CI/CD** > **Runners**. + +![register-gitlab-runner](figures/15.register-gitlab-runner.jpg) + +Upload the prepared **gitlab-runner-helper** image to the private image repository in advance, go to the GitLab Runner container, and modify the configuration file. + +```shell +# cd /etc/gitlab-runner +# mkdir kubessl +# cp /home/admin.crt /etc/gitlab-runner/kubessl +# cp /home/ca.crt /etc/gitlab-runner/kubessl +# cp /home/admin.key /etc/gitlab-runner/kubessl +# vim /etc/gitlab-runner/config.toml +``` + +![](figures/17.png) + +## Adding the DNS Record of the GitLab Container to the Manager Node + +1. View the IP address of the GitLab container. + + ```shell + # kubectl get pods -Aowide + ``` + +2. Add the IP address of the GitLab container to the Kubernetes DNS configuration file. + + ```shell + # kubectl edit configmaps coredns -n kube-system + ``` + + ![dns](figures/18.dns-config.png) + +3. Restart the CoreDNS service. + + ```shell + # kubectl scale deployment coredns -n kube-system --replicas=0 + # kubectl scale deployment coredns -n kube-system --replicas=2 + ``` + +## GitLab Running Testing + +Return to the GitLab web IDE and choose **CI/CD** > **Editor** > **Create new CI/CD pipeline**. + +- Compile the YAML file as follows: + +![yaml](figures/20.yaml.png) + +- Choose **Pipelines** and view the status. diff --git a/docs/en/docs/cluster_deployment/isulad+k8s/isulad+k8s_environment_deploy.md b/docs/en/docs/cluster_deployment/isulad_k8s/isulad_k8s_environment_deploy.md similarity index 96% rename from docs/en/docs/cluster_deployment/isulad+k8s/isulad+k8s_environment_deploy.md rename to docs/en/docs/cluster_deployment/isulad_k8s/isulad_k8s_environment_deploy.md index 8a588eb..22b6009 100644 --- a/docs/en/docs/cluster_deployment/isulad+k8s/isulad+k8s_environment_deploy.md +++ b/docs/en/docs/cluster_deployment/isulad_k8s/isulad_k8s_environment_deploy.md @@ -1,382 +1,382 @@ -# iSulad+Kubernetes Environment Deployment - -## Preparing Cluster Servers - -Prepare at least 3 machines running openEuler 20.03 LTS or later versions. The following table lists information about the machines. - -| Host Name | IP Address | OS | Role | Component | -|-------|-------------|------------------------|----------|-----------| -| lab1 | 197.xxx.xxx.xxx | openEuler 20.03 LTS SP3 | Control node | iSulad/Kubernetes | -| lab2 | 197.xxx.xxx.xxx | openEuler 20.03 LTS SP3 | Worker node 1 | iSulad/Kubernetes | -| lab3 | 197.xxx.xxx.xxx | openEuler 20.03 LTS SP3 | Worker node 2 | iSulad/Kubernetes | - -## Preparing Images and Software Packages - -The following table lists software packages and images used in the example. The versions are for reference only. - -| Software | Version | -|------------------------------------|----------| -| iSulad | 2.0.17-2 | -| kubernetes-client | 1.20.2-9 | -| kubernetes-kubeadm | 1.20.2-9 | -| kubernetes-kubelet | 1.20.2-9 | - -| Image | Version | -|------------------------------------|----------| -| k8s.gcr.io/kube-proxy | v1.20.2 | -| k8s.gcr.io/kube-apiserver | v1.20.2 | -| k8s.gcr.io/kube-controller-manager | v1.20.2 | -| k8s.gcr.io/kube-scheduler | v1.20.2 | -| k8s.gcr.io/etcd | 3.4.13-0 | -| k8s.gcr.io/coredns | 1.7.0 | -| k8s.gcr.io/pause | 3.2 | -| calico/node | v3.14.2 | -| calico/pod2daemon-flexvol | v3.14.2 | -| calico/cni | v3.14.2 | -| calico/kube-controllers | v3.14.2 | - -> If you perform the deployment in without an Internet connection, download the software packages, dependencies, and images in advance. - -- Download software packages: -- Download images from Docker Hub: - -## Modifying the hosts File - -1. Change the host name of the machine, for example, **lab1**. - - ```shell - hostnamectl set-hostname lab1 - sudo -i - ``` - -2. Configure host name resolution by modifying the **/etc/hosts** file on each machine. - - ```shell - vim /etc/hosts - ``` - -3. Add the following content (IP address and host name) to the **hosts** file: - - ```text - 197.xxx.xxx.xxx lab1 - 197.xxx.xxx.xxx lab2 - 197.xxx.xxx.xxx lab3 - ``` - -## Preparing the Environment - -1. Disable the firewall/ - - ```shell - systemctl stop firewalld - systemctl disable firewalld - ``` - -2. Disable SELinux. - - ```shell - setenforce 0 - ``` - -3. Disable memory swapping. - - ```shell - swapoff -a - sed -ri 's/.*swap.*/#&/' /etc/fstab - ``` - -4. Configure the network and enable forwarding. - - ```shell - $ cat > /etc/sysctl.d/kubernetes.conf <" - ], - "pod-sandbox-image": "k8s.gcr.io/pause:3.2", - "native.umask": "normal", - "network-plugin": "cni", - "cni-bin-dir": "/opt/cni/bin", - "cni-conf-dir": "/etc/cni/net.d", - "image-layer-check": false, - "use-decrypted-key": true, - "insecure-skip-verify-enforce": false, - "cri-runtimes": { - "kata": "io.containerd.kata.v2" - } - } - ``` - -3. Restart the isulad service. - - ```shell - systemctl restart isulad - ``` - -### Loading the isulad Images - -1. Check the required system images. - - ```shell - kubeadm config images list - ``` - - Pay attention to the versions in the output, as shown in the figure. - ![](figures/1.view-required-images.png) - -2. Pull the images using the `isula` command. - - > [!NOTE]Note - > - > **Note**: The versions in the following commands are for reference only. Use the versions in the preceding output. - - ```shell - isula pull k8smx/kube-apiserver:v1.20.15 - isula pull k8smx/kube-controller-manager:v1.20.15 - isula pull k8smx/kube-scheduler:v1.20.15 - isula pull k8smx/kube-proxy:v1.20.15 - isula pull k8smx/pause:3.2 - isula pull k8smx/coredns:1.7.0 - isula pull k8smx/etcd:3.4.13-0 - ``` - -3. Modify the tags of the pulled images. - - ```shell - isula tag k8smx/kube-apiserver:v1.20.15 k8s.gcr.io/kube-apiserver:v1.20.15 - isula tag k8smx/kube-controller-manager:v1.20.15 k8s.gcr.io/kube-controller-manager:v1.20.15 - isula tag k8smx/kube-scheduler:v1.20.15 k8s.gcr.io/kube-scheduler:v1.20.15 - isula tag k8smx/kube-proxy:v1.20.15 k8s.gcr.io/kube-proxy:v1.20.15 - isula tag k8smx/pause:3.2 k8s.gcr.io/pause:3.2 - isula tag k8smx/coredns:1.7.0 k8s.gcr.io/coredns:1.7.0 - isula tag k8smx/etcd:3.4.13-0 k8s.gcr.io/etcd:3.4.13-0 - ``` - -4. Remove the old images. - - ```shell - isula rmi k8smx/kube-apiserver:v1.20.15 - isula rmi k8smx/kube-controller-manager:v1.20.15 - isula rmi k8smx/kube-scheduler:v1.20.15 - isula rmi k8smx/kube-proxy:v1.20.15 - isula rmi k8smx/pause:3.2 - isula rmi k8smx/coredns:1.7.0 - isula rmi k8smx/etcd:3.4.13-0 - ``` - -5. View pulled images. - - ```shell - isula images - ``` - -### Installing crictl - -```shell -yum install -y cri-tools -``` - -### Initializing the Master Node - -Initialize the master node. - -```shell -kubeadm init --kubernetes-version v1.20.2 --cri-socket=/var/run/isulad.sock --pod-network-cidr= -``` - -- `--kubernetes-version` indicates the current Kubernetes version. -- `--cri-socket` specifies the engine, that is, isulad. -- `--pod-network-cidr` specifies the IP address range of the pods. - -Enter the following commands as prompted: - -```shell -mkdir -p $HOME/.kube -sudo cp -i /etc/kubernetes/admin.conf $HOME/.kube/config -sudo chown $(id -u):$(id -g) $HOME/.kube/config -``` - -After the initialization, copy the last two lines of the output and run the copied commands on the nodes to add them to the master cluster. The commands can also be generated using the following command: - -```sh -kubeadm token create --print-join-command -``` - -### Adding Nodes - -Paste the `kubeadm join` command generated on Master, add `--cri-socket=/var/run/isulad.sock` before `discovery`. - -### Installing Calico Network Plugins - -1. Pull Calico images. - - Configure the Calico network plugins on the Master node and pull the required images on each node. - - ```shell - isula pull calico/node:v3.14.2 - isula pull calico/cni:v3.14.2 - isula pull calico/kube-controllers:v3.14.2 - isula pull calico/pod2daemon-flexvol:v3.14.2 - ``` - -2. Download the configuration file on Master. - - ```shell - wget https://docs.projectcalico.org/v3.14/manifests/calico.yaml - ``` - -3. Create a pod. - - ```shell - kubectl apply -f calico.yaml - ``` - - - If you want to delete the configuration file, run the following command: - - ```shell - kubectl delete -f calico.yaml - ``` - -4. View pod information. - - ```shell - kubectl get pod -A -o wide - ``` - -### Checking the Master Node Information - -```shell -kubectl get nodes -o wide -``` - -To reset a node, run the following command: - -```shell -kubeadm reset -``` +# iSulad+Kubernetes Environment Deployment + +## Preparing Cluster Servers + +Prepare at least 3 machines running openEuler 20.03 LTS or later versions. The following table lists information about the machines. + +| Host Name | IP Address | OS | Role | Component | +|-------|-------------|------------------------|----------|-----------| +| lab1 | 197.xxx.xxx.xxx | openEuler 20.03 LTS SP3 | Control node | iSulad/Kubernetes | +| lab2 | 197.xxx.xxx.xxx | openEuler 20.03 LTS SP3 | Worker node 1 | iSulad/Kubernetes | +| lab3 | 197.xxx.xxx.xxx | openEuler 20.03 LTS SP3 | Worker node 2 | iSulad/Kubernetes | + +## Preparing Images and Software Packages + +The following table lists software packages and images used in the example. The versions are for reference only. + +| Software | Version | +|------------------------------------|----------| +| iSulad | 2.0.17-2 | +| kubernetes-client | 1.20.2-9 | +| kubernetes-kubeadm | 1.20.2-9 | +| kubernetes-kubelet | 1.20.2-9 | + +| Image | Version | +|------------------------------------|----------| +| k8s.gcr.io/kube-proxy | v1.20.2 | +| k8s.gcr.io/kube-apiserver | v1.20.2 | +| k8s.gcr.io/kube-controller-manager | v1.20.2 | +| k8s.gcr.io/kube-scheduler | v1.20.2 | +| k8s.gcr.io/etcd | 3.4.13-0 | +| k8s.gcr.io/coredns | 1.7.0 | +| k8s.gcr.io/pause | 3.2 | +| calico/node | v3.14.2 | +| calico/pod2daemon-flexvol | v3.14.2 | +| calico/cni | v3.14.2 | +| calico/kube-controllers | v3.14.2 | + +> If you perform the deployment in without an Internet connection, download the software packages, dependencies, and images in advance. + +- Download software packages: +- Download images from Docker Hub: + +## Modifying the hosts File + +1. Change the host name of the machine, for example, **lab1**. + + ```shell + hostnamectl set-hostname lab1 + sudo -i + ``` + +2. Configure host name resolution by modifying the **/etc/hosts** file on each machine. + + ```shell + vim /etc/hosts + ``` + +3. Add the following content (IP address and host name) to the **hosts** file: + + ```text + 197.xxx.xxx.xxx lab1 + 197.xxx.xxx.xxx lab2 + 197.xxx.xxx.xxx lab3 + ``` + +## Preparing the Environment + +1. Disable the firewall/ + + ```shell + systemctl stop firewalld + systemctl disable firewalld + ``` + +2. Disable SELinux. + + ```shell + setenforce 0 + ``` + +3. Disable memory swapping. + + ```shell + swapoff -a + sed -ri 's/.*swap.*/#&/' /etc/fstab + ``` + +4. Configure the network and enable forwarding. + + ```shell + $ cat > /etc/sysctl.d/kubernetes.conf <" + ], + "pod-sandbox-image": "k8s.gcr.io/pause:3.2", + "native.umask": "normal", + "network-plugin": "cni", + "cni-bin-dir": "/opt/cni/bin", + "cni-conf-dir": "/etc/cni/net.d", + "image-layer-check": false, + "use-decrypted-key": true, + "insecure-skip-verify-enforce": false, + "cri-runtimes": { + "kata": "io.containerd.kata.v2" + } + } + ``` + +3. Restart the isulad service. + + ```shell + systemctl restart isulad + ``` + +### Loading the isulad Images + +1. Check the required system images. + + ```shell + kubeadm config images list + ``` + + Pay attention to the versions in the output, as shown in the figure. + ![](figures/1.view-required-images.png) + +2. Pull the images using the `isula` command. + + > [!NOTE]Note + > + > **Note**: The versions in the following commands are for reference only. Use the versions in the preceding output. + + ```shell + isula pull k8smx/kube-apiserver:v1.20.15 + isula pull k8smx/kube-controller-manager:v1.20.15 + isula pull k8smx/kube-scheduler:v1.20.15 + isula pull k8smx/kube-proxy:v1.20.15 + isula pull k8smx/pause:3.2 + isula pull k8smx/coredns:1.7.0 + isula pull k8smx/etcd:3.4.13-0 + ``` + +3. Modify the tags of the pulled images. + + ```shell + isula tag k8smx/kube-apiserver:v1.20.15 k8s.gcr.io/kube-apiserver:v1.20.15 + isula tag k8smx/kube-controller-manager:v1.20.15 k8s.gcr.io/kube-controller-manager:v1.20.15 + isula tag k8smx/kube-scheduler:v1.20.15 k8s.gcr.io/kube-scheduler:v1.20.15 + isula tag k8smx/kube-proxy:v1.20.15 k8s.gcr.io/kube-proxy:v1.20.15 + isula tag k8smx/pause:3.2 k8s.gcr.io/pause:3.2 + isula tag k8smx/coredns:1.7.0 k8s.gcr.io/coredns:1.7.0 + isula tag k8smx/etcd:3.4.13-0 k8s.gcr.io/etcd:3.4.13-0 + ``` + +4. Remove the old images. + + ```shell + isula rmi k8smx/kube-apiserver:v1.20.15 + isula rmi k8smx/kube-controller-manager:v1.20.15 + isula rmi k8smx/kube-scheduler:v1.20.15 + isula rmi k8smx/kube-proxy:v1.20.15 + isula rmi k8smx/pause:3.2 + isula rmi k8smx/coredns:1.7.0 + isula rmi k8smx/etcd:3.4.13-0 + ``` + +5. View pulled images. + + ```shell + isula images + ``` + +### Installing crictl + +```shell +yum install -y cri-tools +``` + +### Initializing the Master Node + +Initialize the master node. + +```shell +kubeadm init --kubernetes-version v1.20.2 --cri-socket=/var/run/isulad.sock --pod-network-cidr= +``` + +- `--kubernetes-version` indicates the current Kubernetes version. +- `--cri-socket` specifies the engine, that is, isulad. +- `--pod-network-cidr` specifies the IP address range of the pods. + +Enter the following commands as prompted: + +```shell +mkdir -p $HOME/.kube +sudo cp -i /etc/kubernetes/admin.conf $HOME/.kube/config +sudo chown $(id -u):$(id -g) $HOME/.kube/config +``` + +After the initialization, copy the last two lines of the output and run the copied commands on the nodes to add them to the master cluster. The commands can also be generated using the following command: + +```sh +kubeadm token create --print-join-command +``` + +### Adding Nodes + +Paste the `kubeadm join` command generated on Master, add `--cri-socket=/var/run/isulad.sock` before `discovery`. + +### Installing Calico Network Plugins + +1. Pull Calico images. + + Configure the Calico network plugins on the Master node and pull the required images on each node. + + ```shell + isula pull calico/node:v3.14.2 + isula pull calico/cni:v3.14.2 + isula pull calico/kube-controllers:v3.14.2 + isula pull calico/pod2daemon-flexvol:v3.14.2 + ``` + +2. Download the configuration file on Master. + + ```shell + wget https://docs.projectcalico.org/v3.14/manifests/calico.yaml + ``` + +3. Create a pod. + + ```shell + kubectl apply -f calico.yaml + ``` + + - If you want to delete the configuration file, run the following command: + + ```shell + kubectl delete -f calico.yaml + ``` + +4. View pod information. + + ```shell + kubectl get pod -A -o wide + ``` + +### Checking the Master Node Information + +```shell +kubectl get nodes -o wide +``` + +To reset a node, run the following command: + +```shell +kubeadm reset +``` diff --git a/docs/en/docs/cluster_deployment/isulad+k8s/overview.md b/docs/en/docs/cluster_deployment/isulad_k8s/overview.md similarity index 97% rename from docs/en/docs/cluster_deployment/isulad+k8s/overview.md rename to docs/en/docs/cluster_deployment/isulad_k8s/overview.md index d37bdb7..0a06329 100644 --- a/docs/en/docs/cluster_deployment/isulad+k8s/overview.md +++ b/docs/en/docs/cluster_deployment/isulad_k8s/overview.md @@ -1,23 +1,23 @@ -# iSulad + Kubernetes Cluster Deployment Guide - -This document outlines the process of deploying a Kubernetes cluster with kubeadm on the openEuler OS, configuring a Kubernetes + iSulad environment, and setting up gitlab-runner. It serves as a comprehensive guide for creating a native openEuler development environment cluster. - -The guide addresses two primary scenarios: - -**Scenario 1**: A complete walkthrough for establishing a native openEuler development CI/CD pipeline from scratch using gitlab-ci. -**Scenario 2**: Instructions for integrating an existing native openEuler development execution machine cluster into gitlab-ci. - -For scenario 1, the following steps are required: - -1. Set up the Kubernetes + iSulad environment. -2. Deploy GitLab. -3. Install and test gitlab-runner. - -For scenario 2, where a gitlab-ci platform is already available, the process involves: - -1. Configure the Kubernetes + iSulad environment. -2. Install and test gitlab-runner. - -> [!NOTE] Note -> -> All operations described in this document must be executed with root privileges. +# iSulad + Kubernetes Cluster Deployment Guide + +This document outlines the process of deploying a Kubernetes cluster with kubeadm on the openEuler OS, configuring a Kubernetes + iSulad environment, and setting up gitlab-runner. It serves as a comprehensive guide for creating a native openEuler development environment cluster. + +The guide addresses two primary scenarios: + +**Scenario 1**: A complete walkthrough for establishing a native openEuler development CI/CD pipeline from scratch using gitlab-ci. +**Scenario 2**: Instructions for integrating an existing native openEuler development execution machine cluster into gitlab-ci. + +For scenario 1, the following steps are required: + +1. Set up the Kubernetes + iSulad environment. +2. Deploy GitLab. +3. Install and test gitlab-runner. + +For scenario 2, where a gitlab-ci platform is already available, the process involves: + +1. Configure the Kubernetes + iSulad environment. +2. Install and test gitlab-runner. + +> [!NOTE] Note +> +> All operations described in this document must be executed with root privileges. diff --git a/docs/en/docs/cluster_deployment/kubernetes/kubernetes_containerd.md b/docs/en/docs/cluster_deployment/kubernetes/kubernetes_containerd.md index 30f327f..ff4719e 100644 --- a/docs/en/docs/cluster_deployment/kubernetes/kubernetes_containerd.md +++ b/docs/en/docs/cluster_deployment/kubernetes/kubernetes_containerd.md @@ -265,7 +265,7 @@ Use `kubectl apply` to deploy the **kube-flannel.yml** file downloaded during th kubectl apply -f kube-flannel.yml ``` -> ![Note](./public_sys-resources/icon-note.gif)**Note** +> [!NOTE]Note > > The control plane may have taint issues, causing the node status in `kubectl get nodes` to remain "not ready." Refer to the [official documentation](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) to remove taints. diff --git a/docs/en/docs/cluster_deployment/kubernetes/public_sys-resources/icon-note.gif b/docs/en/docs/cluster_deployment/kubernetes/public_sys-resources/icon-note.gif deleted file mode 100644 index 6314297e45c1de184204098efd4814d6dc8b1cda..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 394 zcmZ?wbhEHblx7fPSjxcg=ii?@_wH=jwxy=7CMGH-B`L+l$wfv=#>UF#$gv|VY%C^b zCQFtrnKN(Bo_%|sJbO}7RAORe!otL&qo<>yq_Sq+8Xqqo5h0P3w3Lvb5E(g{p01vl zxR@)KuDH0l^z`+-dH3eaw=XqSH7aTIx{kzVBN;X&hha0dQSgWuiw0NWUvMRmkD|> diff --git a/docs/en/docs/container_engine/isula_container_engine/container_resource_management.md b/docs/en/docs/container_engine/isula_container_engine/container_resource_management.md index 5fdd16d..3e94dd3 100644 --- a/docs/en/docs/container_engine/isula_container_engine/container_resource_management.md +++ b/docs/en/docs/container_engine/isula_container_engine/container_resource_management.md @@ -609,7 +609,7 @@ Use either of the following methods to configure ulimit: 2. Use daemon parameters or configuration files. - For details, see **--default-ulimits** in [Configuration Mode](installation-configuration.md#configuration-mode). + For details, see **--default-ulimits** in [Configuration Mode](installation_configuration.md#configuration-mode). **--ulimit** can limit the following types of resources: diff --git a/docs/en/docs/container_engine/isula_container_engine/installation_configuration.md b/docs/en/docs/container_engine/isula_container_engine/installation_configuration.md index 54588f5..3e4cb4b 100644 --- a/docs/en/docs/container_engine/isula_container_engine/installation_configuration.md +++ b/docs/en/docs/container_engine/isula_container_engine/installation_configuration.md @@ -852,7 +852,7 @@ To use the devicemapper storage driver, you need to configure a thinpool device 2. Modify configuration files. Two configuration methods are provided. Select one based on site requirements. - - Edit the **/etc/isulad/daemon.json** file, set **storage-driver** to **devicemapper**, and set parameters related to the **storage-opts** field. For details about related parameters, see [Parameter Description](#en-us_topic_0222861454_section1712923715282). The following lists the configuration reference: + - Edit the **/etc/isulad/daemon.json** file, set **storage-driver** to **devicemapper**, and set parameters related to the **storage-opts** field. For details about related parameters, see [Parameter Description](#parameter-description). The following lists the configuration reference: ```json { @@ -865,7 +865,7 @@ To use the devicemapper storage driver, you need to configure a thinpool device } ``` - - Edit **/etc/sysconfig/iSulad** to explicitly specify related iSulad startup parameters. For details about related parameters, see [Parameter Description](#en-us_topic_0222861454_section1712923715282). The following lists the configuration reference: + - Edit **/etc/sysconfig/iSulad** to explicitly specify related iSulad startup parameters. For details about related parameters, see [Parameter Description](#parameter-description). The following lists the configuration reference: ```ini OPTIONS="--storage-driver=devicemapper --storage-opt dm.thinpooldev=/dev/mapper/isula-thinpool --storage-opt dm.fs=ext4 --storage-opt dm.min_free_space=10%" diff --git a/docs/en/docs/container_engine/isula_container_engine/interconnection_with_the_cni_network.md b/docs/en/docs/container_engine/isula_container_engine/interconnection_with_the_cni_network.md index 765293d..65b3f3b 100644 --- a/docs/en/docs/container_engine/isula_container_engine/interconnection_with_the_cni_network.md +++ b/docs/en/docs/container_engine/isula_container_engine/interconnection_with_the_cni_network.md @@ -75,8 +75,8 @@ The following is an example of the CNI network configuration method: The CNI network configuration includes two types, both of which are in the .json file format. -- Single-network plane configuration file with the file name extension .conf or .json. For details about the configuration items, see [Table 1](#cni-parameters.md#en-us_topic_0184347952_table425023335913) in the appendix. -- Multi-network plane configuration file with the file name extension .conflist. For details about the configuration items, see [Table 3](#cni-parameters.md#en-us_topic_0184347952_table657910563105) in the appendix. +- Single-network plane configuration file with the file name extension .conf or .json. For details about the configuration items, see [Table 1](appendix.md#en-us-topic-0184347952-table425023335913) in the appendix. +- Multi-network plane configuration file with the file name extension .conflist. For details about the configuration items, see [Table 3](appendix.md#en-us_topic_0184347952_table657910563105) in the appendix. ### Adding a Pod to the CNI Network List diff --git a/docs/en/docs/container_form/secure_container/installation_and_deployment_2.md b/docs/en/docs/container_form/secure_container/installation_and_deployment_2.md index 10a75a9..7aebd15 100644 --- a/docs/en/docs/container_form/secure_container/installation_and_deployment_2.md +++ b/docs/en/docs/container_form/secure_container/installation_and_deployment_2.md @@ -92,7 +92,7 @@ The Kata container provides a global configuration file configuration.toml. User In the **runtimeArges** field of Docker engine, you can use **--kata-config** to specify a private file. The default configuration file path is **/usr/share/defaults/kata-containers/configuration.toml**. -The following lists the common fields in the configuration file. For details about the configuration file options, see [configuration.toml](./appendix_2.md#configurationtoml). +The following lists the common fields in the configuration file. For details about the configuration file options, see [configuration.toml](./appendix_2.md#configuration-toml). 1. hypervisor.qemu - **path**: specifies the execution path of the virtualization QEMU. diff --git a/docs/en/docs/container_runtime/kuasar/kuasar_install_config.md b/docs/en/docs/container_runtime/kuasar/kuasar_install_config.md index 05bff40..ebf148e 100644 --- a/docs/en/docs/container_runtime/kuasar/kuasar_install_config.md +++ b/docs/en/docs/container_runtime/kuasar/kuasar_install_config.md @@ -7,7 +7,7 @@ - To obtain better performance experience, Kuasar must run on bare metal servers. **Currently, Kuasar cannot run on VMs.** - The running of Kuasar depends on the following openEuler components. Ensure that the dependent components of the required versions have been installed in the environment. - iSulad (See [Installation and Configuration](../../container_engine/isula_container_engine/installation_configuration.md) of iSulad.) - - StratoVirt (See [Installing StratoVirt](https://docs.openeuler.org/en/docs/24.03_LTS_SP2/virtualization/virtualization_platform/stratovirt/install_stratovirt.html)) + - StratoVirt (See [Installing StratoVirt](https://docs.openeuler.openatom.cn/en/docs/24.03_LTS_SP2/virtualization/virtulization_platform/stratovirt/install_stratovirt.html)) ### Procedure diff --git a/docs/en/docs/hybrid_deployment/rubik/overview.md b/docs/en/docs/hybrid_deployment/rubik/overview.md index c3b63e8..5f2c632 100644 --- a/docs/en/docs/hybrid_deployment/rubik/overview.md +++ b/docs/en/docs/hybrid_deployment/rubik/overview.md @@ -16,7 +16,7 @@ Rubik supports the following features: - [Flexible Bandwidth](./feature_introduction.md#flexible-bandwidth) - [quotaTurbo User-Mode Solution](./feature_introduction.md#quotaburst-kernel-mode-solution) - [quotaTurbo Configuration](./feature_introduction.md#quotaturbo-user-mode-solution) -- [I/O Weight Control Based on ioCost](./feature_introduction.md#io-weight-control-based-on-iocost) +- [I/O Weight Control Based on ioCost](./feature_introduction.md#i-o-weight-control-based-on-iocost) - [Interference Detection Based on Pressure Stall Information Metrics](./feature_introduction.md#interference-detection-based-on-pressure-stall-information-metrics) - [CPU Eviction Watermark Control](./feature_introduction.md#cpu-eviction-watermark-control) - [Memory Eviction Watermark Control](./feature_introduction.md#memory-eviction-watermark-control) diff --git a/docs/en/docs/kubeos/kubeos/installation_and_deployment.md b/docs/en/docs/kubeos/kubeos/installation_and_deployment.md index 3fdbdb2..f868bdb 100644 --- a/docs/en/docs/kubeos/kubeos/installation_and_deployment.md +++ b/docs/en/docs/kubeos/kubeos/installation_and_deployment.md @@ -38,8 +38,8 @@ To install KubeOS, perform the following steps: # yum install KubeOS KubeOS-scripts -y ``` -> ![Note](./public_sys-resources/icon-note.gif)**Note**: -> +> [!NOTE]Note +> > KubeOS is installed in the **/opt/kubeOS** directory, including the os-operator, os-proxy, os-agent binary files, KubeOS image build tools, and corresponding configuration files. ## KubeOS Deployment diff --git a/docs/en/docs/kubeos/kubeos/public_sys-resources/icon-note.gif b/docs/en/docs/kubeos/kubeos/public_sys-resources/icon-note.gif deleted file mode 100644 index 6314297e45c1de184204098efd4814d6dc8b1cda..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 394 zcmZ?wbhEHblx7fPSjxcg=ii?@_wH=jwxy=7CMGH-B`L+l$wfv=#>UF#$gv|VY%C^b zCQFtrnKN(Bo_%|sJbO}7RAORe!otL&qo<>yq_Sq+8Xqqo5h0P3w3Lvb5E(g{p01vl zxR@)KuDH0l^z`+-dH3eaw=XqSH7aTIx{kzVBN;X&hha0dQSgWuiw0NWUvMRmkD|> diff --git a/docs/en/docs/nestos/nestos/nestos_for_container.md b/docs/en/docs/nestos/nestos/nestos_for_container.md index 3be61b8..69c074e 100644 --- a/docs/en/docs/nestos/nestos/nestos_for_container.md +++ b/docs/en/docs/nestos/nestos/nestos_for_container.md @@ -48,7 +48,7 @@ NestOS serves as an ideal foundation for cloud environments centered around cont (1) Obtain the nestos-assembler container image. -You are advised the openEuler-based base image. For additional details, see [Section 6.1](#61-nestos-assembler-container-image-creation). +You are advised the openEuler-based base image. For additional details, see [Section 6.1](#_6-1-nestos-assembler-container-image-creation). ```shell docker pull hub.oepkgs.net/nestos/nestos-assembler:24.03-LTS.20240903.0-aarch64 @@ -80,7 +80,7 @@ nosa init https://gitee.com/openeuler/nestos-config (4) Adjust build configurations. -nestos-config provides default build configurations, so no additional steps are required. For customization, refer to [Section 5](#5-build-configuration-nestos-config). +nestos-config provides default build configurations, so no additional steps are required. For customization, refer to [Section 5](#_5-build-configuration-nestos-config). (5) Build NestOS images. @@ -95,7 +95,7 @@ nosa buildextend-metal4k nosa buildextend-live ``` -For detailed build and deployment steps, refer to [Section 6](#6-build-process). +For detailed build and deployment steps, refer to [Section 6](#_6-build-process). ### 3.2 Quick Deployment @@ -105,7 +105,7 @@ Using the NestOS ISO image as an example, boot into the live environment and exe sudo installnestos ``` -For alternative deployment methods, see [Section 8](#8-deployment-process). +For alternative deployment methods, see [Section 8](#_8-deployment-process). ## 4. Default Configuration @@ -138,7 +138,7 @@ The repository for nestos-config is located at UF#$gv|VY%C^b zCQFtrnKN(Bo_%|sJbO}7RAORe!otL&qo<>yq_Sq+8Xqqo5h0P3w3Lvb5E(g{p01vl zxR@)KuDH0l^z`+-dH3eaw=XqSH7aTIx{kzVBN;X&hha0dQSgWuiw0NWUvMRmkD|> diff --git a/docs/zh/docs/cluster_deployment/isulad+k8s/_toc.yaml b/docs/zh/docs/cluster_deployment/isulad_k8s/_toc.yaml similarity index 88% rename from docs/zh/docs/cluster_deployment/isulad+k8s/_toc.yaml rename to docs/zh/docs/cluster_deployment/isulad_k8s/_toc.yaml index a8afc89..f5545ed 100644 --- a/docs/zh/docs/cluster_deployment/isulad+k8s/_toc.yaml +++ b/docs/zh/docs/cluster_deployment/isulad_k8s/_toc.yaml @@ -5,7 +5,7 @@ sections: - label: 概述 href: ./overview.md - label: iSulad+k8s环境部署 - href: ./isulad+k8s_environment_deploy.md + href: ./isulad_k8s_environment_deploy.md - label: gitlab部署 href: ./gitlab_deploy.md - label: gitlab runner部署 diff --git "a/docs/zh/docs/cluster_deployment/isulad+k8s/figures/1.\346\237\245\347\234\213\351\234\200\350\246\201\351\225\234\345\203\217.png" "b/docs/zh/docs/cluster_deployment/isulad_k8s/figures/1.\346\237\245\347\234\213\351\234\200\350\246\201\351\225\234\345\203\217.png" similarity index 100% rename from "docs/zh/docs/cluster_deployment/isulad+k8s/figures/1.\346\237\245\347\234\213\351\234\200\350\246\201\351\225\234\345\203\217.png" rename to "docs/zh/docs/cluster_deployment/isulad_k8s/figures/1.\346\237\245\347\234\213\351\234\200\350\246\201\351\225\234\345\203\217.png" diff --git "a/docs/zh/docs/cluster_deployment/isulad+k8s/figures/10.\350\207\252\345\256\232\344\271\211\351\241\271\347\233\256\345\220\215\347\247\260.jpg" "b/docs/zh/docs/cluster_deployment/isulad_k8s/figures/10.\350\207\252\345\256\232\344\271\211\351\241\271\347\233\256\345\220\215\347\247\260.jpg" similarity index 100% rename from "docs/zh/docs/cluster_deployment/isulad+k8s/figures/10.\350\207\252\345\256\232\344\271\211\351\241\271\347\233\256\345\220\215\347\247\260.jpg" rename to "docs/zh/docs/cluster_deployment/isulad_k8s/figures/10.\350\207\252\345\256\232\344\271\211\351\241\271\347\233\256\345\220\215\347\247\260.jpg" diff --git "a/docs/zh/docs/cluster_deployment/isulad+k8s/figures/11.\350\256\276\347\275\256-cicd-runner.png" "b/docs/zh/docs/cluster_deployment/isulad_k8s/figures/11.\350\256\276\347\275\256-cicd-runner.png" similarity index 100% rename from "docs/zh/docs/cluster_deployment/isulad+k8s/figures/11.\350\256\276\347\275\256-cicd-runner.png" rename to "docs/zh/docs/cluster_deployment/isulad_k8s/figures/11.\350\256\276\347\275\256-cicd-runner.png" diff --git "a/docs/zh/docs/cluster_deployment/isulad+k8s/figures/12.\350\256\260\344\270\213runner\345\234\260\345\235\200\344\270\216\344\273\244\347\211\214.jpg" "b/docs/zh/docs/cluster_deployment/isulad_k8s/figures/12.\350\256\260\344\270\213runner\345\234\260\345\235\200\344\270\216\344\273\244\347\211\214.jpg" similarity index 100% rename from "docs/zh/docs/cluster_deployment/isulad+k8s/figures/12.\350\256\260\344\270\213runner\345\234\260\345\235\200\344\270\216\344\273\244\347\211\214.jpg" rename to "docs/zh/docs/cluster_deployment/isulad_k8s/figures/12.\350\256\260\344\270\213runner\345\234\260\345\235\200\344\270\216\344\273\244\347\211\214.jpg" diff --git "a/docs/zh/docs/cluster_deployment/isulad+k8s/figures/13.\346\237\245\347\234\213\350\257\201\344\271\246\351\205\215\347\275\256\346\226\207\344\273\266.png" "b/docs/zh/docs/cluster_deployment/isulad_k8s/figures/13.\346\237\245\347\234\213\350\257\201\344\271\246\351\205\215\347\275\256\346\226\207\344\273\266.png" similarity index 100% rename from "docs/zh/docs/cluster_deployment/isulad+k8s/figures/13.\346\237\245\347\234\213\350\257\201\344\271\246\351\205\215\347\275\256\346\226\207\344\273\266.png" rename to "docs/zh/docs/cluster_deployment/isulad_k8s/figures/13.\346\237\245\347\234\213\350\257\201\344\271\246\351\205\215\347\275\256\346\226\207\344\273\266.png" diff --git "a/docs/zh/docs/cluster_deployment/isulad+k8s/figures/14.\350\257\201\344\271\246\345\257\274\345\205\245\346\226\207\344\273\266.png" "b/docs/zh/docs/cluster_deployment/isulad_k8s/figures/14.\350\257\201\344\271\246\345\257\274\345\205\245\346\226\207\344\273\266.png" similarity index 100% rename from "docs/zh/docs/cluster_deployment/isulad+k8s/figures/14.\350\257\201\344\271\246\345\257\274\345\205\245\346\226\207\344\273\266.png" rename to "docs/zh/docs/cluster_deployment/isulad_k8s/figures/14.\350\257\201\344\271\246\345\257\274\345\205\245\346\226\207\344\273\266.png" diff --git "a/docs/zh/docs/cluster_deployment/isulad+k8s/figures/15.\346\263\250\345\206\214gitlab-runner.jpg" "b/docs/zh/docs/cluster_deployment/isulad_k8s/figures/15.\346\263\250\345\206\214gitlab-runner.jpg" similarity index 100% rename from "docs/zh/docs/cluster_deployment/isulad+k8s/figures/15.\346\263\250\345\206\214gitlab-runner.jpg" rename to "docs/zh/docs/cluster_deployment/isulad_k8s/figures/15.\346\263\250\345\206\214gitlab-runner.jpg" diff --git "a/docs/zh/docs/cluster_deployment/isulad+k8s/figures/16.web\347\253\257\345\267\262\345\212\240\345\205\245_LI.jpg" "b/docs/zh/docs/cluster_deployment/isulad_k8s/figures/16.web\347\253\257\345\267\262\345\212\240\345\205\245_LI.jpg" similarity index 100% rename from "docs/zh/docs/cluster_deployment/isulad+k8s/figures/16.web\347\253\257\345\267\262\345\212\240\345\205\245_LI.jpg" rename to "docs/zh/docs/cluster_deployment/isulad_k8s/figures/16.web\347\253\257\345\267\262\345\212\240\345\205\245_LI.jpg" diff --git a/docs/zh/docs/cluster_deployment/isulad+k8s/figures/17.png b/docs/zh/docs/cluster_deployment/isulad_k8s/figures/17.png similarity index 100% rename from docs/zh/docs/cluster_deployment/isulad+k8s/figures/17.png rename to docs/zh/docs/cluster_deployment/isulad_k8s/figures/17.png diff --git "a/docs/zh/docs/cluster_deployment/isulad+k8s/figures/18.dns\351\205\215\347\275\256.png" "b/docs/zh/docs/cluster_deployment/isulad_k8s/figures/18.dns\351\205\215\347\275\256.png" similarity index 100% rename from "docs/zh/docs/cluster_deployment/isulad+k8s/figures/18.dns\351\205\215\347\275\256.png" rename to "docs/zh/docs/cluster_deployment/isulad_k8s/figures/18.dns\351\205\215\347\275\256.png" diff --git "a/docs/zh/docs/cluster_deployment/isulad+k8s/figures/19.CICD\347\225\214\351\235\242.png" "b/docs/zh/docs/cluster_deployment/isulad_k8s/figures/19.CICD\347\225\214\351\235\242.png" similarity index 100% rename from "docs/zh/docs/cluster_deployment/isulad+k8s/figures/19.CICD\347\225\214\351\235\242.png" rename to "docs/zh/docs/cluster_deployment/isulad_k8s/figures/19.CICD\347\225\214\351\235\242.png" diff --git "a/docs/zh/docs/cluster_deployment/isulad+k8s/figures/2.calico\351\205\215\347\275\256.png" "b/docs/zh/docs/cluster_deployment/isulad_k8s/figures/2.calico\351\205\215\347\275\256.png" similarity index 100% rename from "docs/zh/docs/cluster_deployment/isulad+k8s/figures/2.calico\351\205\215\347\275\256.png" rename to "docs/zh/docs/cluster_deployment/isulad_k8s/figures/2.calico\351\205\215\347\275\256.png" diff --git "a/docs/zh/docs/cluster_deployment/isulad+k8s/figures/20.yaml\346\226\207\344\273\266.png" "b/docs/zh/docs/cluster_deployment/isulad_k8s/figures/20.yaml\346\226\207\344\273\266.png" similarity index 100% rename from "docs/zh/docs/cluster_deployment/isulad+k8s/figures/20.yaml\346\226\207\344\273\266.png" rename to "docs/zh/docs/cluster_deployment/isulad_k8s/figures/20.yaml\346\226\207\344\273\266.png" diff --git "a/docs/zh/docs/cluster_deployment/isulad+k8s/figures/21.\346\265\201\346\260\264\347\272\277\347\212\266\346\200\201.png" "b/docs/zh/docs/cluster_deployment/isulad_k8s/figures/21.\346\265\201\346\260\264\347\272\277\347\212\266\346\200\201.png" similarity index 100% rename from "docs/zh/docs/cluster_deployment/isulad+k8s/figures/21.\346\265\201\346\260\264\347\272\277\347\212\266\346\200\201.png" rename to "docs/zh/docs/cluster_deployment/isulad_k8s/figures/21.\346\265\201\346\260\264\347\272\277\347\212\266\346\200\201.png" diff --git a/docs/zh/docs/cluster_deployment/isulad+k8s/figures/3.png b/docs/zh/docs/cluster_deployment/isulad_k8s/figures/3.png similarity index 100% rename from docs/zh/docs/cluster_deployment/isulad+k8s/figures/3.png rename to docs/zh/docs/cluster_deployment/isulad_k8s/figures/3.png diff --git "a/docs/zh/docs/cluster_deployment/isulad+k8s/figures/4.gitlab\347\275\221\351\241\265\345\205\245\345\217\243.jpg" "b/docs/zh/docs/cluster_deployment/isulad_k8s/figures/4.gitlab\347\275\221\351\241\265\345\205\245\345\217\243.jpg" similarity index 100% rename from "docs/zh/docs/cluster_deployment/isulad+k8s/figures/4.gitlab\347\275\221\351\241\265\345\205\245\345\217\243.jpg" rename to "docs/zh/docs/cluster_deployment/isulad_k8s/figures/4.gitlab\347\275\221\351\241\265\345\205\245\345\217\243.jpg" diff --git "a/docs/zh/docs/cluster_deployment/isulad+k8s/figures/5.\346\237\245\350\257\242\345\257\206\347\240\201.jpg" "b/docs/zh/docs/cluster_deployment/isulad_k8s/figures/5.\346\237\245\350\257\242\345\257\206\347\240\201.jpg" similarity index 100% rename from "docs/zh/docs/cluster_deployment/isulad+k8s/figures/5.\346\237\245\350\257\242\345\257\206\347\240\201.jpg" rename to "docs/zh/docs/cluster_deployment/isulad_k8s/figures/5.\346\237\245\350\257\242\345\257\206\347\240\201.jpg" diff --git "a/docs/zh/docs/cluster_deployment/isulad+k8s/figures/6.\347\231\273\345\275\225\345\220\216\351\241\265\351\235\242.png" "b/docs/zh/docs/cluster_deployment/isulad_k8s/figures/6.\347\231\273\345\275\225\345\220\216\351\241\265\351\235\242.png" similarity index 100% rename from "docs/zh/docs/cluster_deployment/isulad+k8s/figures/6.\347\231\273\345\275\225\345\220\216\351\241\265\351\235\242.png" rename to "docs/zh/docs/cluster_deployment/isulad_k8s/figures/6.\347\231\273\345\275\225\345\220\216\351\241\265\351\235\242.png" diff --git "a/docs/zh/docs/cluster_deployment/isulad+k8s/figures/7.\351\225\234\345\203\217.png" "b/docs/zh/docs/cluster_deployment/isulad_k8s/figures/7.\351\225\234\345\203\217.png" similarity index 100% rename from "docs/zh/docs/cluster_deployment/isulad+k8s/figures/7.\351\225\234\345\203\217.png" rename to "docs/zh/docs/cluster_deployment/isulad_k8s/figures/7.\351\225\234\345\203\217.png" diff --git "a/docs/zh/docs/cluster_deployment/isulad+k8s/figures/8.\346\226\260\345\273\272\351\241\271\347\233\256.png" "b/docs/zh/docs/cluster_deployment/isulad_k8s/figures/8.\346\226\260\345\273\272\351\241\271\347\233\256.png" similarity index 100% rename from "docs/zh/docs/cluster_deployment/isulad+k8s/figures/8.\346\226\260\345\273\272\351\241\271\347\233\256.png" rename to "docs/zh/docs/cluster_deployment/isulad_k8s/figures/8.\346\226\260\345\273\272\351\241\271\347\233\256.png" diff --git "a/docs/zh/docs/cluster_deployment/isulad+k8s/figures/9.\345\210\233\345\273\272\347\251\272\347\231\275\351\241\271\347\233\256.png" "b/docs/zh/docs/cluster_deployment/isulad_k8s/figures/9.\345\210\233\345\273\272\347\251\272\347\231\275\351\241\271\347\233\256.png" similarity index 100% rename from "docs/zh/docs/cluster_deployment/isulad+k8s/figures/9.\345\210\233\345\273\272\347\251\272\347\231\275\351\241\271\347\233\256.png" rename to "docs/zh/docs/cluster_deployment/isulad_k8s/figures/9.\345\210\233\345\273\272\347\251\272\347\231\275\351\241\271\347\233\256.png" diff --git a/docs/zh/docs/cluster_deployment/isulad+k8s/gitlab_deploy.md b/docs/zh/docs/cluster_deployment/isulad_k8s/gitlab_deploy.md similarity index 100% rename from docs/zh/docs/cluster_deployment/isulad+k8s/gitlab_deploy.md rename to docs/zh/docs/cluster_deployment/isulad_k8s/gitlab_deploy.md diff --git a/docs/zh/docs/cluster_deployment/isulad+k8s/gitlab_runner_deploy.md b/docs/zh/docs/cluster_deployment/isulad_k8s/gitlab_runner_deploy.md similarity index 100% rename from docs/zh/docs/cluster_deployment/isulad+k8s/gitlab_runner_deploy.md rename to docs/zh/docs/cluster_deployment/isulad_k8s/gitlab_runner_deploy.md diff --git a/docs/zh/docs/cluster_deployment/isulad+k8s/isulad+k8s_environment_deploy.md b/docs/zh/docs/cluster_deployment/isulad_k8s/isulad_k8s_environment_deploy.md similarity index 100% rename from docs/zh/docs/cluster_deployment/isulad+k8s/isulad+k8s_environment_deploy.md rename to docs/zh/docs/cluster_deployment/isulad_k8s/isulad_k8s_environment_deploy.md diff --git a/docs/zh/docs/cluster_deployment/isulad+k8s/overview.md b/docs/zh/docs/cluster_deployment/isulad_k8s/overview.md similarity index 100% rename from docs/zh/docs/cluster_deployment/isulad+k8s/overview.md rename to docs/zh/docs/cluster_deployment/isulad_k8s/overview.md diff --git a/docs/zh/docs/cluster_deployment/kubernetes/_toc.yaml b/docs/zh/docs/cluster_deployment/kubernetes/_toc.yaml index aef523f..12820f8 100644 --- a/docs/zh/docs/cluster_deployment/kubernetes/_toc.yaml +++ b/docs/zh/docs/cluster_deployment/kubernetes/_toc.yaml @@ -7,7 +7,7 @@ sections: - label: 准备虚拟机 href: ./preparing_vms.md - label: 手动部署集群 - href: ./deploying_a_kubernets_cluster_manually.md + href: ./deploying_a_kubernetes_cluster_manually.md sections: - label: 安装Kubernetes软件包 href: ./installing_the_kubernetes_software_package.md @@ -31,5 +31,4 @@ sections: - label: 运行测试pod href: ./running_the_test_pod.md - label: 基于containerd部署集群 - href: ./kubernetes-containerd.md - + href: ./kubernetes_containerd.md diff --git a/docs/zh/docs/cluster_deployment/kubernetes/deploying_a_kubernets_cluster_manually.md b/docs/zh/docs/cluster_deployment/kubernetes/deploying_a_kubernetes_cluster_manually.md similarity index 100% rename from docs/zh/docs/cluster_deployment/kubernetes/deploying_a_kubernets_cluster_manually.md rename to docs/zh/docs/cluster_deployment/kubernetes/deploying_a_kubernetes_cluster_manually.md diff --git a/docs/zh/docs/cluster_deployment/kubernetes/kubernetes-containerd.md b/docs/zh/docs/cluster_deployment/kubernetes/kubernetes_containerd.md similarity index 99% rename from docs/zh/docs/cluster_deployment/kubernetes/kubernetes-containerd.md rename to docs/zh/docs/cluster_deployment/kubernetes/kubernetes_containerd.md index 3c5ec7a..793e136 100644 --- a/docs/zh/docs/cluster_deployment/kubernetes/kubernetes-containerd.md +++ b/docs/zh/docs/cluster_deployment/kubernetes/kubernetes_containerd.md @@ -213,7 +213,7 @@ $ vim kubeletConfig.yaml 在kubeletConfig.yaml文件中，配置节点名称、广播地址（advertiseAddress）以及Pod网络的CIDR。
-**修改name为主机名，与环境配置[第一步](#1-设置主机名)一致：** +**修改name为主机名，与环境配置[第一步](#_1-设置主机名)一致：**
![](./figures/name.png)
diff --git a/docs/zh/docs/container_engine/docker_engine/container_management_1.md b/docs/zh/docs/container_engine/docker_engine/container_management_1.md index 2ee3395..850573c 100644 --- a/docs/zh/docs/container_engine/docker_engine/container_management_1.md +++ b/docs/zh/docs/container_engine/docker_engine/container_management_1.md @@ -288,7 +288,7 @@ docker run --name=container_registry -d -p 5000:5000 registry ### 原理及使用场景 -docker支持hook的扩展特性，hook应用与底层runc的执行过程中，遵循OCI标准：[https://github.com/opencontainers/runtime-spec/blob/main/config.md\#hooks](#https://github.com/opencontainers/runtime-spec/blob/main/config.md#hooks) 。 +docker支持hook的扩展特性，hook应用与底层runc的执行过程中，遵循OCI标准：[https://github.com/opencontainers/runtime-spec/blob/main/config.md\#hooks](https://github.com/opencontainers/runtime-spec/blob/main/config.md#hooks)。 hook主要有三种类型：prestart，poststart，poststop。分别作用于容器内用户应用程序启动之前，容器应用程序启动之后，容器应用程序停止之后。 diff --git a/docs/zh/docs/container_engine/docker_engine/installation_and_configuration_3.md b/docs/zh/docs/container_engine/docker_engine/installation_and_configuration_3.md index 0274ee3..b4fa2f0 100644 --- a/docs/zh/docs/container_engine/docker_engine/installation_and_configuration_3.md +++ b/docs/zh/docs/container_engine/docker_engine/installation_and_configuration_3.md @@ -52,7 +52,7 @@ docker启动容器时的默认umask值为0027，可以在dockerd启动时，使 > > 如果docker create/run也配置了native.umask参数，则以docker create/run中的配置为准。 -详细的配置见[docker create](./容器管理-4.md#create)和[docker run](./容器管理-4.md#run)章节的参数说明。 +详细的配置见[docker create](./container_management_2.md#create)和[docker run](./container_management_2.md#run)章节的参数说明。 ### daemon启动时间 diff --git a/docs/zh/docs/container_runtime/kuasar/_toc.yaml b/docs/zh/docs/container_runtime/kuasar/_toc.yaml index d665382..88c68d1 100644 --- a/docs/zh/docs/container_runtime/kuasar/_toc.yaml +++ b/docs/zh/docs/container_runtime/kuasar/_toc.yaml @@ -10,6 +10,6 @@ sections: - label: 使用指南 href: ./kuasar_usage.md - label: iSulad+Kuasar机密容器部署指南 - href: ./isulad+kuasar-confidential-containers-deployment-guide.md + href: ./isulad_kuasar_confidential_containers_deployment_guide.md - label: 附录 href: ./kuasar_appendix.md diff --git a/docs/zh/docs/container_runtime/kuasar/isulad+kuasar-confidential-containers-deployment-guide.md b/docs/zh/docs/container_runtime/kuasar/isulad_kuasar_confidential_containers_deployment_guide.md similarity index 100% rename from docs/zh/docs/container_runtime/kuasar/isulad+kuasar-confidential-containers-deployment-guide.md rename to docs/zh/docs/container_runtime/kuasar/isulad_kuasar_confidential_containers_deployment_guide.md diff --git a/docs/zh/docs/container_runtime/kuasar/kuasar_install_config.md b/docs/zh/docs/container_runtime/kuasar/kuasar_install_config.md index 416800f..d00623d 100644 --- a/docs/zh/docs/container_runtime/kuasar/kuasar_install_config.md +++ b/docs/zh/docs/container_runtime/kuasar/kuasar_install_config.md @@ -7,7 +7,7 @@ - 为了获取更好的性能体验，kuasar需要运行在裸金属服务器上，**暂不支持kuasar运行在虚拟机内**。 - kuasar运行依赖以下openEuler组件，请确保环境上已安装所需版本的依赖组件。 - iSulad（请参考iSula容器引擎的[安装与配置](../../container_engine/isula_container_engine/installation_configuration.md)章节安装iSulad） - - StratoVirt（请参考StratoVirt的[安装](https://docs.openeuler.org/zh/docs/24.03_LTS_SP2/virtualization/virtualization_platform/stratovirt/install_stratovirt.html)章节安装StratoVirt） + - StratoVirt（请参考StratoVirt的[安装](https://docs.openeuler.openatom.cn/zh/docs/24.03_LTS_SP2/virtualization/virtulization_platform/stratovirt/install_stratovirt.html)章节安装StratoVirt） ### 安装操作 diff --git a/docs/zh/docs/hybrid_deployment/rubik/feature_introduction.md b/docs/zh/docs/hybrid_deployment/rubik/feature_introduction.md index 5c7a805..c534767 100644 --- a/docs/zh/docs/hybrid_deployment/rubik/feature_introduction.md +++ b/docs/zh/docs/hybrid_deployment/rubik/feature_introduction.md @@ -146,9 +146,9 @@ dynCache 功能相关的配置如下： } ``` -配置参数详见[配置文档](./%E9%85%8D%E7%BD%AE%E6%96%87%E6%A1%A3.md#dyncache)。 +配置参数详见[配置文档](./configuration.md#dyncache)。 -- l3Percent 和 memBandPercent: +- l3Percent 和 memBandPercent： 通过 l3Percent 和 memBandPercent 配置 low, mid, high 控制组的水位线。 @@ -253,7 +253,7 @@ quotaTurbo 功能相关的配置如下： } ``` -配置参数详见[配置文档](./%E9%85%8D%E7%BD%AE%E6%96%87%E6%A1%A3.md#quotaturbo)。 +配置参数详见[配置文档](./configuration.md#quotaturbo)。 - highWaterMark是CPU负载的高水位值。 - alarmWaterMark是CPU负载的警戒水位值。 @@ -378,7 +378,7 @@ rubik 支持通过在 cgroup v1 下的 iocost 控制不同 Pod 的 io 权重分 }] ``` -配置参数详见[配置文档](./%E9%85%8D%E7%BD%AE%E6%96%87%E6%A1%A3.md#iocost)。 +配置参数详见[配置文档](./configuration.md#iocost)。 > [!NOTE]说明 > @@ -442,7 +442,7 @@ reboot } ``` -配置参数详见[配置文档](./%E9%85%8D%E7%BD%AE%E6%96%87%E6%A1%A3.md#psi)。 +配置参数详见[配置文档](./configuration.md#psi)。 ## CPU驱逐水位线控制 @@ -475,7 +475,7 @@ rubik支持通过根据节点CPU利用率驱逐离线Pod从而避免节点CPU资 } ``` -配置参数详见[配置文档](./%E9%85%8D%E7%BD%AE%E6%96%87%E6%A1%A3.md#cpu驱逐水位线控制)。 +配置参数详见[配置文档](./configuration.md#cpu驱逐水位线控制)。 ## 内存驱逐水位线控制 @@ -507,4 +507,4 @@ rubik支持通过根据节点内存利用率驱逐离线Pod从而避免节点内 } ``` -配置参数详见[配置文档](./%E9%85%8D%E7%BD%AE%E6%96%87%E6%A1%A3.md#内存驱逐水位线控制)。 +配置参数详见[配置文档](./configuration.md#内存驱逐水位线控制)。 diff --git a/docs/zh/docs/hybrid_deployment/rubik/overview.md b/docs/zh/docs/hybrid_deployment/rubik/overview.md index 54229a3..99b4cd5 100644 --- a/docs/zh/docs/hybrid_deployment/rubik/overview.md +++ b/docs/zh/docs/hybrid_deployment/rubik/overview.md @@ -8,18 +8,18 @@ rubik 容器调度在业务混合部署的场景下，根据 QoS 分级，对资 rubik 当前支持如下特性： -- [preemption 绝对抢占](./modules.md#preemption-绝对抢占) - - [CPU绝对抢占](./modules.md#cpu绝对抢占) - - [内存绝对抢占](./modules.md#内存绝对抢占) -- [dynCache 访存带宽和LLC限制](./modules.md#dyncache-访存带宽和llc限制) -- [dynMemory 内存异步分级回收](./modules.md#dynmemory-内存异步分级回收) -- [支持弹性限流](./modules.md#支持弹性限流) - - [quotaBurst 支持弹性限流内核态解决方案](./modules.md#quotaburst-内核态解决方案) - - [quotaTurbo 支持弹性限流用户态解决方案](./modules.md#quotaturbo-用户态解决方案) -- [ioCost 支持iocost对IO权重控制](./modules.md#iocost-支持iocost对io权重控制) -- [PSI 支持基于PSI指标的干扰检测](./modules.md#psi-支持基于psi指标的干扰检测) -- [CPU驱逐水位线控制](./modules.md#cpu驱逐水位线控制) -- [内存驱逐水位线控制](./modules.md#内存驱逐水位线控制) +- [preemption 绝对抢占](./feature_introduction.md#preemption-绝对抢占) + - [CPU绝对抢占](./feature_introduction.md#cpu绝对抢占) + - [内存绝对抢占](./feature_introduction.md#内存绝对抢占) +- [dynCache 访存带宽和LLC限制](./feature_introduction.md#dyncache-访存带宽和llc限制) +- [dynMemory 内存异步分级回收](./feature_introduction.md#dynmemory-内存异步分级回收) +- [支持弹性限流](./feature_introduction.md#支持弹性限流) + - [quotaBurst 支持弹性限流内核态解决方案](./feature_introduction.md#quotaburst-内核态解决方案) + - [quotaTurbo 支持弹性限流用户态解决方案](./feature_introduction.md#quotaturbo-用户态解决方案) +- [ioCost 支持iocost对IO权重控制](./feature_introduction.md#iocost-支持iocost对io权重控制) +- [PSI 支持基于PSI指标的干扰检测](./feature_introduction.md#psi-支持基于psi指标的干扰检测) +- [CPU驱逐水位线控制](./feature_introduction.md#cpu驱逐水位线控制) +- [内存驱逐水位线控制](./feature_introduction.md#内存驱逐水位线控制) 本文档适用于使用 openEuler 系统并希望了解和使用 rubik 的社区开发者、开源爱好者以及相关合作伙伴。使用人员需要具备以下经验和技能： diff --git a/docs/zh/docs/kubeos/kubeos/installation_and_deployment.md b/docs/zh/docs/kubeos/kubeos/installation_and_deployment.md index 84bc783..f9c1701 100644 --- a/docs/zh/docs/kubeos/kubeos/installation_and_deployment.md +++ b/docs/zh/docs/kubeos/kubeos/installation_and_deployment.md @@ -156,9 +156,9 @@ #### 注意事项 -* 请先部署 Kubernetes 集群，部署方法参考[《openEuler 24.03-LTS-SP1 Kubernetes 集群部署指南》](../../cluster_deployment/kubernetes/overview.md)。 +* 请先部署 Kubernetes 集群，部署方法参考[《openEuler 24.03-LTS-SP2 Kubernetes 集群部署指南》](../../cluster_deployment/kubernetes/overview.md)。 -* 集群中准备进行升级的 Worker 节点的 OS 需要为使用上一节方式制作出来的容器 OS，如不是，请用 system.qcow2重新部署虚拟机，虚拟机部署请见[《openEuler 24.03-LTS-SP1 虚拟化用户指南》](https://docs.openeuler.org/zh/docs/24.03_LTS_SP2/virtualization/virtualization_platform/stratovirt/stratovirt_introduction.html)，Master节点目前不支持容器 OS 升级，请用openEuler 24.03-LTS-SP1部署Master节点。 +* 集群中准备进行升级的 Worker 节点的 OS 需要为使用上一节方式制作出来的容器 OS，如不是，请用 system.qcow2重新部署虚拟机，虚拟机部署请见[《openEuler 24.03-LTS-SP2 虚拟化用户指南》](https://docs.openeuler.openatom.cn/zh/docs/24.03_LTS_SP2/virtualization/virtulization_platform/stratovirt/stratovirt_introduction.html)，Master节点目前不支持容器 OS 升级，请用openEuler 24.03-LTS-SP1部署Master节点。 * 部署 OS 的 CRD（CustomResourceDefinition），os-operator，os-proxy 以及 RBAC (Role-based access control) 机制的 YAML 需要用户自行编写。 * operator 和 proxy 部署在 kubernetes 集群中，operator 应部署为 deployment，proxy 应部署为daemonset。 * 尽量部署好 kubernetes 的安全措施，如 rbac 机制，pod 的 service account 和 security policy 配置等。 diff --git a/docs/zh/docs/kubeos/kubeos/kubeos_image_creation.md b/docs/zh/docs/kubeos/kubeos/kubeos_image_creation.md index e9b4ce4..aee8b30 100644 --- a/docs/zh/docs/kubeos/kubeos/kubeos_image_creation.md +++ b/docs/zh/docs/kubeos/kubeos/kubeos_image_creation.md @@ -89,7 +89,7 @@ Options: | primary_groups | [可选项] 用户主组(默认为用户同名组) | | groups | [可选项] 用户附加组 | -**注意**：添加用户会默认创建用户同名组，配置用户附加组时，若组不存在会报错失败。若有特殊配置需求，用户可通过[chroot_script](#chroot_script)脚本自行实现。 +**注意**：添加用户会默认创建用户同名组，配置用户附加组时，若组不存在会报错失败。若有特殊配置需求，用户可通过[chroot_script](#chroot-script)脚本自行实现。 #### copy_files @@ -101,7 +101,7 @@ Options: | src | 源文件路径 | | create_dir | [可选项]拷贝前创建文件夹 | -**注意**：拷贝文件无法保留权限，如果需要特殊权限，可借助[chroot_script](#chroot_script)脚本自行实现。 +**注意**：拷贝文件无法保留权限，如果需要特殊权限，可借助[chroot_script](#chroot-script)脚本自行实现。 #### grub @@ -273,7 +273,7 @@ version = "v1" #### 注意事项 * 制作出来的容器 OS 物理安装所需的镜像目前只能用于 CPU 架构为 x86 和 AArch64 的物理机安装。 -* `pxe_config`配置中指定的ip为安装时使用的临时ip,请在系统安装启动后请参考[《openEuler 24.03-LTS-SP1 管理员指南-配置网络》](https://docs.openeuler.org/zh/docs/24.03_LTS_SP2/server/network/network_config/network-configuration.html)进行网络配置。 +* `pxe_config`配置中指定的ip为安装时使用的临时ip，请在系统安装启动后请参考[《openEuler 24.03-LTS-SP2 管理员指南-配置网络》](https://docs.openeuler.org/zh/docs/24.03_LTS_SP2/server/network/network_config/network_configuration.html)进行网络配置。 * 不支持多个磁盘都安装KubeOS，可能会造成启动失败或挂载紊乱。 * 容器OS 目前不支持 x86 架构的物理机使用 legacy 启动模式启动。 * 使用默认rpmlist进行镜像制作时所需磁盘空间至少为5G，如自已定义 rpmlist 可能会超过5G。 @@ -282,7 +282,7 @@ version = "v1" #### 使用示例 -* 首先需要修改```kbimg.toml```中```pxe_config```的配置，对相关参数进行配置，详细参数可见[参数说明](#pxe_config)，ip目前仅支持ipv4，配置示例如下 +* 首先需要修改```kbimg.toml```中```pxe_config```的配置，对相关参数进行配置，详细参数可见[参数说明](#pxe-config)，ip目前仅支持ipv4，配置示例如下 ```toml [pxe_config] diff --git a/docs/zh/docs/kubeos/kubeos/usage_instructions.md b/docs/zh/docs/kubeos/kubeos/usage_instructions.md index 1d95780..8180c9c 100644 --- a/docs/zh/docs/kubeos/kubeos/usage_instructions.md +++ b/docs/zh/docs/kubeos/kubeos/usage_instructions.md @@ -61,8 +61,8 @@ | clientcert | string | https双向认证时使用的客户端证书文件 | 仅在使用https双向认证时有效|mtls为true时必选 | | clientkey | string | https双向认证时使用的客户端公钥 | 仅在使用https双向认证时有效|mtls为true时必选 | | evictpodforce | bool | 升级/回退时是否强制驱逐pod | 需为 true 或者 false ，仅在升级或者回退时有效| 必选 | - | sysconfigs | / | 配置设置 | 1. “opstype=config”时只进行配置。
2.“opstype=upgrade/rollback”时，代表升级/回退后配置，即在升级/回退重启后进行配置，详细字段说明请见[配置（Settings）指导](#配置settings指导) | “opstype=config”时必选 | - | upgradeconfigs | / | 升级前配置设置 | 在升级或者回退时有效，在升级或者回退操作之前起效，详细字段说明请见[配置（Settings）指导](#配置settings指导)| 可选 | + | sysconfigs | / | 配置设置 | 1. “opstype=config”时只进行配置。
2.“opstype=upgrade/rollback”时，代表升级/回退后配置，即在升级/回退重启后进行配置，详细字段说明请见[配置（Settings）指导](#配置-settings-指导) | “opstype=config”时必选 | + | upgradeconfigs | / | 升级前配置设置 | 在升级或者回退时有效，在升级或者回退操作之前起效，详细字段说明请见[配置（Settings）指导](#配置-settings-指导)| 可选 | | nodeselector | string | 需要进行升级/配置/回滚操作的节点label | 用于只对具有某些特定label的节点而不是集群所有worker节点进行运维的场景，需要进行运维操作的节点需要包含key为upgrade.openeuler.org/node-selector的label，nodeselector为该label的value值。
注意事项：
1.此参数不配置时，或者配置为“no-label”时对没有upgrade.openeuler.org/node-selector的节点进行操作
2.此参数为“”时，对具有upgrade.openeuler.org/node-selector=“”的节点进行操作
3.如需忽略label，对所有节点进行操作，需指定此参数为all-label| 可选 | | timewindow | / | 升级/配置/回滚操作的时间窗口 |1.指定时间窗口时starttime和endtime都需指定，即二者需要同时为空或者同时不为空
2.starttime和endtime类型为string，需要为YYYY-MM-DD HH:MM:SS格式或者HH:MM:SS格式，且二者格式需一致
3.为HH:MM:SS格式时，starttime 小于endtime认为starttime是下一天的该时间
4.timewindow不配置时默认为不存在时间窗限制| 可选 | | timeinterval | int | 升级/配置/回滚操作每批次任务下发的时间间隔 |参数单位为秒，时间间隔为operator下发任务的时间间隔，如k8s集群繁忙无法立即响应operator请求，实际时间间隔可能会大于指定时间| 可选 | @@ -141,7 +141,7 @@ * 升级并且进行配置的示例如下： - * 以节点容器引擎为containerd为例，升级方式对配置无影响，upgradeconfigs在升级前起效，sysconfigs在升级后起效，配置参数说明请见[配置（Settings）指导](#配置settings指导)。 + * 以节点容器引擎为containerd为例，升级方式对配置无影响，upgradeconfigs在升级前起效，sysconfigs在升级后起效，配置参数说明请见[配置（Settings）指导](#配置-settings-指导)。 * 升级并且配置时opstype字段需为upgrade。 * upgradeconfig为升级之前执行的配置，sysconfigs为升级机器重启后执行的配置，用户可按需进行配置。 diff --git a/docs/zh/docs/nestos/nestos/overview.md b/docs/zh/docs/nestos/nestos/overview.md index c9a7de8..777c844 100644 --- a/docs/zh/docs/nestos/nestos/overview.md +++ b/docs/zh/docs/nestos/nestos/overview.md @@ -1,4 +1,4 @@ # NestOS云底座操作系统 本文介绍云底座操作系统NestOS For Container（下称NestOS）的安装部署与各个特性说明和使用方法，使用户能够快速了解并使用NestOS。NestOS For Virt的使用方法与通用操作系统使用方法一致，可参考欧拉官方文档。 -NestOS搭载了docker、iSulad、podman、cri-o等常见容器引擎，将ignition配置、rpm-ostree、OCI支持、SElinux强化等技术集成在一起，采用基于双系统分区、容器技术和集群架构的设计思路，可以适配云场景下多种基础运行环境。同时NestOS针对Kubernetes进行优化，在IaaS生态构建方面，针对openStack、oVirt等平台提供支持；在PaaS生态构建方面，针对OKD、Rancher等平台提供支持，使系统具备十分便捷的集群组建能力，可以更安全的运行大规模的容器化工作负载。镜像下载地址详见[NestOS官网](https://nestos.openeuler.org/)。 +NestOS搭载了docker、iSulad、podman、cri-o等常见容器引擎，将ignition配置、rpm-ostree、OCI支持、SElinux强化等技术集成在一起，采用基于双系统分区、容器技术和集群架构的设计思路，可以适配云场景下多种基础运行环境。同时NestOS针对Kubernetes进行优化，在IaaS生态构建方面，针对openStack、oVirt等平台提供支持；在PaaS生态构建方面，针对OKD、Rancher等平台提供支持，使系统具备十分便捷的集群组建能力，可以更安全的运行大规模的容器化工作负载。 -- Gitee