From 267dcd7aaa770f66bb3419d898630da4528c04d1 Mon Sep 17 00:00:00 2001 From: Ilya Lesikov Date: Tue, 7 May 2024 21:02:57 +0300 Subject: [PATCH] fix: docs routing /2 Signed-off-by: Ilya Lesikov --- .helm/templates/20-ingress-tuf-router.yaml | 8 +- .helm/templates/_rewrites.tpl | 437 +++++++++--------- .helm/trdl_channels-dev.yaml | 20 +- .werf/nginx-dev.conf | 4 +- DEVELOPMENT.md | 2 +- README.md | 2 +- _config.yml | 2 +- _data/en/topnav.yml | 2 +- _data/ru/topnav.yml | 2 +- _includes/_common/channel-menu-v2.html | 2 +- _includes/_common/channel-menu.html | 2 +- _includes/_common/group-menu.html | 2 +- _includes/_common/topnav-documentation.html | 5 +- _includes/_common/topnav.html | 5 +- _includes/_common/version-menu.html | 2 +- .../en/guides/100_basic/10_build.md.liquid | 8 +- .../20_cluster/has_cluster.md.liquid | 2 +- .../en/guides/100_basic/30_deploy.md.liquid | 4 +- .../100_basic/35_deploy_changes.md.liquid | 2 +- .../guides/100_basic/40_must_haves.md.liquid | 26 +- .../200_real_apps/020_logging.md.liquid | 2 +- .../200_real_apps/080_configuration.md.liquid | 12 +- .../030_gitlab_ci_cd.md.liquid | 8 +- .../040_github_actions.md.liquid | 4 +- .../ru/guides/100_basic/10_build.md.liquid | 8 +- .../20_cluster/has_cluster.md.liquid | 2 +- .../ru/guides/100_basic/30_deploy.md.liquid | 4 +- .../100_basic/35_deploy_changes.md.liquid | 2 +- .../guides/100_basic/40_must_haves.md.liquid | 26 +- .../200_real_apps/020_logging.md.liquid | 2 +- .../200_real_apps/080_configuration.md.liquid | 12 +- .../030_gitlab_ci_cd.md.liquid | 8 +- .../040_github_actions.md.liquid | 4 +- _layouts/guides-page-base.html | 3 +- assets/js/customscripts.js | 6 +- backend/common.go | 32 +- backend/handlers.go | 12 +- backend/main.go | 9 +- .../ci/argocd_host_project_section.md.liquid | 2 +- .../ci/gitlab_project_main_section.md.liquid | 2 +- .../linux/buildah/project.md.liquid | 2 +- .../linux/buildah/project.md.liquid | 2 +- .../linux/docker/project.md.liquid | 2 +- .../linux/buildah/infra.md.liquid | 2 +- .../linux/buildah/infra.md.liquid | 2 +- .../linux/buildah/project.md.liquid | 2 +- .../host-runner/linux/buildah/infra.md.liquid | 2 +- .../linux/buildah/project.md.liquid | 2 +- .../host-runner/linux/docker/infra.md.liquid | 2 +- .../linux/docker/project.md.liquid | 2 +- .../linux/buildah/infra.md.liquid | 2 +- .../linux/buildah/project.md.liquid | 2 +- .../ci/argocd_host_project_section.md.liquid | 2 +- .../ci/gitlab_project_main_section.md.liquid | 2 +- .../linux/buildah/project.md.liquid | 2 +- .../linux/buildah/project.md.liquid | 2 +- .../linux/docker/project.md.liquid | 2 +- .../linux/buildah/infra.md.liquid | 2 +- .../linux/buildah/project.md.liquid | 2 +- .../host-runner/linux/buildah/infra.md.liquid | 2 +- .../linux/buildah/project.md.liquid | 2 +- .../host-runner/linux/docker/infra.md.liquid | 2 +- .../linux/docker/project.md.liquid | 2 +- .../linux/buildah/infra.md.liquid | 2 +- .../linux/buildah/project.md.liquid | 2 +- robots.txt | 16 +- scripts/docs/check_broken_links.sh | 2 +- sitemap.xml | 2 +- 68 files changed, 386 insertions(+), 383 deletions(-) diff --git a/.helm/templates/20-ingress-tuf-router.yaml b/.helm/templates/20-ingress-tuf-router.yaml index 2faa88d3e..3552cca8a 100644 --- a/.helm/templates/20-ingress-tuf-router.yaml +++ b/.helm/templates/20-ingress-tuf-router.yaml @@ -19,14 +19,14 @@ spec: - host: {{ $host }} http: paths: - - path: /targets + - path: /targets/ pathType: Prefix backend: service: name: tuf-router port: name: http - - path: /download + - path: /download/ pathType: Prefix backend: service: @@ -36,14 +36,14 @@ spec: - host: ru.{{ $host }} http: paths: - - path: /targets + - path: /targets/ pathType: Prefix backend: service: name: tuf-router port: name: http - - path: /download + - path: /download/ pathType: Prefix backend: service: diff --git a/.helm/templates/_rewrites.tpl b/.helm/templates/_rewrites.tpl index 7a37df404..670f539f9 100644 --- a/.helm/templates/_rewrites.tpl +++ b/.helm/templates/_rewrites.tpl @@ -5,80 +5,76 @@ # Normalize urls ############################################ -rewrite ^/js/(?.+) /assets/js/$tail redirect; -rewrite ^/css/(?.+) /assets/css/$tail redirect; -rewrite ^/images/(?.+) /assets/images/$tail redirect; - -rewrite ^/documentation/latest/?$ /documentation/ redirect; -rewrite ^/documentation/latest/(?.+) /documentation/$tail redirect; -rewrite ^/latest/documentation/?$ /documentation/ redirect; -rewrite ^/latest/documentation/(?.+) /documentation/$tail redirect; - -rewrite ^/documentation\.html$ /documentation/ redirect; -rewrite ^/documentation/(?v\d+(?:\.\d+(?:\.\d+(?:-[^/]+)?)?)?)$ /documentation/$ver/ redirect; -rewrite ^/documentation/(?v\d+(?:\.\d+(?:\.\d+(?:-[^/]+)?)?)?)/index\.html$ /documentation/$ver/ redirect; -rewrite ^/(?v\d+(?:\.\d+(?:\.\d+(?:-[^/]+)?)?)?)/documentation\.html$ /documentation/$ver/ redirect; -rewrite ^/(?v\d+(?:\.\d+(?:\.\d+(?:-[^/]+)?)?)?)/documentation/?$ /documentation/$ver/ redirect; -rewrite ^/(?v\d+(?:\.\d+(?:\.\d+(?:-[^/]+)?)?)?)/documentation/(?.+) /documentation/$ver/$tail redirect; - -rewrite ^/documentation/(?v\d+(?:\.\d+(?:\.\d+(?:-[^/]+)?)?)?)/configurator/?$ /documentation/$ver/configurator.html redirect; -rewrite ^/documentation/(?v\d+(?:\.\d+(?:\.\d+(?:-[^/]+)?)?)?)/configurator/(?.+) /documentation/$ver/configurator.html redirect; -rewrite ^/(?v\d+(?:\.\d+(?:\.\d+(?:-[^/]+)?)?)?)/documentation/configurator\.html$ /documentation/$ver/configurator.html redirect; -rewrite ^/(?v\d+(?:\.\d+(?:\.\d+(?:-[^/]+)?)?)?)/documentation/configurator/?$ /documentation/$ver/configurator.html redirect; -rewrite ^/(?v\d+(?:\.\d+(?:\.\d+(?:-[^/]+)?)?)?)/documentation/configurator/(?.+) /documentation/$ver/configurator.html redirect; - -rewrite ^/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/how_to/?$ /documentation/$ver/how_to/ redirect; -rewrite ^/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/how_to/(?.+) /documentation/$ver/how_to/$tail redirect; +rewrite ^/js/(?.+) /assets/js/$tail redirect; +rewrite ^/css/(?.+) /assets/css/$tail redirect; +rewrite ^/images/(?.+) /assets/images/$tail redirect; + +rewrite ^/docs\.html$ /docs/ redirect; +rewrite ^/docs/(?v\d+(?:\.\d+(?:\.\d+(?:[^/]+)?)?)?|latest)$ /docs/$ver/ redirect; +rewrite ^/docs/(?v\d+(?:\.\d+(?:\.\d+(?:[^/]+)?)?)?|latest)/index\.html$ /docs/$ver/ redirect; +rewrite ^/(?v\d+(?:\.\d+(?:\.\d+(?:[^/]+)?)?)?|latest)/docs\.html$ /docs/$ver/ redirect; +rewrite ^/(?v\d+(?:\.\d+(?:\.\d+(?:[^/]+)?)?)?|latest)/docs/?$ /docs/$ver/ redirect; +rewrite ^/(?v\d+(?:\.\d+(?:\.\d+(?:[^/]+)?)?)?|latest)/docs/(?.+) /docs/$ver/$tail redirect; + +rewrite ^/documentation\.html$ /docs/ redirect; +rewrite ^/documentation/(?v\d+(?:\.\d+(?:\.\d+(?:[^/]+)?)?)?|latest)$ /docs/$ver/ redirect; +rewrite ^/documentation/(?v\d+(?:\.\d+(?:\.\d+(?:[^/]+)?)?)?|latest)/index\.html$ /docs/$ver/ redirect; +rewrite ^/(?v\d+(?:\.\d+(?:\.\d+(?:[^/]+)?)?)?|latest)/documentation\.html$ /docs/$ver/ redirect; +rewrite ^/(?v\d+(?:\.\d+(?:\.\d+(?:[^/]+)?)?)?|latest)/documentation/?$ /docs/$ver/ redirect; +rewrite ^/(?v\d+(?:\.\d+(?:\.\d+(?:[^/]+)?)?)?|latest)/documentation/(?.+) /docs/$ver/$tail redirect; + +rewrite ^/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/how_to/?$ /docs/$ver/how_to/ redirect; +rewrite ^/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/how_to/(?.+) /docs/$ver/how_to/$tail redirect; ############################################ # Temporary versioned redirects ############################################ -rewrite ^/documentation/?$ /documentation/v2/ redirect; -rewrite ^/documentation/(?!v\d+(?:\.\d+(?:\.\d+(?:-[^/]+)?)?)?/)(?:.+) /documentation/v2/ redirect; - -rewrite ^/documentation/(?v2(?:\.\d+(?:\.\d+(?:-[^/]+)?)?)?)/?$ /documentation/$ver/usage/project_configuration/overview.html redirect; -rewrite ^/documentation/(?v2(?:\.\d+(?:\.\d+(?:-[^/]+)?)?)?)/usage/?$ /documentation/$ver/usage/project_configuration/overview.html redirect; -rewrite ^/documentation/(?v2(?:\.\d+(?:\.\d+(?:-[^/]+)?)?)?)/usage/project_configuration/?$ /documentation/$ver/usage/project_configuration/overview.html redirect; -rewrite ^/documentation/(?v2(?:\.\d+(?:\.\d+(?:-[^/]+)?)?)?)/usage/build/?$ /documentation/$ver/usage/build/overview.html redirect; -rewrite ^/documentation/(?v2(?:\.\d+(?:\.\d+(?:-[^/]+)?)?)?)/usage/build/stapel/?$ /documentation/$ver/usage/build/stapel/overview.html redirect; -rewrite ^/documentation/(?v2(?:\.\d+(?:\.\d+(?:-[^/]+)?)?)?)/usage/deploy/?$ /documentation/$ver/usage/deploy/overview.html redirect; -rewrite ^/documentation/(?v2(?:\.\d+(?:\.\d+(?:-[^/]+)?)?)?)/usage/distribute/?$ /documentation/$ver/usage/distribute/overview.html redirect; -rewrite ^/documentation/(?v2(?:\.\d+(?:\.\d+(?:-[^/]+)?)?)?)/usage/cleanup/?$ /documentation/$ver/usage/cleanup/cr_cleanup.html redirect; -rewrite ^/documentation/(?v2(?:\.\d+(?:\.\d+(?:-[^/]+)?)?)?)/reference/?$ /documentation/$ver/reference/werf_yaml.html redirect; -rewrite ^/documentation/(?v2(?:\.\d+(?:\.\d+(?:-[^/]+)?)?)?)/reference/cli/?$ /documentation/$ver/reference/cli/overview.html redirect; -rewrite ^/documentation/(?v2(?:\.\d+(?:\.\d+(?:-[^/]+)?)?)?)/resources/?$ /documentation/$ver/resources/cheat_sheet.html redirect; - -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/?$ /documentation/$ver/usage/project_configuration/overview.html redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/usage/?$ /documentation/$ver/usage/project_configuration/overview.html redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/usage/project_configuration/?$ /documentation/$ver/usage/project_configuration/overview.html redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/usage/build/?$ /documentation/$ver/usage/build/overview.html redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/usage/build/stapel/?$ /documentation/$ver/usage/build/stapel/overview.html redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/usage/deploy/?$ /documentation/$ver/usage/deploy/overview.html redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/usage/distribute/?$ /documentation/$ver/usage/distribute/overview.html redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/usage/cleanup/?$ /documentation/$ver/usage/cleanup/cr_cleanup.html redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/reference/?$ /documentation/$ver/reference/werf_yaml.html redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/reference/cli/?$ /documentation/$ver/reference/cli/overview.html redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/resources/?$ /documentation/$ver/resources/cheat_sheet.html redirect; - -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/?$ /documentation/$ver/index.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/configuration/?$ /documentation/$ver/configuration/introduction.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/configuration/stapel_image/?$ /documentation/$ver/configuration/stapel_image/naming.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/reference/?$ /documentation/$ver/reference/stages_and_images.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/reference/deploy_process/?$ /documentation/$ver/reference/deploy_process/deploy_into_kubernetes.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/reference/plugging_into_cicd/?$ /documentation/$ver/reference/plugging_into_cicd/overview.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/reference/development_and_debug/?$ /documentation/$ver/reference/development_and_debug/setup_minikube.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/reference/toolbox/?$ /documentation/$ver/reference/toolbox/slug.html redirect; +rewrite ^/docs/?$ /docs/v2/ redirect; +rewrite ^/docs/(?!(v\d+(?:\.\d+(?:\.\d+(?:[^/]+)?)?)?|latest)/)(?:.+) /docs/v2/ redirect; + +rewrite ^/docs/(?v2(?:\.\d+(?:\.\d+(?:[^/]+)?)?)?|latest)/?$ /docs/$ver/usage/project_configuration/overview.html redirect; +rewrite ^/docs/(?v2(?:\.\d+(?:\.\d+(?:[^/]+)?)?)?|latest)/usage/?$ /docs/$ver/usage/project_configuration/overview.html redirect; +rewrite ^/docs/(?v2(?:\.\d+(?:\.\d+(?:[^/]+)?)?)?|latest)/usage/project_configuration/?$ /docs/$ver/usage/project_configuration/overview.html redirect; +rewrite ^/docs/(?v2(?:\.\d+(?:\.\d+(?:[^/]+)?)?)?|latest)/usage/build/?$ /docs/$ver/usage/build/overview.html redirect; +rewrite ^/docs/(?v2(?:\.\d+(?:\.\d+(?:[^/]+)?)?)?|latest)/usage/build/stapel/?$ /docs/$ver/usage/build/stapel/overview.html redirect; +rewrite ^/docs/(?v2(?:\.\d+(?:\.\d+(?:[^/]+)?)?)?|latest)/usage/deploy/?$ /docs/$ver/usage/deploy/overview.html redirect; +rewrite ^/docs/(?v2(?:\.\d+(?:\.\d+(?:[^/]+)?)?)?|latest)/usage/distribute/?$ /docs/$ver/usage/distribute/overview.html redirect; +rewrite ^/docs/(?v2(?:\.\d+(?:\.\d+(?:[^/]+)?)?)?|latest)/usage/cleanup/?$ /docs/$ver/usage/cleanup/cr_cleanup.html redirect; +rewrite ^/docs/(?v2(?:\.\d+(?:\.\d+(?:[^/]+)?)?)?|latest)/reference/?$ /docs/$ver/reference/werf_yaml.html redirect; +rewrite ^/docs/(?v2(?:\.\d+(?:\.\d+(?:[^/]+)?)?)?|latest)/reference/cli/?$ /docs/$ver/reference/cli/overview.html redirect; +rewrite ^/docs/(?v2(?:\.\d+(?:\.\d+(?:[^/]+)?)?)?|latest)/resources/?$ /docs/$ver/resources/cheat_sheet.html redirect; + +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/?$ /docs/$ver/usage/project_configuration/overview.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/usage/?$ /docs/$ver/usage/project_configuration/overview.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/usage/project_configuration/?$ /docs/$ver/usage/project_configuration/overview.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/usage/build/?$ /docs/$ver/usage/build/overview.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/usage/build/stapel/?$ /docs/$ver/usage/build/stapel/overview.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/usage/deploy/?$ /docs/$ver/usage/deploy/overview.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/usage/distribute/?$ /docs/$ver/usage/distribute/overview.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/usage/cleanup/?$ /docs/$ver/usage/cleanup/cr_cleanup.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/reference/?$ /docs/$ver/reference/werf_yaml.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/reference/cli/?$ /docs/$ver/reference/cli/overview.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/resources/?$ /docs/$ver/resources/cheat_sheet.html redirect; + +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/?$ /docs/$ver/index.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/configuration/?$ /docs/$ver/configuration/introduction.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/configuration/stapel_image/?$ /docs/$ver/configuration/stapel_image/naming.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/reference/?$ /docs/$ver/reference/stages_and_images.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/reference/deploy_process/?$ /docs/$ver/reference/deploy_process/deploy_into_kubernetes.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/reference/plugging_into_cicd/?$ /docs/$ver/reference/plugging_into_cicd/overview.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/reference/development_and_debug/?$ /docs/$ver/reference/development_and_debug/setup_minikube.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/reference/toolbox/?$ /docs/$ver/reference/toolbox/slug.html redirect; ############################################ # Redirects for moved or deleted urls ############################################ -rewrite ^/installation\.html$ /getting_started/ redirect; -rewrite ^/applications_guide_(?:ru|en)/? /guides.html redirect; -rewrite ^/publications_ru\.html$ https://ru.werf.io/publications.html redirect; -rewrite ^/how_it_works\.html /#how-it-works redirect; -rewrite ^/introduction\.html$ /#how-it-works redirect; +rewrite ^/installation\.html$ /getting_started/ redirect; +rewrite ^/applications_guide_(?:ru|en)/? /guides.html redirect; +rewrite ^/publications_ru\.html$ https://ru.werf.io/publications.html redirect; +rewrite ^/how_it_works\.html /#how-it-works redirect; +rewrite ^/introduction\.html$ /#how-it-works redirect; rewrite ^/guides/(?[^/]+)/400_ci_cd_workflow/030_gitlab_ci_cd/010_workflows\.html /guides/$lang/400_ci_cd_workflow/030_gitlab_ci_cd.html redirect; rewrite ^/guides/(?[^/]+)/400_ci_cd_workflow/030_gitlab_ci_cd/020_docker_executor\.html /guides/$lang/400_ci_cd_workflow/030_gitlab_ci_cd.html redirect; @@ -88,170 +84,173 @@ rewrite ^/guides/(?[^/]+)/400_ci_cd_workflow/030_gitlab_ci_cd/030_kubernet # v1.1/v1.2 redirects for moved or deleted urls ############################################ -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/quickstart\.html$ /documentation/$ver/ redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/using_with_ci_cd_systems\.html$ /documentation/$ver/usage/integration_with_ci_cd_systems.html redirect; - -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/supported_registry_implementations\.html$ /documentation/$ver/usage/cleanup/cr_cleanup.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/buildah_mode\.html$ /documentation/$ver/usage/build/process.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/building_images_with_stapel/artifacts\.html$ /documentation/$ver/usage/build/stapel/imports.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/building_images_with_stapel/assembly_instructions\.html$ /documentation/$ver/usage/build/stapel/instructions.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/building_images_with_stapel/base_image\.html$ /documentation/$ver/usage/build/stapel/base.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/building_images_with_stapel/docker_directive\.html$ /documentation/$ver/usage/build/stapel/dockerfile.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/building_images_with_stapel/git_directive\.html$ /documentation/$ver/usage/build/stapel/git.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/building_images_with_stapel/import_directive\.html$ /documentation/$ver/usage/build/stapel/imports.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/building_images_with_stapel/mount_directive\.html$ /documentation/$ver/usage/build/stapel/mounts.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/bundles\.html$ /documentation/$ver/usage/distribute/bundles.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/ci_cd/ci_cd_workflow_basics\.html$ /documentation/$ver/usage/integration_with_ci_cd_systems.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/ci_cd/generic_ci_cd_integration\.html$ /documentation/$ver/usage/integration_with_ci_cd_systems.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/ci_cd/github_actions\.html$ /documentation/$ver/usage/integration_with_ci_cd_systems.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/ci_cd/gitlab_ci_cd\.html$ /documentation/$ver/usage/integration_with_ci_cd_systems.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/ci_cd/run_in_container/run_in_docker_container\.html$ /documentation/$ver/usage/integration_with_ci_cd_systems.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/ci_cd/run_in_container/run_in_kubernetes\.html$ /documentation/$ver/usage/integration_with_ci_cd_systems.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/ci_cd/run_in_container/use_docker_container\.html$ /documentation/$ver/usage/integration_with_ci_cd_systems.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/ci_cd/run_in_container/use_github_actions_with_docker_executor\.html$ /documentation/$ver/usage/integration_with_ci_cd_systems.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/ci_cd/run_in_container/use_github_actions_with_kubernetes_executor\.html$ /documentation/$ver/usage/integration_with_ci_cd_systems.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/ci_cd/run_in_container/use_gitlab_ci_cd_with_docker_executor\.html$ /documentation/$ver/usage/integration_with_ci_cd_systems.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/ci_cd/run_in_container/use_gitlab_ci_cd_with_kubernetes_executor\.html$ /documentation/$ver/usage/integration_with_ci_cd_systems.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/ci_cd/run_in_container/use_kubernetes\.html$ /documentation/$ver/usage/integration_with_ci_cd_systems.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/ci_cd/werf_with_argocd/ci_cd_flow_overview\.html$ /documentation/$ver/usage/integration_with_ci_cd_systems.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/ci_cd/werf_with_argocd/configure_ci_cd\.html$ /documentation/$ver/usage/integration_with_ci_cd_systems.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/ci_cd/werf_with_argocd/prepare_kubernetes_cluster\.html$ /documentation/$ver/usage/integration_with_ci_cd_systems.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/cleanup\.html$ /documentation/$ver/usage/cleanup/cr_cleanup.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/configuration/giterminism\.html$ /documentation/$ver/usage/project_configuration/giterminism.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/configuration/organizing_configuration\.html$ /documentation/$ver/reference/werf_yaml_template_engine.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/configuration/supported_go_templates\.html$ /documentation/$ver/reference/werf_yaml_template_engine.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/development_and_debug/stage_introspection\.html$ /documentation/$ver/usage/build/stapel/base.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/giterminism\.html$ /documentation/$ver/usage/project_configuration/giterminism.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/helm/configuration/chart\.html$ /documentation/$ver/usage/deploy/charts.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/helm/configuration/chart_dependencies\.html$ /documentation/$ver/usage/deploy/charts.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/helm/configuration/giterminism\.html$ /documentation/$ver/usage/project_configuration/giterminism.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/helm/configuration/secrets\.html$ /documentation/$ver/usage/deploy/values.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/helm/configuration/templates\.html$ /documentation/$ver/usage/deploy/templates.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/helm/configuration/values\.html$ /documentation/$ver/usage/deploy/values.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/helm/deploy_process/annotating_and_labeling\.html$ /documentation/$ver/usage/deploy/releases.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/helm/deploy_process/deployment_order\.html$ /documentation/$ver/usage/deploy/deployment_order.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/helm/deploy_process/external_dependencies\.html$ /documentation/$ver/usage/deploy/deployment_order.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/helm/deploy_process/helm_hooks\.html$ /documentation/$ver/usage/deploy/deployment_order.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/helm/deploy_process/resources_adoption\.html$ /documentation/$ver/usage/deploy/releases.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/helm/deploy_process/steps\.html$ /documentation/$ver/usage/deploy/deployment_order.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/helm/overview\.html$ /documentation/$ver/usage/deploy/overview.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/helm/releases/manage_releases\.html$ /documentation/$ver/usage/deploy/releases.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/helm/releases/naming\.html$ /documentation/$ver/usage/deploy/releases.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/helm/releases/release\.html$ /documentation/$ver/usage/deploy/releases.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/helm/working_with_chart_dependencies\.html$ /documentation/$ver/usage/deploy/charts.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/helm/working_with_secrets\.html$ /documentation/$ver/usage/deploy/values.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/storage_layouts\.html$ /documentation/$ver/usage/build/process.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/supported_container_registries\.html$ /documentation/$ver/usage/cleanup/cr_cleanup.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/advanced/synchronization\.html$ /documentation/$ver/usage/build/process.html redirect; - -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/internals/build_process\.html$ /documentation/$ver/usage/build/process.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/internals/development/stapel_image\.html$ /documentation/$ver/usage/build/stapel/base.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/internals/how_ci_cd_integration_works/general_overview\.html$ /documentation/$ver/usage/integration_with_ci_cd_systems.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/internals/how_ci_cd_integration_works/github_actions\.html$ /documentation/$ver/usage/integration_with_ci_cd_systems.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/internals/how_ci_cd_integration_works/gitlab_ci_cd\.html$ /documentation/$ver/usage/integration_with_ci_cd_systems.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/internals/integration_with_ssh_agent\.html$ /documentation/$ver/usage/build/stapel/base.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/internals/stages_and_storage\.html$ /documentation/$ver/usage/build/process.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/internals/telemetry\.html$ /documentation/$ver/resources/telemetry.html redirect; - -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/reference/build/artifact\.html$ /documentation/$ver/usage/build/stapel/imports.html redirect; -rewrite ^/documentation/(?v1\.[12](?:\.\d+(?:-[^/]+)?)?)/reference/cheat_sheet\.html$ /documentation/$ver/resources/cheat_sheet.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/quickstart\.html$ /docs/$ver/ redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/using_with_ci_cd_systems\.html$ /docs/$ver/usage/integration_with_ci_cd_systems.html redirect; + +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/supported_registry_implementations\.html$ /docs/$ver/usage/cleanup/cr_cleanup.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/buildah_mode\.html$ /docs/$ver/usage/build/process.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/building_images_with_stapel/artifacts\.html$ /docs/$ver/usage/build/stapel/imports.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/building_images_with_stapel/assembly_instructions\.html$ /docs/$ver/usage/build/stapel/instructions.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/building_images_with_stapel/base_image\.html$ /docs/$ver/usage/build/stapel/base.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/building_images_with_stapel/docker_directive\.html$ /docs/$ver/usage/build/stapel/dockerfile.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/building_images_with_stapel/git_directive\.html$ /docs/$ver/usage/build/stapel/git.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/building_images_with_stapel/import_directive\.html$ /docs/$ver/usage/build/stapel/imports.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/building_images_with_stapel/mount_directive\.html$ /docs/$ver/usage/build/stapel/mounts.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/bundles\.html$ /docs/$ver/usage/distribute/bundles.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/ci_cd/ci_cd_workflow_basics\.html$ /docs/$ver/usage/integration_with_ci_cd_systems.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/ci_cd/generic_ci_cd_integration\.html$ /docs/$ver/usage/integration_with_ci_cd_systems.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/ci_cd/github_actions\.html$ /docs/$ver/usage/integration_with_ci_cd_systems.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/ci_cd/gitlab_ci_cd\.html$ /docs/$ver/usage/integration_with_ci_cd_systems.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/ci_cd/run_in_container/run_in_docker_container\.html$ /docs/$ver/usage/integration_with_ci_cd_systems.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/ci_cd/run_in_container/run_in_kubernetes\.html$ /docs/$ver/usage/integration_with_ci_cd_systems.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/ci_cd/run_in_container/use_docker_container\.html$ /docs/$ver/usage/integration_with_ci_cd_systems.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/ci_cd/run_in_container/use_github_actions_with_docker_executor\.html$ /docs/$ver/usage/integration_with_ci_cd_systems.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/ci_cd/run_in_container/use_github_actions_with_kubernetes_executor\.html$ /docs/$ver/usage/integration_with_ci_cd_systems.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/ci_cd/run_in_container/use_gitlab_ci_cd_with_docker_executor\.html$ /docs/$ver/usage/integration_with_ci_cd_systems.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/ci_cd/run_in_container/use_gitlab_ci_cd_with_kubernetes_executor\.html$ /docs/$ver/usage/integration_with_ci_cd_systems.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/ci_cd/run_in_container/use_kubernetes\.html$ /docs/$ver/usage/integration_with_ci_cd_systems.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/ci_cd/werf_with_argocd/ci_cd_flow_overview\.html$ /docs/$ver/usage/integration_with_ci_cd_systems.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/ci_cd/werf_with_argocd/configure_ci_cd\.html$ /docs/$ver/usage/integration_with_ci_cd_systems.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/ci_cd/werf_with_argocd/prepare_kubernetes_cluster\.html$ /docs/$ver/usage/integration_with_ci_cd_systems.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/cleanup\.html$ /docs/$ver/usage/cleanup/cr_cleanup.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/configuration/giterminism\.html$ /docs/$ver/usage/project_configuration/giterminism.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/configuration/organizing_configuration\.html$ /docs/$ver/reference/werf_yaml_template_engine.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/configuration/supported_go_templates\.html$ /docs/$ver/reference/werf_yaml_template_engine.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/development_and_debug/stage_introspection\.html$ /docs/$ver/usage/build/stapel/base.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/giterminism\.html$ /docs/$ver/usage/project_configuration/giterminism.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/helm/configuration/chart\.html$ /docs/$ver/usage/deploy/charts.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/helm/configuration/chart_dependencies\.html$ /docs/$ver/usage/deploy/charts.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/helm/configuration/giterminism\.html$ /docs/$ver/usage/project_configuration/giterminism.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/helm/configuration/secrets\.html$ /docs/$ver/usage/deploy/values.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/helm/configuration/templates\.html$ /docs/$ver/usage/deploy/templates.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/helm/configuration/values\.html$ /docs/$ver/usage/deploy/values.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/helm/deploy_process/annotating_and_labeling\.html$ /docs/$ver/usage/deploy/releases.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/helm/deploy_process/deployment_order\.html$ /docs/$ver/usage/deploy/deployment_order.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/helm/deploy_process/external_dependencies\.html$ /docs/$ver/usage/deploy/deployment_order.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/helm/deploy_process/helm_hooks\.html$ /docs/$ver/usage/deploy/deployment_order.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/helm/deploy_process/resources_adoption\.html$ /docs/$ver/usage/deploy/releases.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/helm/deploy_process/steps\.html$ /docs/$ver/usage/deploy/deployment_order.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/helm/overview\.html$ /docs/$ver/usage/deploy/overview.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/helm/releases/manage_releases\.html$ /docs/$ver/usage/deploy/releases.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/helm/releases/naming\.html$ /docs/$ver/usage/deploy/releases.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/helm/releases/release\.html$ /docs/$ver/usage/deploy/releases.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/helm/working_with_chart_dependencies\.html$ /docs/$ver/usage/deploy/charts.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/helm/working_with_secrets\.html$ /docs/$ver/usage/deploy/values.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/storage_layouts\.html$ /docs/$ver/usage/build/process.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/supported_container_registries\.html$ /docs/$ver/usage/cleanup/cr_cleanup.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/advanced/synchronization\.html$ /docs/$ver/usage/build/process.html redirect; + +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/internals/build_process\.html$ /docs/$ver/usage/build/process.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/internals/development/stapel_image\.html$ /docs/$ver/usage/build/stapel/base.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/internals/how_ci_cd_integration_works/general_overview\.html$ /docs/$ver/usage/integration_with_ci_cd_systems.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/internals/how_ci_cd_integration_works/github_actions\.html$ /docs/$ver/usage/integration_with_ci_cd_systems.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/internals/how_ci_cd_integration_works/gitlab_ci_cd\.html$ /docs/$ver/usage/integration_with_ci_cd_systems.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/internals/integration_with_ssh_agent\.html$ /docs/$ver/usage/build/stapel/base.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/internals/stages_and_storage\.html$ /docs/$ver/usage/build/process.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/internals/telemetry\.html$ /docs/$ver/resources/telemetry.html redirect; + +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/reference/build/artifact\.html$ /docs/$ver/usage/build/stapel/imports.html redirect; +rewrite ^/docs/(?v1\.[12](?:\.\d+(?:[^/]+)?)?|latest)/reference/cheat_sheet\.html$ /docs/$ver/resources/cheat_sheet.html redirect; ############################################ # v1.2 redirects for moved or deleted urls ############################################ -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/configuration/cleanup\.html$ /documentation/$ver/reference/werf_yaml.html#cleanup redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/configuration/deploy_into_kubernetes\.html$ /documentation/$ver/reference/werf_yaml.html#deploy redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/configuration/dockerfile_image\.html$ /documentation/$ver/reference/werf_yaml.html redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/configuration/introduction\.html$ /documentation/$ver/reference/werf_yaml.html redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/configuration/stapel_artifact\.html$ /documentation/$ver/usage/build/stapel/imports.html redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/configuration/stapel_image/image_directives\.html$ /documentation/$ver/reference/werf_yaml.html redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/configuration/stapel_image/naming\.html$ /documentation/$ver/reference/werf_yaml.html#image-section redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/configuration/stapel_image/(?.+) /documentation/$ver/advanced/building_images_with_stapel/$tail redirect; - -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/cli/main/(?.+) /documentation/$ver/reference/cli/werf_$tail redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/cli/management/(?[^/]+)/(?[^/]+)$ /documentation/$ver/reference/cli/werf_${tail1}_${tail2} redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/cli/management/(?[^/]+)/(?[^/]+)/(?[^/]+)$ /documentation/$ver/reference/cli/werf_${tail1}_${tail2}_${tail3} redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/cli/management/(?[^/]+)/(?[^/]+)/(?[^/]+)/(?[^/]+)$ /documentation/$ver/reference/cli/werf_${tail1}_${tail2}_${tail3}_${tail4} redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/cli/other/(?.+) /documentation/$ver/reference/cli/werf_$tail redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/cli/toolbox/(?.+) /documentation/$ver/reference/cli/werf_$tail redirect; - -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/development/stapel\.html$ /documentation/$ver/usage/build/stapel/base.html redirect; - -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/guides/advanced_build/artifacts\.html$ /guides.html redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/guides/advanced_build/first_application\.html$ /guides.html redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/guides/advanced_build/mounts\.html$ /guides.html redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/guides/advanced_build/multi_images\.html$ /guides.html redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/guides/deploy_into_kubernetes\.html$ /documentation/$ver/quickstart.html redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/guides/generic_ci_cd_integration\.html$ /documentation/$ver/usage/integration_with_ci_cd_systems.html redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/guides/getting_started\.html$ /documentation/$ver/quickstart.html redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/guides/github_ci_cd_integration\.html$ /documentation/$ver/usage/integration_with_ci_cd_systems.html redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/guides/gitlab_ci_cd_integration\.html$ /documentation/$ver/usage/integration_with_ci_cd_systems.html redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/guides/installation\.html$ /documentation/$ver/ redirect; - -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/reference/build_process\.html$ /documentation/$ver/usage/build/process.html redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/reference/ci_cd_workflows_overview\.html$ /documentation/$ver/usage/integration_with_ci_cd_systems.html redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/reference/cleaning_process\.html$ /documentation/$ver/usage/cleanup/cr_cleanup.html redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/reference/deploy_process/deploy_into_kubernetes\.html$ /documentation/$ver/usage/deploy/overview.html redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/reference/deploy_process/working_with_chart_dependencies\.html$ /documentation/$ver/usage/deploy/charts.html redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/reference/development_and_debug/lint_and_render_chart\.html$ /documentation/$ver/ redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/reference/development_and_debug/stage_introspection\.html$ /documentation/$ver/usage/build/stapel/base.html redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/reference/plugging_into_cicd/gitlab_ci\.html$ /documentation/$ver/usage/integration_with_ci_cd_systems.html redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/reference/plugging_into_cicd/overview\.html$ /documentation/$ver/usage/integration_with_ci_cd_systems.html redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/reference/stages_and_images\.html$ /documentation/$ver/usage/build/process.html redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/reference/toolbox/slug\.html$ /documentation/$ver/ redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/reference/toolbox/ssh\.html$ /documentation/$ver/usage/build/stapel/base.html redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/reference/working_with_docker_registries\.html$ /documentation/$ver/usage/cleanup/cr_cleanup.html redirect; - -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/whats_new_in_v1_2/changelog\.html$ /documentation/$ver/resources/how_to_migrate_from_v1_1_to_v1_2.html redirect; -rewrite ^/documentation/(?v1\.2(?:\.\d+(?:-[^/]+)?)?)/whats_new_in_v1_2/how_to_migrate_from_v1_1_to_v1_2\.html$ /documentation/$ver/resources/how_to_migrate_from_v1_1_to_v1_2.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/configurator\.html$ /docs/$ver/getting_started/ redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/configurator/?$ /docs/$ver/getting_started/ redirect; + +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/configuration/cleanup\.html$ /docs/$ver/reference/werf_yaml.html#cleanup redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/configuration/deploy_into_kubernetes\.html$ /docs/$ver/reference/werf_yaml.html#deploy redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/configuration/dockerfile_image\.html$ /docs/$ver/reference/werf_yaml.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/configuration/introduction\.html$ /docs/$ver/reference/werf_yaml.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/configuration/stapel_artifact\.html$ /docs/$ver/usage/build/stapel/imports.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/configuration/stapel_image/image_directives\.html$ /docs/$ver/reference/werf_yaml.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/configuration/stapel_image/naming\.html$ /docs/$ver/reference/werf_yaml.html#image-section redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/configuration/stapel_image/(?.+) /docs/$ver/advanced/building_images_with_stapel/$tail redirect; + +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/cli/main/(?.+) /docs/$ver/reference/cli/werf_$tail redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/cli/management/(?[^/]+)/(?[^/]+)$ /docs/$ver/reference/cli/werf_${tail1}_${tail2} redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/cli/management/(?[^/]+)/(?[^/]+)/(?[^/]+)$ /docs/$ver/reference/cli/werf_${tail1}_${tail2}_${tail3} redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/cli/management/(?[^/]+)/(?[^/]+)/(?[^/]+)/(?[^/]+)$ /docs/$ver/reference/cli/werf_${tail1}_${tail2}_${tail3}_${tail4} redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/cli/other/(?.+) /docs/$ver/reference/cli/werf_$tail redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/cli/toolbox/(?.+) /docs/$ver/reference/cli/werf_$tail redirect; + +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/development/stapel\.html$ /docs/$ver/usage/build/stapel/base.html redirect; + +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/guides/advanced_build/artifacts\.html$ /guides.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/guides/advanced_build/first_application\.html$ /guides.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/guides/advanced_build/mounts\.html$ /guides.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/guides/advanced_build/multi_images\.html$ /guides.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/guides/deploy_into_kubernetes\.html$ /docs/$ver/quickstart.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/guides/generic_ci_cd_integration\.html$ /docs/$ver/usage/integration_with_ci_cd_systems.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/guides/getting_started\.html$ /docs/$ver/quickstart.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/guides/github_ci_cd_integration\.html$ /docs/$ver/usage/integration_with_ci_cd_systems.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/guides/gitlab_ci_cd_integration\.html$ /docs/$ver/usage/integration_with_ci_cd_systems.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/guides/installation\.html$ /docs/$ver/ redirect; + +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/reference/build_process\.html$ /docs/$ver/usage/build/process.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/reference/ci_cd_workflows_overview\.html$ /docs/$ver/usage/integration_with_ci_cd_systems.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/reference/cleaning_process\.html$ /docs/$ver/usage/cleanup/cr_cleanup.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/reference/deploy_process/deploy_into_kubernetes\.html$ /docs/$ver/usage/deploy/overview.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/reference/deploy_process/working_with_chart_dependencies\.html$ /docs/$ver/usage/deploy/charts.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/reference/development_and_debug/lint_and_render_chart\.html$ /docs/$ver/ redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/reference/development_and_debug/stage_introspection\.html$ /docs/$ver/usage/build/stapel/base.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/reference/plugging_into_cicd/gitlab_ci\.html$ /docs/$ver/usage/integration_with_ci_cd_systems.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/reference/plugging_into_cicd/overview\.html$ /docs/$ver/usage/integration_with_ci_cd_systems.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/reference/stages_and_images\.html$ /docs/$ver/usage/build/process.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/reference/toolbox/slug\.html$ /docs/$ver/ redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/reference/toolbox/ssh\.html$ /docs/$ver/usage/build/stapel/base.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/reference/working_with_docker_registries\.html$ /docs/$ver/usage/cleanup/cr_cleanup.html redirect; + +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/whats_new_in_v1_2/changelog\.html$ /docs/$ver/resources/how_to_migrate_from_v1_1_to_v1_2.html redirect; +rewrite ^/docs/(?v1\.2(?:\.\d+(?:[^/]+)?)?|latest)/whats_new_in_v1_2/how_to_migrate_from_v1_1_to_v1_2\.html$ /docs/$ver/resources/how_to_migrate_from_v1_1_to_v1_2.html redirect; ############################################ # v1.1 redirects for moved or deleted urls ############################################ -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/quickstart\.html$ /documentation/$ver/guides/getting_started.html redirect; - -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/how_to/?$ /documentation/$ver/guides/ redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/how_to/mounts\.html$ /documentation/$ver/guides/advanced_build/mounts.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/how_to/multi_images\.html$ /documentation/$ver/guides/advanced_build/multi_images.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/how_to/artifacts\.html$ /documentation/$ver/guides/advanced_build/artifacts.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/how_to/(?.+) /documentation/$ver/guides/$tail redirect; - -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/guides/guides/unsupported_ci_cd_integration\.html$ /documentation/$ver/guides/generic_ci_cd_integration.html redirect; - -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/cli/?$ /documentation/$ver/reference/cli/ redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/cli/management/helm/get_release\.html$ /documentation/$ver/reference/cli/werf_helm_get_release.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/cli/toolbox/meta/get_helm_release\.html$ /documentation/$ver/reference/cli/werf_helm_get_release.html redirect; - -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/configuration/stapel_image/assembly_process\.html$ /documentation/$ver/configuration/stapel_image/assembly_instructions.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/configuration/stapel_image/image_from_dockerfile\.html$ /documentation/$ver/configuration/dockerfile_image.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/configuration/stapel_image/stage_introspection\.html$ /documentation/$ver/advanced/development_and_debug/stage_introspection.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/configuration/stapel_image/stages\.html$ /documentation/$ver/reference/stages_and_images.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/configuration/stapel_image/stages_and_images\.html$ /documentation/$ver/internals/stages_and_storage.html redirect; - -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/reference/cleanup_process\.html$ /documentation/$ver/reference/cleaning_process.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/reference/config\.html$ /documentation/$ver/configuration/introduction.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/reference/stages_and_images\.html$ /documentation/$ver/internals/stages_and_storage.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/reference/build/as_layers\.html$ /documentation/$ver/reference/development_and_debug/as_layers.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/reference/build/stage_introspection\.html$ /documentation/$ver/reference/development_and_debug/stage_introspection.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/reference/build/(?.+) /documentation/$ver/configuration/stapel_image/$tail redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/reference/deploy/chart_configuration\.html$ /documentation/$ver/reference/deploy_process/deploy_into_kubernetes.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/reference/deploy/deploy_to_kubernetes\.html$ /documentation/$ver/reference/deploy_process/deploy_into_kubernetes.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/reference/deploy/minikube\.html$ /documentation/$ver/reference/development_and_debug/setup_minikube.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/reference/deploy/secrets\.html$ /documentation/$ver/reference/deploy_process/working_with_secrets.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/reference/deploy/track_kubernetes_resources\.html$ /documentation/$ver/reference/deploy_process/differences_with_helm.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/reference/development_and_debug/stage_introspection\.html$ /documentation/$ver/advanced/development_and_debug/stage_introspection.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/reference/local_development/as_layers\.html$ /documentation/$ver/reference/development_and_debug/as_layers.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/reference/local_development/installing_minikube\.html$ /documentation/$ver/reference/development_and_debug/setup_minikube.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/reference/local_development/lint_and_render_chart\.html$ /documentation/$ver/reference/development_and_debug/lint_and_render_chart.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/reference/local_development/setup_minikube\.html$ /documentation/$ver/reference/development_and_debug/setup_minikube.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/reference/local_development/stage_introspection\.html$ /documentation/$ver/reference/development_and_debug/stage_introspection.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/reference/registry/authorization\.html$ /documentation/$ver/reference/registry_authorization.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/reference/registry/cleaning\.html$ /documentation/$ver/reference/cleaning_process.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/reference/registry/image_naming\.html$ /documentation/$ver/reference/stages_and_images.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/reference/registry/publish\.html$ /documentation/$ver/reference/publish_process.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/reference/registry/push\.html$ /documentation/$ver/reference/publish_process.html redirect; -rewrite ^/documentation/(?v1\.1(?:\.\d+(?:-[^/]+)?)?)/reference/registry/tag\.html$ /documentation/$ver/reference/publish_process.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/quickstart\.html$ /docs/$ver/guides/getting_started.html redirect; + +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/how_to/?$ /docs/$ver/guides/ redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/how_to/mounts\.html$ /docs/$ver/guides/advanced_build/mounts.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/how_to/multi_images\.html$ /docs/$ver/guides/advanced_build/multi_images.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/how_to/artifacts\.html$ /docs/$ver/guides/advanced_build/artifacts.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/how_to/(?.+) /docs/$ver/guides/$tail redirect; + +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/guides/guides/unsupported_ci_cd_integration\.html$ /docs/$ver/guides/generic_ci_cd_integration.html redirect; + +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/cli/?$ /docs/$ver/reference/cli/ redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/cli/management/helm/get_release\.html$ /docs/$ver/reference/cli/werf_helm_get_release.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/cli/toolbox/meta/get_helm_release\.html$ /docs/$ver/reference/cli/werf_helm_get_release.html redirect; + +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/configuration/stapel_image/assembly_process\.html$ /docs/$ver/configuration/stapel_image/assembly_instructions.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/configuration/stapel_image/image_from_dockerfile\.html$ /docs/$ver/configuration/dockerfile_image.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/configuration/stapel_image/stage_introspection\.html$ /docs/$ver/advanced/development_and_debug/stage_introspection.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/configuration/stapel_image/stages\.html$ /docs/$ver/reference/stages_and_images.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/configuration/stapel_image/stages_and_images\.html$ /docs/$ver/internals/stages_and_storage.html redirect; + +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/reference/cleanup_process\.html$ /docs/$ver/reference/cleaning_process.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/reference/config\.html$ /docs/$ver/configuration/introduction.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/reference/stages_and_images\.html$ /docs/$ver/internals/stages_and_storage.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/reference/build/as_layers\.html$ /docs/$ver/reference/development_and_debug/as_layers.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/reference/build/stage_introspection\.html$ /docs/$ver/reference/development_and_debug/stage_introspection.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/reference/build/(?.+) /docs/$ver/configuration/stapel_image/$tail redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/reference/deploy/chart_configuration\.html$ /docs/$ver/reference/deploy_process/deploy_into_kubernetes.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/reference/deploy/deploy_to_kubernetes\.html$ /docs/$ver/reference/deploy_process/deploy_into_kubernetes.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/reference/deploy/minikube\.html$ /docs/$ver/reference/development_and_debug/setup_minikube.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/reference/deploy/secrets\.html$ /docs/$ver/reference/deploy_process/working_with_secrets.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/reference/deploy/track_kubernetes_resources\.html$ /docs/$ver/reference/deploy_process/differences_with_helm.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/reference/development_and_debug/stage_introspection\.html$ /docs/$ver/advanced/development_and_debug/stage_introspection.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/reference/local_development/as_layers\.html$ /docs/$ver/reference/development_and_debug/as_layers.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/reference/local_development/installing_minikube\.html$ /docs/$ver/reference/development_and_debug/setup_minikube.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/reference/local_development/lint_and_render_chart\.html$ /docs/$ver/reference/development_and_debug/lint_and_render_chart.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/reference/local_development/setup_minikube\.html$ /docs/$ver/reference/development_and_debug/setup_minikube.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/reference/local_development/stage_introspection\.html$ /docs/$ver/reference/development_and_debug/stage_introspection.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/reference/registry/authorization\.html$ /docs/$ver/reference/registry_authorization.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/reference/registry/cleaning\.html$ /docs/$ver/reference/cleaning_process.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/reference/registry/image_naming\.html$ /docs/$ver/reference/stages_and_images.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/reference/registry/publish\.html$ /docs/$ver/reference/publish_process.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/reference/registry/push\.html$ /docs/$ver/reference/publish_process.html redirect; +rewrite ^/docs/(?v1\.1(?:\.\d+(?:[^/]+)?)?|latest)/reference/registry/tag\.html$ /docs/$ver/reference/publish_process.html redirect; {{- end }} diff --git a/.helm/trdl_channels-dev.yaml b/.helm/trdl_channels-dev.yaml index c108a8d46..63113d3d0 100644 --- a/.helm/trdl_channels-dev.yaml +++ b/.helm/trdl_channels-dev.yaml @@ -14,24 +14,24 @@ groups: - name: "1.2" channels: - name: alpha - version: 1.2.3-dev + version: 1.2.294+fix1 - name: beta - version: 1.2.3-dev + version: 1.2.294+fix1 - name: ea - version: 1.2.3-dev + version: 1.2.294+fix1 - name: stable - version: 1.2.3-dev + version: 1.2.294+fix1 - name: rock-solid - version: 1.2.3-dev + version: 1.2.294+fix1 - name: "2" channels: - name: alpha - version: 2.0.3-dev + version: 2.0.3 - name: beta - version: 2.0.3-dev + version: 2.0.3 - name: ea - version: 2.0.3-dev + version: 2.0.3 - name: stable - version: 2.0.3-dev + version: 2.0.3 - name: rock-solid - version: 2.0.3-dev + version: 2.0.3 diff --git a/.werf/nginx-dev.conf b/.werf/nginx-dev.conf index 0c9687844..eba5df43a 100644 --- a/.werf/nginx-dev.conf +++ b/.werf/nginx-dev.conf @@ -85,8 +85,8 @@ http { proxy_pass http://website-$lang; } - location /documentation/ { - rewrite ^/documentation/(?v\d+(?:\.\d+(?:\.\d+(?:-[^/]+)?)?)?)/(?.*) /$tail break; + location /docs/ { + rewrite ^/docs/(?v\d+(?:\.\d+(?:\.\d+(?:[^/]+)?)?)?|latest)/(?.*) /$tail break; proxy_set_header Host $http_host; proxy_set_header X-Real-IP $remote_addr; diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index f253dfd74..b707a413d 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -5,7 +5,7 @@ ___ ## Development -- Install [werf](http://werf.io/documentation/index.html). +- Install [werf](http://werf.io/docs/index.html). - Install [task](https://taskfile.dev/installation/). ### Local development setup diff --git a/README.md b/README.md index 7a111026d..5586c0191 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ This repository contains files required to build the [werf CI/CD tool website](h and run it locally. It includes all of website pages with the only exception for the official -[werf documentation](https://werf.io/documentation/) which can be found +[werf documentation](https://werf.io/docs/) which can be found in the [main werf](https://github.com/werf/werf/tree/main/docs) repo since it's versioned and provided together with werf releases themselves (e.g. we have the documentation for werf v1.2.51, v1.1.23, and so on). diff --git a/_config.yml b/_config.yml index 54b922cb0..7fc1a408c 100644 --- a/_config.yml +++ b/_config.yml @@ -5,7 +5,7 @@ site_urls: ru: https://ru.werf.io en: https://werf.io editlink: "https://github.com/werf/website/edit/main" -canonical_url_prefix: /documentation/v2 +canonical_url_prefix: /docs/v2 social_links: ru: diff --git a/_data/en/topnav.yml b/_data/en/topnav.yml index 954c1669d..4d3893c1b 100644 --- a/_data/en/topnav.yml +++ b/_data/en/topnav.yml @@ -1,7 +1,7 @@ - title: Getting Started url: /getting_started/ - title: Documentation - url: /documentation/v2/ + url: /docs/v2/ - title: Kubernetes guide url: /guides.html hot: true diff --git a/_data/ru/topnav.yml b/_data/ru/topnav.yml index 0e3d8260f..98f70eb2e 100644 --- a/_data/ru/topnav.yml +++ b/_data/ru/topnav.yml @@ -1,7 +1,7 @@ - title: Быстрый старт url: /getting_started/ - title: ДокумСнтация - url: /documentation/v2/ + url: /docs/v2/ - title: Π‘Π°ΠΌΠΎΡƒΡ‡ΠΈΡ‚Π΅Π»ΡŒ ΠΏΠΎ Kubernetes url: /guides.html hot: true diff --git a/_includes/_common/channel-menu-v2.html b/_includes/_common/channel-menu-v2.html index 110aaabf0..e716829c5 100644 --- a/_includes/_common/channel-menu-v2.html +++ b/_includes/_common/channel-menu-v2.html @@ -11,7 +11,7 @@ {{- $prevVersion := "" }} {{- range (slice .VersionItems 1) }}
  • - + {{- if eq .Version "latest" }} latest {{- else }} diff --git a/_includes/_common/channel-menu.html b/_includes/_common/channel-menu.html index 10cb9480c..c0aa2a2ec 100644 --- a/_includes/_common/channel-menu.html +++ b/_includes/_common/channel-menu.html @@ -6,7 +6,7 @@ {{- $prevVersion := "" }} {{- range (slice .VersionItems 1) }}
  • - + {{- if eq .Version "latest" }} latest diff --git a/_includes/_common/group-menu.html b/_includes/_common/group-menu.html index 98667bdc0..477f16c8f 100644 --- a/_includes/_common/group-menu.html +++ b/_includes/_common/group-menu.html @@ -9,7 +9,7 @@ {{- $prevVersion := "" }} {{- range (slice .VersionItems 1) }}
  • - + v{{ .Group }}
    • diff --git a/_includes/_common/topnav-documentation.html b/_includes/_common/topnav-documentation.html index b9316c251..8f0d2055e 100644 --- a/_includes/_common/topnav-documentation.html +++ b/_includes/_common/topnav-documentation.html @@ -23,10 +23,11 @@ {%- if folder.folderitems %} header__menu-item_parent{% endif %} {%- if folder.url.size>1 and page.url == folder.url %} header__menu-item_active{% endif %} {%- if folder.url.size>1 and page.url != folder.url and page.url contains folder.url - and page.url != '/documentation/index.html' %} header__menu-item_active{% endif %} + and page.url != '/docs/index.html' %} header__menu-item_active{% endif %} {%- if folder.title == 'ДокумСнтация' or folder.title == 'Documentation' %} header__menu-item_active{% endif %}"> {%- if folder.title == 'ДокумСнтация' or folder.title == 'Documentation' %} - {%- if page.name == '404.md' %} + {%- assign page_name = page.url | split: "/" | last %} + {%- if page_name == '404.html' %} {{ folder.title }} {%- else %} {{ folder.title }} diff --git a/_includes/_common/topnav.html b/_includes/_common/topnav.html index 413b87bbe..ee35560b5 100644 --- a/_includes/_common/topnav.html +++ b/_includes/_common/topnav.html @@ -27,12 +27,13 @@ {% endif %} {%- if folder.url.size>=1 and page.url == folder.url %} header__menu-item_active{% endif %} {%- if folder.url.size>1 and page.url != folder.url and page.url contains folder.url - and page.url != '/documentation/index.html' %} header__menu-item_active{% endif %}"> + and page.url != '/docs/index.html' %} header__menu-item_active{% endif %}"> {%- comment -%} {%- if folder.url.size<2 and page.url.size<2 %} header__menu-item_active{% endif %}"> {%- endcomment -%} {%- if folder.title == 'ДокумСнтация' or folder.title == 'Documentation' %} - {%- if page.name == '404.md' %} + {%- assign page_name = page.url | split: "/" | last %} + {%- if page_name == '404.html' %} {{ folder.title }} {%- else %} {{ folder.title }} diff --git a/_includes/_common/version-menu.html b/_includes/_common/version-menu.html index 59616de2e..4feae4456 100644 --- a/_includes/_common/version-menu.html +++ b/_includes/_common/version-menu.html @@ -17,7 +17,7 @@ {{- $prevVersion := "" }} {{- range (slice .VersionItems 1) }}
  • - + {{ .Group }}-{{ .Channel }} {{ .Version }} diff --git a/_includes/en/guides/100_basic/10_build.md.liquid b/_includes/en/guides/100_basic/10_build.md.liquid index 5910bf311..3fa066e66 100644 --- a/_includes/en/guides/100_basic/10_build.md.liquid +++ b/_includes/en/guides/100_basic/10_build.md.liquid @@ -1,6 +1,6 @@ ## Preliminary steps -Install werf and its dependencies using [this guide]({{ site.url }}/documentation/). +Install werf and its dependencies using [this guide]({{ site.url }}/docs/). ## Create a new repository with the application @@ -20,7 +20,7 @@ The primary werf configuration file, `werf.yaml` (in the repository's root) spec {% include snippetcut_example path="werf.yaml" syntax="yaml" examples=page.examples %} -The `werf.yaml` file can describe the assembly of multiple images at once. There are also some additional settings for building an image. You can learn more about them in the [documentation]({{ site.url }}/documentation/v2/reference/werf_yaml.html#dockerfile-image-section-image). +The `werf.yaml` file can describe the assembly of multiple images at once. There are also some additional settings for building an image. You can learn more about them in the [documentation]({{ site.url }}/docs/v2/reference/werf_yaml.html#dockerfile-image-section-image). ## Building using werf @@ -30,7 +30,7 @@ Note that before starting the werf-based build/deploy process, you have to **add We already did this in the "Creating a new application repository" section above. Normally, however, you have to run the `git add` and `git commit` commands. -Start the build using the [`werf build`]({{ site.url }}/documentation/v2/reference/cli/werf_build.html) command: +Start the build using the [`werf build`]({{ site.url }}/docs/v2/reference/cli/werf_build.html) command: ```shell werf build @@ -80,7 +80,7 @@ Running time 11.02 seconds ## Starting the application -You can run the container locally using the built image via the [werf run]({{ site.url }}/documentation/v2/reference/cli/werf_run.html) command: +You can run the container locally using the built image via the [werf run]({{ site.url }}/docs/v2/reference/cli/werf_run.html) command: ```shell werf run app --docker-options="-ti --rm -p 8000:8000" -- /app/start.sh diff --git a/_includes/en/guides/100_basic/20_cluster/has_cluster.md.liquid b/_includes/en/guides/100_basic/20_cluster/has_cluster.md.liquid index 24141dc9c..b7c319a61 100644 --- a/_includes/en/guides/100_basic/20_cluster/has_cluster.md.liquid +++ b/_includes/en/guides/100_basic/20_cluster/has_cluster.md.liquid @@ -61,7 +61,7 @@ Your cluster must have Nginx Ingress installed. If it is not installed, you can ### Registry -werf supports [many registry implementations]({{ site.url }}/documentation/v2/advanced/supported_registry_implementations.html). +werf supports [many registry implementations]({{ site.url }}/docs/v2/advanced/supported_registry_implementations.html). Make sure that your cluster can connect to the registry over the network. diff --git a/_includes/en/guides/100_basic/30_deploy.md.liquid b/_includes/en/guides/100_basic/30_deploy.md.liquid index 5e4d15bd0..046b12148 100644 --- a/_includes/en/guides/100_basic/30_deploy.md.liquid +++ b/_includes/en/guides/100_basic/30_deploy.md.liquid @@ -8,7 +8,7 @@ The Deployment resource creates a set of resources for launching the application Here, we insert the full name of the Docker image of our application using the template engine: {% raw %}`{{ .Values.werf.image.app }}`{% endraw %}. Note that you must use the component name specified in `werf.yaml` (`app` in our case) to access this value. -werf automatically adds full names of the images to build as well as other [service data]({{ site.url }}/documentation/v2/advanced/helm/configuration/values.html#service-values) to values of the Helm Chart (`.Values`). You can access them using the `werf` key. +werf automatically adds full names of the images to build as well as other [service data]({{ site.url }}/docs/v2/advanced/helm/configuration/values.html#service-values) to values of the Helm Chart (`.Values`). You can access them using the `werf` key. werf only rebuilds images when the added files are changed (those used in the Dockerfile `COPY/ADD` instructions) or if `werf.yaml` itself is changed. The image tag will also change during a rebuild resulting in the Deployment update. If no changes were made to the files mentioned above, the werf would not rebuild the image. The Deployment and the resources it creates will not be redeployed because the latest version of the application is already running in the cluster. @@ -28,7 +28,7 @@ The Ingress resource manages *external* access to the cluster (unlike a Service > Note that you need to go back to the previous chapter and recreate the registry secret if you deleted the application namespace. -The [werf converge]({{ site.url }}/documentation/v2/reference/cli/werf_converge.html) command builds the application and deploys it to Kubernetes: +The [werf converge]({{ site.url }}/docs/v2/reference/cli/werf_converge.html) command builds the application and deploys it to Kubernetes: ```shell werf converge --repo /werf-guide-app ``` diff --git a/_includes/en/guides/100_basic/35_deploy_changes.md.liquid b/_includes/en/guides/100_basic/35_deploy_changes.md.liquid index febd1a92e..6faeab4c4 100644 --- a/_includes/en/guides/100_basic/35_deploy_changes.md.liquid +++ b/_includes/en/guides/100_basic/35_deploy_changes.md.liquid @@ -171,7 +171,7 @@ werf-guide-app-57f854484f-2xbzl 1/1 Running 0 119m ``` {% endofftopic %} -The number of replicas changed: now, it corresponds to that specified in the Git repository. It happened because werf brought the cluster state to the state described in the current Git commit. This principle is called [**giterminism**](https://en.werf.io/documentation/v2/advanced/giterminism.html). +The number of replicas changed: now, it corresponds to that specified in the Git repository. It happened because werf brought the cluster state to the state described in the current Git commit. This principle is called [**giterminism**](https://en.werf.io/docs/v2/advanced/giterminism.html). So how do you comply with the principles of **giterminism** and do it all right? Let's set `spec.replicas=4`, but this time we'll do it by describing the application state in Git: diff --git a/_includes/en/guides/100_basic/40_must_haves.md.liquid b/_includes/en/guides/100_basic/40_must_haves.md.liquid index 37996063c..a4aba7807 100644 --- a/_includes/en/guides/100_basic/40_must_haves.md.liquid +++ b/_includes/en/guides/100_basic/40_must_haves.md.liquid @@ -12,11 +12,11 @@ The reproducibility is essential for implementing the [Infrastructure as Code](h werf follows the **giterminism** principle to ensure reproducibility. That is, the current Git state (HEAD commit) _determines_ the state of the application. By default, werf does not allow uncommitted and untracked files in the build context/configuration of the images being built. It also excludes the features that potentially have external dependencies. -We strongly recommend following this approach. However, if necessary, you can loosen giterminism restrictions explicitly and enable the features that require careful use. You can do this using the [werf-giterminism.yaml]({{ site.url }}/documentation/v2/reference/werf_giterminism_yaml.html) file. +We strongly recommend following this approach. However, if necessary, you can loosen giterminism restrictions explicitly and enable the features that require careful use. You can do this using the [werf-giterminism.yaml]({{ site.url }}/docs/v2/reference/werf_giterminism_yaml.html) file. During development or debugging, editing the project files might be annoying due to the need to create intermediate commits. We recommend using the developer mode (or simply _dev_ β€” see below for details). -_The detailed documentation on determinism is available [here]({{ site.url }}/documentation/v2/advanced/giterminism.html)._ +_The detailed documentation on determinism is available [here]({{ site.url }}/docs/v2/advanced/giterminism.html)._ ### The dev mode @@ -54,10 +54,10 @@ Read [this article](https://blog.werf.io/werf-vs-docker-what-is-the-difference-w In addition, werf supports the following features out of the box (they are enabled by default): -* [**parallel builds**]({{ site.url }}/documentation/v2/internals/build_process.html#parallel-build), when multiple independent images get assembled simultaneously; +* [**parallel builds**]({{ site.url }}/docs/v2/internals/build_process.html#parallel-build), when multiple independent images get assembled simultaneously; * **distributed immutable cache**. In this mode, thanks to the synchronization and locking mechanisms, an arbitrary number of builders can use the shared cache in the container registry without breaking the reproducibility of previously assembled layers and images. This approach is based on the ideas of [MVCC](https://ru.wikipedia.org/wiki/MVCC) and [optimistic locking](https://en.wikipedia.org/wiki/Optimistic_concurrency_control). -Please, refer to the [werf documentation]({{ site.url }}/documentation/v2/internals/stages_and_storage.html) to learn more about how data is stored in the registry. This document provides information on how the build process is structured, how the dependencies between the build stages are accounted for, and how the resulting images get their names. +Please, refer to the [werf documentation]({{ site.url }}/docs/v2/internals/stages_and_storage.html) to learn more about how data is stored in the registry. This document provides information on how the build process is structured, how the dependencies between the build stages are accounted for, and how the resulting images get their names. ### Tagging images @@ -80,7 +80,7 @@ This way, werf **frees you of worries about tagging rules**: the tagging is done werf uses Helm to deploy the application. [Helm chart](https://helm.sh/docs/topics/charts/) is a set of files that describes a related set of Kubernetes objects. A _release_ is created when the chart is rolled out to a particular environment in a cluster. {% offtopic title="Learn more" %} -The [werf documentation]({{ site.url }}/documentation/v2/advanced/helm/releases/release.html) provides a detailed description of working with releases, storing and naming them. +The [werf documentation]({{ site.url }}/docs/v2/advanced/helm/releases/release.html) provides a detailed description of working with releases, storing and naming them. {% endofftopic %} When working with releases, werf follows giterminism principles. For Helm releases, it uses the [3-way merge](https://helm.sh/docs/faq/#improved-upgrade-strategy-3-way-strategic-merge-patches) approach: manual changes to the cluster that conflict with the state described in Git are corrected to conform to the latter. Note that manual changes that do _not_ conflict with the state defined in Git remain outside the control of Helm and werf. @@ -93,15 +93,15 @@ You can read more about werf and Helm in [this article](https://blog.werf.io/wer A specific state of the deployed application is called a release. Releases provide information about components installed in the cluster (using werf and Helm), their state, and the environment they are running in. -To browse the list of releases or find out the name of the release you need, use the [`werf helm list -A`]({{ site.url }}/documentation/v2/reference/cli/werf_helm_list.html) command. +To browse the list of releases or find out the name of the release you need, use the [`werf helm list -A`]({{ site.url }}/docs/v2/reference/cli/werf_helm_list.html) command. ### How do I delete the unneeded component? -Use [`werf dismiss`]({{ site.url }}/documentation/v2/reference/cli/werf_dismiss.html) to uninstall a specific release of an application. +Use [`werf dismiss`]({{ site.url }}/docs/v2/reference/cli/werf_dismiss.html) to uninstall a specific release of an application. ### Debugging the installation process -Debugging allows you to see what went wrong while werf was running. Frequently, mistakes made in chart configurations lead to problems when rolling out a release. The [`werf render`]({{ site.url }}/documentation/v2/reference/cli/werf_render.html) command can help you in debugging such problems. +Debugging allows you to see what went wrong while werf was running. Frequently, mistakes made in chart configurations lead to problems when rolling out a release. The [`werf render`]({{ site.url }}/docs/v2/reference/cli/werf_render.html) command can help you in debugging such problems. werf render performs all the tasks related to the building and generating charts, showing you the resulting charts instead of deploying the release to Kubernetes. It is a compute-intensive task that shows you the final result with all the required values filled in. @@ -109,16 +109,16 @@ _Note that `werf render` only works with files committed to Git (like all other ## Cleaning up -Over time, a lot of data can accumulate in the storage (either local or in the registry). werf has two types of cleaning commands with different purposes: `werf cleanup` and `werf purge` (refer to the [documentation]({{ site.url }}/documentation/v2/advanced/cleanup.html) to learn more). The first one cleans up data in the container registry only, while the second one can clean up all werf-related data. +Over time, a lot of data can accumulate in the storage (either local or in the registry). werf has two types of cleaning commands with different purposes: `werf cleanup` and `werf purge` (refer to the [documentation]({{ site.url }}/docs/v2/advanced/cleanup.html) to learn more). The first one cleans up data in the container registry only, while the second one can clean up all werf-related data. ### werf cleanup -The [`werf cleanup`]({{ site.url }}/documentation/v2/reference/cli/werf_cleanup.html) command cleans up outdated data in the registry. It safely deletes images that are no longer required using an advanced algorithm that takes into account the Git history, the contents of the registry, and the state of the cluster. If the `--repo ` key is provided, the command will clean a specific repository. +The [`werf cleanup`]({{ site.url }}/docs/v2/reference/cli/werf_cleanup.html) command cleans up outdated data in the registry. It safely deletes images that are no longer required using an advanced algorithm that takes into account the Git history, the contents of the registry, and the state of the cluster. If the `--repo ` key is provided, the command will clean a specific repository. -The [`werf host cleanup`]({{ site.url }}/documentation/v2/advanced/cleanup.html#cleaning-up-outdated-data) command is used to clean up the outdated data on the host. +The [`werf host cleanup`]({{ site.url }}/docs/v2/advanced/cleanup.html#cleaning-up-outdated-data) command is used to clean up the outdated data on the host. ### werf purge -The [`werf host purge`]({{ site.url }}/documentation/v2/reference/cli/werf_host_purge.html) command allows you to free up disk space by deleting all images and other data. +The [`werf host purge`]({{ site.url }}/docs/v2/reference/cli/werf_host_purge.html) command allows you to free up disk space by deleting all images and other data. -The [`werf purge`]({{ site.url }}/documentation/v2/reference/cli/werf_purge.html) command purges all werf-related data on a host. Caution! werf purge (NOT SAFE) deletes all images, including those linked to applications running in the cluster! +The [`werf purge`]({{ site.url }}/docs/v2/reference/cli/werf_purge.html) command purges all werf-related data on a host. Caution! werf purge (NOT SAFE) deletes all images, including those linked to applications running in the cluster! diff --git a/_includes/en/guides/200_real_apps/020_logging.md.liquid b/_includes/en/guides/200_real_apps/020_logging.md.liquid index e0220a6c9..dd852f7f8 100644 --- a/_includes/en/guides/200_real_apps/020_logging.md.liquid +++ b/_includes/en/guides/200_real_apps/020_logging.md.liquid @@ -62,7 +62,7 @@ annotations: werf.io/log-regex: ".*ERROR.*" ``` -A list of all available annotations can be found [here]({{ site.url }}/documentation/v2/reference/deploy_annotations.html). +A list of all available annotations can be found [here]({{ site.url }}/docs/v2/reference/deploy_annotations.html). > _Note that these annotations only influence the way logs are shown during the werf-based deployment process. They do not affect the application being deployed or its configuration in any way. You can still use stdout/stderr streams of the container to view raw logs._ diff --git a/_includes/en/guides/200_real_apps/080_configuration.md.liquid b/_includes/en/guides/200_real_apps/080_configuration.md.liquid index 416b8964c..af656cd1f 100644 --- a/_includes/en/guides/200_real_apps/080_configuration.md.liquid +++ b/_includes/en/guides/200_real_apps/080_configuration.md.liquid @@ -34,9 +34,9 @@ Note that you will need a unique annotation for each mounted ConfigMap/Secret. Using a Helm chart to deploy an application has many advantages β€” for example, you can create manifest templates with Helm charts. `Values` is the key built-in templating object. With it, you can access values passed to the chart from various sources. When using werf, all data passed to the chart can be grouped into several categories: -- [User-defined regular values]({{ site.url }}/documentation/v2/advanced/helm/configuration/values.html#user-defined-regular-values): `values.yaml` parameters and corresponding options. -- [User-defined secret values]({{ site.url }}/documentation/v2/advanced/helm/configuration/values.html#user-defined-secret-values): parameters from the `secret-values.yaml` file. -- [Service values]({{ site.url }}/documentation/v2/advanced/helm/configuration/values.html#service-values): information about the project, release, built images, etc. +- [User-defined regular values]({{ site.url }}/docs/v2/advanced/helm/configuration/values.html#user-defined-regular-values): `values.yaml` parameters and corresponding options. +- [User-defined secret values]({{ site.url }}/docs/v2/advanced/helm/configuration/values.html#user-defined-secret-values): parameters from the `secret-values.yaml` file. +- [Service values]({{ site.url }}/docs/v2/advanced/helm/configuration/values.html#service-values): information about the project, release, built images, etc. ## Reusing configuration with Values and ConfigMaps @@ -71,7 +71,7 @@ Similarly, you can load this ConfigMap into other resources that use the same en To start working with secrets, you first need to generate a symmetric encryption key. You can use the following command to do this: `werf helm secret generate-secret-key`. However, since we have already prepared/encrypted the secrets for you, the encryption key that will be used in this chapter is generated as well. This encryption key is stored in the repository in the `.werf_secret_key` file; werf uses it automatically. ->_Caution! You MUST NOT store the key in the repository when working with real-life applications. We recommend keeping it in a safe place and passing via the `WERF_SECRET_KEY` environment variable. You can read more about using encryption keys in the [werf documentation]({{ site.url }}/documentation/v2/advanced/helm/configuration/secrets.html#encryption-key)._ +>_Caution! You MUST NOT store the key in the repository when working with real-life applications. We recommend keeping it in a safe place and passing via the `WERF_SECRET_KEY` environment variable. You can read more about using encryption keys in the [werf documentation]({{ site.url }}/docs/v2/advanced/helm/configuration/secrets.html#encryption-key)._ The application configuration contains data that should not be stored in unencrypted form in the repository (e.g., the database login and password). Thus, we won't store the login and password in plain text {% include guides/200_real_apps/080_configuration/{{ page.framework_id }}/055_loginpas_storage.md.liquid %} @@ -96,9 +96,9 @@ You have to make similar changes to the rest of the `.helm/templates` files (we {% include guides/200_real_apps/080_configuration/{{ page.framework_id }}/085_configs_including.md.liquid %} -You can also use Secrets to store and mount complete secret configuration files. This is similar to using ConfigMap to mount non-secret configuration files (as [described above](#storing-applications-config-files-in-the-configmap)), except that the Secret contents must be stored encrypted in `.helm/secret/...` or `.helm/secret-values.yaml`. You can read more about this in the [werf documentation]({{ site.url }}/documentation/v2/advanced/helm/configuration/secrets.html#secret-files). +You can also use Secrets to store and mount complete secret configuration files. This is similar to using ConfigMap to mount non-secret configuration files (as [described above](#storing-applications-config-files-in-the-configmap)), except that the Secret contents must be stored encrypted in `.helm/secret/...` or `.helm/secret-values.yaml`. You can read more about this in the [werf documentation]({{ site.url }}/docs/v2/advanced/helm/configuration/secrets.html#secret-files). -Note: learn more about working with secrets in the [werf documentation]({{ site.url }}/documentation/v2/advanced/helm/configuration/secrets.html). +Note: learn more about working with secrets in the [werf documentation]({{ site.url }}/docs/v2/advanced/helm/configuration/secrets.html). ## Checking whether the application runs as expected diff --git a/_includes/en/guides/400_ci_cd_workflow/030_gitlab_ci_cd.md.liquid b/_includes/en/guides/400_ci_cd_workflow/030_gitlab_ci_cd.md.liquid index 04a07d725..e1b286642 100644 --- a/_includes/en/guides/400_ci_cd_workflow/030_gitlab_ci_cd.md.liquid +++ b/_includes/en/guides/400_ci_cd_workflow/030_gitlab_ci_cd.md.liquid @@ -68,7 +68,7 @@ Let us install and configure the GitLab runner on the node where werf will be ru sudo usermod -aG docker gitlab-runner ``` -1. [Install werf](/documentation/index.html). +1. [Install werf](/docs/index.html). 1. Install `kubectl` and copy the kubectl config to the home directory of theΒ gitlab-runnerΒ user. ```shell @@ -193,9 +193,9 @@ Stop Review: The `Review` job defines the deployment of a review release to a dynamic environment, the name of which is based on an unique MR identifier. The `auto_stop_in` parameter allows you to specify a period of inactivity in the MR. The GitLab environment will be automatically stopped after this period is over. Stopping the GitLab environment does not affect resources in the cluster or a review release in any way. Therefore, we need to define the job that is called when the environment is being stopped (`on_stop`). In our case, this is a `Stop Review` job. -The `Stop Review` job deletes the review release and shuts down the GitLab environment (`action: stop`): werf deletes the helm release and the associated Kubernetes namespace with all its contents ([werf dismiss]({{ site.url }}/documentation/v2/reference/cli/werf_dismiss.html)). You can run the `Stop Review` job manually after the deployment to the review tier is complete, or automatically via the GitLab server (for example, when the corresponding branch is deleted as a result of merging with master, provided that the appropriate option is set in the GitLab interface). +The `Stop Review` job deletes the review release and shuts down the GitLab environment (`action: stop`): werf deletes the helm release and the associated Kubernetes namespace with all its contents ([werf dismiss]({{ site.url }}/docs/v2/reference/cli/werf_dismiss.html)). You can run the `Stop Review` job manually after the deployment to the review tier is complete, or automatically via the GitLab server (for example, when the corresponding branch is deleted as a result of merging with master, provided that the appropriate option is set in the GitLab interface). -The `werf dismiss` command requires werf.yaml to work, because this file contains [templates for the release name and the namespace]({{ site.url }}/documentation/v2/usage/deploy/environments.html). It is not possible to use the source code from the git when deleting a branch, that is why we use werf.yaml (it was saved when the Review job was running), while pulling changes from git is disabled (`GIT_STRATEGY: none`). +The `werf dismiss` command requires werf.yaml to work, because this file contains [templates for the release name and the namespace]({{ site.url }}/docs/v2/usage/deploy/environments.html). It is not possible to use the source code from the git when deleting a branch, that is why we use werf.yaml (it was saved when the Review job was running), while pulling changes from git is disabled (`GIT_STRATEGY: none`). Thus, by default, we have the following options for deleting the review environment: @@ -480,7 +480,7 @@ Cleanup: ``` {% endraw %} -werf has an efficient built-in cleanup mechanism to avoid overflowing the container registry and the building node with outdated and unused images. You can learn more about the werf's cleanup functionality [here]({{ site.url }}/documentation/v2/usage/cleanup/cr_cleanup.html). +werf has an efficient built-in cleanup mechanism to avoid overflowing the container registry and the building node with outdated and unused images. You can learn more about the werf's cleanup functionality [here]({{ site.url }}/docs/v2/usage/cleanup/cr_cleanup.html). To use cleanup, you have to create a `Personal Access Token` in GitLab with the necessary permissions. This token will be used for authorization in the container registry before cleanup. diff --git a/_includes/en/guides/400_ci_cd_workflow/040_github_actions.md.liquid b/_includes/en/guides/400_ci_cd_workflow/040_github_actions.md.liquid index 198f09366..68189c10d 100644 --- a/_includes/en/guides/400_ci_cd_workflow/040_github_actions.md.liquid +++ b/_includes/en/guides/400_ci_cd_workflow/040_github_actions.md.liquid @@ -162,7 +162,7 @@ on: types: [closed] ``` -The review release is deleted at the `Dismiss` step: werf deletes the helm release and the namespace in Kubernetes with all its contents ([werf dismiss]({{ site.url }}/documentation/v2/reference/cli/werf_dismiss.html)). +The review release is deleted at the `Dismiss` step: werf deletes the helm release and the namespace in Kubernetes with all its contents ([werf dismiss]({{ site.url }}/docs/v2/reference/cli/werf_dismiss.html)). Now, let us explore the main strategies to deploy the review environment. @@ -389,7 +389,7 @@ Most cleaning policies in werf are based on git primitives (commit, branch, and run: git fetch --prune --unshallow ``` -werf has an efficient built-in cleanup mechanism to avoid overflowing the container registry and the disk space on the building node with outdated and unused images. You can learn more about the werf's cleanup functionality [here]({{ site.url }}/documentation/v2/usage/cleanup/cr_cleanup.html). +werf has an efficient built-in cleanup mechanism to avoid overflowing the container registry and the disk space on the building node with outdated and unused images. You can learn more about the werf's cleanup functionality [here]({{ site.url }}/docs/v2/usage/cleanup/cr_cleanup.html). ## Complete set of configurations for ready-made workflows diff --git a/_includes/ru/guides/100_basic/10_build.md.liquid b/_includes/ru/guides/100_basic/10_build.md.liquid index 2a27758cd..fb173e35e 100644 --- a/_includes/ru/guides/100_basic/10_build.md.liquid +++ b/_includes/ru/guides/100_basic/10_build.md.liquid @@ -1,6 +1,6 @@ ## ΠŸΠΎΠ΄Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° -УстановитС werf ΠΈ Π΅Π³ΠΎ зависимости, [слСдуя инструкциям]({{ site.url }}/documentation/). +УстановитС werf ΠΈ Π΅Π³ΠΎ зависимости, [слСдуя инструкциям]({{ site.url }}/docs/). ## Π‘ΠΎΠ·Π΄Π°Π΄ΠΈΠΌ Π½ΠΎΠ²Ρ‹ΠΉ Ρ€Π΅ΠΏΠΎΠ·ΠΈΡ‚ΠΎΡ€ΠΈΠΉ с ΠΏΡ€ΠΈΠ»ΠΎΠΆΠ΅Π½ΠΈΠ΅ΠΌ @@ -20,7 +20,7 @@ {% include snippetcut_example path="werf.yaml" syntax="yaml" examples=page.examples %} -Π’ `werf.yaml` ΠΌΠΎΠΆΠ΅Ρ‚ ΠΎΠΏΠΈΡΡ‹Π²Π°Ρ‚ΡŒΡΡ сборка сразу Π½Π΅ΡΠΊΠΎΠ»ΡŒΠΊΠΈΡ… ΠΎΠ±Ρ€Π°Π·ΠΎΠ². Π’Π°ΠΊΠΆΠ΅ для сборки ΠΎΠ±Ρ€Π°Π·Π° сущСствуСт ряд Π΄ΠΎΠΏΠΎΠ»Π½ΠΈΡ‚Π΅Π»ΡŒΠ½Ρ‹Ρ… настроСк, с ΠΊΠΎΡ‚ΠΎΡ€Ρ‹ΠΌΠΈ ΠΌΠΎΠΆΠ½ΠΎ ΠΎΠ·Π½Π°ΠΊΠΎΠΌΠΈΡ‚ΡŒΡΡ [Π² Π΄ΠΎΠΊΡƒΠΌΠ΅Π½Ρ‚Π°Ρ†ΠΈΠΈ]({{ site.url }}/documentation/v2/reference/werf_yaml.html#dockerfile-image-section-image). +Π’ `werf.yaml` ΠΌΠΎΠΆΠ΅Ρ‚ ΠΎΠΏΠΈΡΡ‹Π²Π°Ρ‚ΡŒΡΡ сборка сразу Π½Π΅ΡΠΊΠΎΠ»ΡŒΠΊΠΈΡ… ΠΎΠ±Ρ€Π°Π·ΠΎΠ². Π’Π°ΠΊΠΆΠ΅ для сборки ΠΎΠ±Ρ€Π°Π·Π° сущСствуСт ряд Π΄ΠΎΠΏΠΎΠ»Π½ΠΈΡ‚Π΅Π»ΡŒΠ½Ρ‹Ρ… настроСк, с ΠΊΠΎΡ‚ΠΎΡ€Ρ‹ΠΌΠΈ ΠΌΠΎΠΆΠ½ΠΎ ΠΎΠ·Π½Π°ΠΊΠΎΠΌΠΈΡ‚ΡŒΡΡ [Π² Π΄ΠΎΠΊΡƒΠΌΠ΅Π½Ρ‚Π°Ρ†ΠΈΠΈ]({{ site.url }}/docs/v2/reference/werf_yaml.html#dockerfile-image-section-image). ## Π‘Π±ΠΎΡ€ΠΊΠ° с werf @@ -30,7 +30,7 @@ Π—Π΄Π΅ΡΡŒ ΠΌΡ‹ ΡƒΠΆΠ΅ сдСлали это Ρ€Π°Π½Π΅Π΅ Π² самом Π½Π°Ρ‡Π°Π»Π΅ страницы Π² Π³Π»Π°Π²Π΅ Β«Π‘ΠΎΠ·Π΄Π°Π΄ΠΈΠΌ Π½ΠΎΠ²Ρ‹ΠΉ Ρ€Π΅ΠΏΠΎΠ·ΠΈΡ‚ΠΎΡ€ΠΈΠΉ с ΠΏΡ€ΠΈΠ»ΠΎΠΆΠ΅Π½ΠΈΠ΅ΠΌΒ». Π’ ΠΎΠ±Ρ‹Ρ‡Π½ΠΎΠΌ ΠΆΠ΅ случаС Π½Π΅ΠΎΠ±Ρ…ΠΎΠ΄ΠΈΠΌΠΎ Π²Ρ‹ΠΏΠΎΠ»Π½ΠΈΡ‚ΡŒ ΠΊΠΎΠΌΠ°Π½Π΄Ρ‹ `git add` ΠΈ `git commit`. -Запустим сборку ΠΊΠΎΠΌΠ°Π½Π΄ΠΎΠΉ [`werf build`]({{ site.url }}/documentation/v2/reference/cli/werf_build.html): +Запустим сборку ΠΊΠΎΠΌΠ°Π½Π΄ΠΎΠΉ [`werf build`]({{ site.url }}/docs/v2/reference/cli/werf_build.html): ```shell werf build @@ -80,7 +80,7 @@ Running time 11.02 seconds ## Запуск прилоТСния -Π—Π°ΠΏΡƒΡΡ‚ΠΈΡ‚ΡŒ ΠΊΠΎΠ½Ρ‚Π΅ΠΉΠ½Π΅Ρ€ локально Π½Π° основС собранного ΠΎΠ±Ρ€Π°Π·Π° ΠΌΠΎΠΆΠ½ΠΎ ΠΊΠΎΠΌΠ°Π½Π΄ΠΎΠΉ [werf run]({{ site.url }}/documentation/v2/reference/cli/werf_run.html): +Π—Π°ΠΏΡƒΡΡ‚ΠΈΡ‚ΡŒ ΠΊΠΎΠ½Ρ‚Π΅ΠΉΠ½Π΅Ρ€ локально Π½Π° основС собранного ΠΎΠ±Ρ€Π°Π·Π° ΠΌΠΎΠΆΠ½ΠΎ ΠΊΠΎΠΌΠ°Π½Π΄ΠΎΠΉ [werf run]({{ site.url }}/docs/v2/reference/cli/werf_run.html): ```shell werf run app --docker-options="-ti --rm -p 8000:8000" -- /app/start.sh diff --git a/_includes/ru/guides/100_basic/20_cluster/has_cluster.md.liquid b/_includes/ru/guides/100_basic/20_cluster/has_cluster.md.liquid index 7fb07e048..aaafdc607 100644 --- a/_includes/ru/guides/100_basic/20_cluster/has_cluster.md.liquid +++ b/_includes/ru/guides/100_basic/20_cluster/has_cluster.md.liquid @@ -61,7 +61,7 @@ kubectl get ns ### Registry -werf ΠΏΠΎΠ΄Π΄Π΅Ρ€ΠΆΠΈΠ²Π°Π΅Ρ‚ [мноТСство ΠΈΠΌΠΏΠ»Π΅ΠΌΠ΅Π½Ρ‚Π°Ρ†ΠΈΠΉ]({{ site.url }}/documentation/v2/advanced/supported_registry_implementations.html) registry. +werf ΠΏΠΎΠ΄Π΄Π΅Ρ€ΠΆΠΈΠ²Π°Π΅Ρ‚ [мноТСство ΠΈΠΌΠΏΠ»Π΅ΠΌΠ΅Π½Ρ‚Π°Ρ†ΠΈΠΉ]({{ site.url }}/docs/v2/advanced/supported_registry_implementations.html) registry. Π£Π±Π΅Π΄ΠΈΡ‚Π΅ΡΡŒ, Ρ‡Ρ‚ΠΎ Π΅ΡΡ‚ΡŒ доступ кластСра ΠΏΠΎ сСти ΠΊ registry. diff --git a/_includes/ru/guides/100_basic/30_deploy.md.liquid b/_includes/ru/guides/100_basic/30_deploy.md.liquid index 610f1c456..5aed167c4 100644 --- a/_includes/ru/guides/100_basic/30_deploy.md.liquid +++ b/_includes/ru/guides/100_basic/30_deploy.md.liquid @@ -8,7 +8,7 @@ Π—Π΄Π΅ΡΡŒ с ΠΏΠΎΠΌΠΎΡ‰ΡŒΡŽ ΡˆΠ°Π±Π»ΠΎΠ½ΠΈΠ·Π°Ρ†ΠΈΠΈ подставляСтся ΠΏΠΎΠ»Π½ΠΎΠ΅ имя Docker-ΠΎΠ±Ρ€Π°Π·Π° нашСго прилоТСния: {% raw %}`{{ .Values.werf.image.app }}`{% endraw %}. Π’Π°ΠΆΠ½ΠΎ ΠΎΡ‚ΠΌΠ΅Ρ‚ΠΈΡ‚ΡŒ, Ρ‡Ρ‚ΠΎ для доступа ΠΊ этому Π·Π½Π°Ρ‡Π΅Π½ΠΈΡŽ Π½Π΅ΠΎΠ±Ρ…ΠΎΠ΄ΠΈΠΌΠΎ ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΠΎΠ²Π°Ρ‚ΡŒ имя ΠΊΠΎΠΌΠΏΠΎΠ½Π΅Π½Ρ‚Π°, ΠΊΠΎΡ‚ΠΎΡ€ΠΎΠ΅ ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΡƒΠ΅Ρ‚ΡΡ Π² `werf.yaml` β€” Π² нашСм случаС это `app`. -> ΠŸΠΎΠ»Π½Ρ‹Π΅ ΠΈΠΌΠ΅Π½Π° собираСмых ΠΎΠ±Ρ€Π°Π·ΠΎΠ², Ρ‚Π°ΠΊ ΠΆΠ΅ ΠΊΠ°ΠΊ ΠΈ Π΄Ρ€ΡƒΠ³ΠΈΠ΅ [сСрвисныС Π΄Π°Π½Π½Ρ‹Π΅]({{ site.url }}/documentation/v2/advanced/helm/configuration/values.html#%D1%81%D0%B5%D1%80%D0%B2%D0%B8%D1%81%D0%BD%D1%8B%D0%B5-%D0%B4%D0%B0%D0%BD%D0%BD%D1%8B%D0%B5), werf автоматичСски добавляСт Π² ΠΏΠ°Ρ€Π°ΠΌΠ΅Ρ‚Ρ€Ρ‹ Helm-Ρ‡Π°Ρ€Ρ‚Π° (`.Values`), ΠΎΠ½ΠΈ всС доступны ΠΏΠΎ ΠΊΠ»ΡŽΡ‡Ρƒ `werf`. +> ΠŸΠΎΠ»Π½Ρ‹Π΅ ΠΈΠΌΠ΅Π½Π° собираСмых ΠΎΠ±Ρ€Π°Π·ΠΎΠ², Ρ‚Π°ΠΊ ΠΆΠ΅ ΠΊΠ°ΠΊ ΠΈ Π΄Ρ€ΡƒΠ³ΠΈΠ΅ [сСрвисныС Π΄Π°Π½Π½Ρ‹Π΅]({{ site.url }}/docs/v2/advanced/helm/configuration/values.html#%D1%81%D0%B5%D1%80%D0%B2%D0%B8%D1%81%D0%BD%D1%8B%D0%B5-%D0%B4%D0%B0%D0%BD%D0%BD%D1%8B%D0%B5), werf автоматичСски добавляСт Π² ΠΏΠ°Ρ€Π°ΠΌΠ΅Ρ‚Ρ€Ρ‹ Helm-Ρ‡Π°Ρ€Ρ‚Π° (`.Values`), ΠΎΠ½ΠΈ всС доступны ΠΏΠΎ ΠΊΠ»ΡŽΡ‡Ρƒ `werf`. werf пСрСсобираСт ΠΎΠ±Ρ€Π°Π·Ρ‹ Ρ‚ΠΎΠ»ΡŒΠΊΠΎ ΠΏΡ€ΠΈ измСнСниях Π² добавляСмых Ρ„Π°ΠΉΠ»Π°Ρ… (ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΡƒΠ΅ΠΌΡ‹Ρ… Π² Dockerfile-инструкциях `COPY/ADD`), Π° Ρ‚Π°ΠΊΠΆΠ΅ ΠΏΡ€ΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΈ ΠΊΠΎΠ½Ρ„ΠΈΠ³ΡƒΡ€Π°Ρ†ΠΈΠΈ ΠΎΠ±Ρ€Π°Π·Π° Π² `werf.yaml`. ΠŸΡ€ΠΈ пСрСсборкС измСнится ΠΈ Ρ‚Π΅Π³ ΠΎΠ±Ρ€Π°Π·Π°, Ρ‡Ρ‚ΠΎ ΠΏΡ€ΠΈΠ²Π΅Π΄Ρ‘Ρ‚ ΠΊ обновлСнию Deployment'Π°. Если ΠΆΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π² Π²Ρ‹ΡˆΠ΅ΡƒΠΏΠΎΠΌΡΠ½ΡƒΡ‚Ρ‹Ρ… Ρ„Π°ΠΉΠ»Π°Ρ… Π½Π΅Ρ‚, Ρ‚ΠΎ ΠΎΠ±Ρ€Π°Π· Π½Π΅ пСрСсобСрётся, Π° Deployment ΠΈ создаваСмыС ΠΈΠΌ рСсурсы Π½Π΅ пСрСдСплоятся, Ρ‚.ΠΊ. Π² этом просто Π½Π΅Ρ‚ нСобходимости: Π² кластСрС ΡƒΠΆΠ΅ самая свСТая вСрсия прилоТСния. @@ -28,7 +28,7 @@ werf пСрСсобираСт ΠΎΠ±Ρ€Π°Π·Ρ‹ Ρ‚ΠΎΠ»ΡŒΠΊΠΎ ΠΏΡ€ΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈ > Π’ случаС, Ссли Π²Ρ‹ ΡƒΠ΄Π°Π»ΠΈΠ»ΠΈ namespace прилоТСния, Ρ‚ΠΎ Π½Π΅ΠΎΠ±Ρ…ΠΎΠ΄ΠΈΠΌΠΎ Π²Π΅Ρ€Π½ΡƒΡ‚ΡŒΡΡ ΠΊ ΠΏΡ€Π΅Π΄Ρ‹Π΄ΡƒΡ‰Π΅ΠΉ ΡΡ‚Π°Ρ‚ΡŒΠ΅ ΠΈ Π·Π°Π½ΠΎΠ²ΠΎ ΠΏΠ΅Ρ€Π΅ΡΠΎΠ·Π΄Π°Ρ‚ΡŒ registry secret. -Команда [werf converge]({{ site.url }}/documentation/v2/reference/cli/werf_converge.html) Π²Ρ‹ΠΏΠΎΠ»Π½ΠΈΡ‚ сразу ΠΈ сборку, ΠΈ Ρ€Π°Π·Π²Π΅Ρ€Ρ‚Ρ‹Π²Π°Π½ΠΈΠ΅ прилоТСния Π² Kubernetes: +Команда [werf converge]({{ site.url }}/docs/v2/reference/cli/werf_converge.html) Π²Ρ‹ΠΏΠΎΠ»Π½ΠΈΡ‚ сразу ΠΈ сборку, ΠΈ Ρ€Π°Π·Π²Π΅Ρ€Ρ‚Ρ‹Π²Π°Π½ΠΈΠ΅ прилоТСния Π² Kubernetes: ```shell werf converge --repo <ИМЯ ΠŸΠžΠ›Π¬Π—ΠžΠ’ΠΠ’Π•Π›Π― DOCKER HUB>/werf-guide-app ``` diff --git a/_includes/ru/guides/100_basic/35_deploy_changes.md.liquid b/_includes/ru/guides/100_basic/35_deploy_changes.md.liquid index e494abb3a..6230ce02a 100644 --- a/_includes/ru/guides/100_basic/35_deploy_changes.md.liquid +++ b/_includes/ru/guides/100_basic/35_deploy_changes.md.liquid @@ -171,7 +171,7 @@ werf-guide-app-57f854484f-2xbzl 1/1 Running 0 119m ``` {% endofftopic %} -ΠšΠΎΠ»ΠΈΡ‡Π΅ΡΡ‚Π²ΠΎ Ρ€Π΅ΠΏΠ»ΠΈΠΊ измСнилось: ΠΈΡ… число снова соотвСтствуСт Ρ‚Π°ΠΊΠΎΠ²ΠΎΠΌΡƒ Π² Git-Ρ€Π΅ΠΏΠΎΠ·ΠΈΡ‚ΠΎΡ€ΠΈΠΈ. Π­Ρ‚ΠΎ ΠΏΡ€ΠΎΠΈΠ·ΠΎΡˆΠ»ΠΎ, ΠΏΠΎΡ‚ΠΎΠΌΡƒ Ρ‡Ρ‚ΠΎ werf ΠΏΡ€ΠΈΠ²Π΅Π»Π° состояниС кластСра ΠΊ ΡΠΎΡΡ‚ΠΎΡΠ½ΠΈΡŽ, описанному Π² Ρ‚Π΅ΠΊΡƒΡ‰Π΅ΠΌ Git-ΠΊΠΎΠΌΠΌΠΈΡ‚Π΅. Π­Ρ‚ΠΎΡ‚ ΠΏΡ€ΠΈΠ½Ρ†ΠΈΠΏ называСтся [**Π³ΠΈΡ‚Π΅Ρ€ΠΌΠΈΠ½ΠΈΠ·ΠΌΠΎΠΌ**]({{ site.url }}/documentation/v2/advanced/giterminism.html) (giterminism). +ΠšΠΎΠ»ΠΈΡ‡Π΅ΡΡ‚Π²ΠΎ Ρ€Π΅ΠΏΠ»ΠΈΠΊ измСнилось: ΠΈΡ… число снова соотвСтствуСт Ρ‚Π°ΠΊΠΎΠ²ΠΎΠΌΡƒ Π² Git-Ρ€Π΅ΠΏΠΎΠ·ΠΈΡ‚ΠΎΡ€ΠΈΠΈ. Π­Ρ‚ΠΎ ΠΏΡ€ΠΎΠΈΠ·ΠΎΡˆΠ»ΠΎ, ΠΏΠΎΡ‚ΠΎΠΌΡƒ Ρ‡Ρ‚ΠΎ werf ΠΏΡ€ΠΈΠ²Π΅Π»Π° состояниС кластСра ΠΊ ΡΠΎΡΡ‚ΠΎΡΠ½ΠΈΡŽ, описанному Π² Ρ‚Π΅ΠΊΡƒΡ‰Π΅ΠΌ Git-ΠΊΠΎΠΌΠΌΠΈΡ‚Π΅. Π­Ρ‚ΠΎΡ‚ ΠΏΡ€ΠΈΠ½Ρ†ΠΈΠΏ называСтся [**Π³ΠΈΡ‚Π΅Ρ€ΠΌΠΈΠ½ΠΈΠ·ΠΌΠΎΠΌ**]({{ site.url }}/docs/v2/advanced/giterminism.html) (giterminism). Как ΠΆΠ΅ ΡΠΎΠ±Π»ΡŽΡΡ‚ΠΈ **Π³ΠΈΡ‚Π΅Ρ€ΠΌΠΈΠ½ΠΈΠ·ΠΌ** ΠΈ ΡΠ΄Π΅Π»Π°Ρ‚ΡŒ всё ΠΏΡ€Π°Π²ΠΈΠ»ΡŒΠ½ΠΎ? Π‘Π½ΠΎΠ²Π° выставим Ρ‚ΠΎΡ‚ ΠΆΠ΅ `spec.replicas=4`, Π½ΠΎ Ρ‚Π΅ΠΏΠ΅Ρ€ΡŒ β€” Ρ‡Π΅Ρ€Π΅Π· состояниС прилоТСния, описанноС Π² Git: diff --git a/_includes/ru/guides/100_basic/40_must_haves.md.liquid b/_includes/ru/guides/100_basic/40_must_haves.md.liquid index 806fe2cd4..e4d5b144a 100644 --- a/_includes/ru/guides/100_basic/40_must_haves.md.liquid +++ b/_includes/ru/guides/100_basic/40_must_haves.md.liquid @@ -12,11 +12,11 @@ Π§Ρ‚ΠΎΠ±Ρ‹ Π³Π°Ρ€Π°Π½Ρ‚ΠΈΡ€ΠΎΠ²Π°Ρ‚ΡŒ Π²ΠΎΡΠΏΡ€ΠΎΠΈΠ·Π²ΠΎΠ΄ΠΈΠΌΠΎΡΡ‚ΡŒ, werf слСдуСт ΠΏΡ€ΠΈΠ½Ρ†ΠΈΠΏΡƒ **Π³ΠΈΡ‚Π΅Ρ€ΠΌΠΈΠ½ΠΈΠ·ΠΌΠ°** (giterminism), Ρ‚.Π΅. опрСдСляСт _(Π΄Π΅Ρ‚Π΅Ρ€ΠΌΠΈΠ½ΠΈΡ€ΡƒΠ΅Ρ‚)_ Ρ€Π°Π±ΠΎΡ‚Ρƒ с ΠΏΡ€ΠΎΠ΅ΠΊΡ‚ΠΎΠΌ с ΠΏΠΎΠΌΠΎΡ‰ΡŒΡŽ Ρ„Π°ΠΉΠ»ΠΎΠ² ΠΈΠ· Ρ‚Π΅ΠΊΡƒΡ‰Π΅Π³ΠΎ Git-состояния (HEAD-ΠΊΠΎΠΌΠΌΠΈΡ‚Π°). По ΡƒΠΌΠΎΠ»Ρ‡Π°Π½ΠΈΡŽ werf Π½Π΅ позволяСт ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΠΎΠ²Π°Ρ‚ΡŒ Π½Π΅ΠΊΠΎΠΌΠΌΠΈΡ‚Π½ΡƒΡ‚Ρ‹Π΅ Ρ„Π°ΠΉΠ»Ρ‹ Π² ΠΊΠΎΠ½Ρ„ΠΈΠ³ΡƒΡ€Π°Ρ†ΠΈΠΈ ΠΈ сборочном контСкстС собираСмых ΠΎΠ±Ρ€Π°Π·ΠΎΠ², Π° Ρ‚Π°ΠΊΠΆΠ΅ ΠΈΡΠΊΠ»ΡŽΡ‡Π°Π΅Ρ‚ Ρ„ΡƒΠ½ΠΊΡ†ΠΈΠΎΠ½Π°Π»ΡŒΠ½ΠΎΡΡ‚ΡŒ, ΠΏΠΎΡ‚Π΅Π½Ρ†ΠΈΠ°Π»ΡŒΠ½ΠΎ ΠΈΠΌΠ΅ΡŽΡ‰ΡƒΡŽ внСшниС зависимости. -ΠœΡ‹ Π½Π°ΡΡ‚ΠΎΡΡ‚Π΅Π»ΡŒΠ½ΠΎ Ρ€Π΅ΠΊΠΎΠΌΠ΅Π½Π΄ΡƒΠ΅ΠΌ ΡΠ»Π΅Π΄ΠΎΠ²Π°Ρ‚ΡŒ этому ΠΏΠΎΠ΄Ρ…ΠΎΠ΄Ρƒ, ΠΎΠ΄Π½Π°ΠΊΠΎ ΠΏΡ€ΠΈ нСобходимости ΠΌΠΎΠΆΠ½ΠΎ явно ΠΎΡΠ»Π°Π±ΠΈΡ‚ΡŒ ограничСния Π³ΠΈΡ‚Π΅Ρ€ΠΌΠΈΠ½ΠΈΠ·ΠΌΠ° ΠΈ Π²ΠΊΠ»ΡŽΡ‡ΠΈΡ‚ΡŒ Π΄ΠΎΠΏΠΎΠ»Π½ΠΈΡ‚Π΅Π»ΡŒΠ½ΡƒΡŽ Ρ„ΡƒΠ½ΠΊΡ†ΠΈΠΎΠ½Π°Π»ΡŒΠ½ΠΎΡΡ‚ΡŒ, Ρ‚Ρ€Π΅Π±ΡƒΡŽΡ‰ΡƒΡŽ осмыслСнного использования. Π­Ρ‚ΠΎ дСлаСтся Π² ΠΊΠΎΠ½Ρ„ΠΈΠ³ΡƒΡ€Π°Ρ†ΠΈΠΈ [werf-giterminism.yaml]({{ site.url }}/documentation/v2/reference/werf_giterminism_yaml.html). +ΠœΡ‹ Π½Π°ΡΡ‚ΠΎΡΡ‚Π΅Π»ΡŒΠ½ΠΎ Ρ€Π΅ΠΊΠΎΠΌΠ΅Π½Π΄ΡƒΠ΅ΠΌ ΡΠ»Π΅Π΄ΠΎΠ²Π°Ρ‚ΡŒ этому ΠΏΠΎΠ΄Ρ…ΠΎΠ΄Ρƒ, ΠΎΠ΄Π½Π°ΠΊΠΎ ΠΏΡ€ΠΈ нСобходимости ΠΌΠΎΠΆΠ½ΠΎ явно ΠΎΡΠ»Π°Π±ΠΈΡ‚ΡŒ ограничСния Π³ΠΈΡ‚Π΅Ρ€ΠΌΠΈΠ½ΠΈΠ·ΠΌΠ° ΠΈ Π²ΠΊΠ»ΡŽΡ‡ΠΈΡ‚ΡŒ Π΄ΠΎΠΏΠΎΠ»Π½ΠΈΡ‚Π΅Π»ΡŒΠ½ΡƒΡŽ Ρ„ΡƒΠ½ΠΊΡ†ΠΈΠΎΠ½Π°Π»ΡŒΠ½ΠΎΡΡ‚ΡŒ, Ρ‚Ρ€Π΅Π±ΡƒΡŽΡ‰ΡƒΡŽ осмыслСнного использования. Π­Ρ‚ΠΎ дСлаСтся Π² ΠΊΠΎΠ½Ρ„ΠΈΠ³ΡƒΡ€Π°Ρ†ΠΈΠΈ [werf-giterminism.yaml]({{ site.url }}/docs/v2/reference/werf_giterminism_yaml.html). ИзмСнСниС Ρ„Π°ΠΉΠ»ΠΎΠ² ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π° ΠΏΡ€ΠΈ ΠΎΡ‚Π»Π°Π΄ΠΊΠ΅ ΠΈ Ρ€Π°Π·Ρ€Π°Π±ΠΎΡ‚ΠΊΠ΅ ΠΌΠΎΠΆΠ΅Ρ‚ Π±Ρ‹Ρ‚ΡŒ Π½Π΅ΡƒΠ΄ΠΎΠ±Π½Ρ‹ΠΌ ΠΈΠ·-Π·Π° нСобходимости ΡΠΎΠ·Π΄Π°Π²Π°Ρ‚ΡŒ ΠΏΡ€ΠΎΠΌΠ΅ΠΆΡƒΡ‚ΠΎΡ‡Π½Ρ‹Π΅ ΠΊΠΎΠΌΠΌΠΈΡ‚Ρ‹. Π’ Ρ‚Π°ΠΊΠΈΡ… случаях рСкомСндуСтся Ρ€Π°Π±ΠΎΡ‚Π°Ρ‚ΡŒ Π² Ρ€Π΅ΠΆΠΈΠΌΠ΅ Ρ€Π°Π·Ρ€Π°Π±ΠΎΡ‚Ρ‡ΠΈΠΊΠ° (ΠΈΠ»ΠΈ просто _dev_ β€” ΠΏΠΎΠ΄Ρ€ΠΎΠ±Π½Π΅Π΅ см. Π½ΠΈΠΆΠ΅). -_Π‘ΠΎΠ»Π΅Π΅ ΠΏΠΎΠ΄Ρ€ΠΎΠ±Π½ΡƒΡŽ Π΄ΠΎΠΊΡƒΠΌΠ΅Π½Ρ‚Π°Ρ†ΠΈΡŽ ΠΏΠΎ Π³ΠΈΡ‚Π΅Ρ€ΠΌΠΈΠ½ΠΈΠ·ΠΌΡƒ см. [здСсь]({{ site.url }}/documentation/v2/advanced/giterminism.html)._ +_Π‘ΠΎΠ»Π΅Π΅ ΠΏΠΎΠ΄Ρ€ΠΎΠ±Π½ΡƒΡŽ Π΄ΠΎΠΊΡƒΠΌΠ΅Π½Ρ‚Π°Ρ†ΠΈΡŽ ΠΏΠΎ Π³ΠΈΡ‚Π΅Ρ€ΠΌΠΈΠ½ΠΈΠ·ΠΌΡƒ см. [здСсь]({{ site.url }}/docs/v2/advanced/giterminism.html)._ ### Π Π΅ΠΆΠΈΠΌ dev @@ -58,10 +58,10 @@ _Π‘ΠΎΠ»Π΅Π΅ ΠΏΠΎΠ΄Ρ€ΠΎΠ±Π½ΡƒΡŽ Π΄ΠΎΠΊΡƒΠΌΠ΅Π½Ρ‚Π°Ρ†ΠΈΡŽ ΠΏΠΎ Π³ΠΈΡ‚Π΅Ρ€ΠΌΠΈΠ½ΠΈ ΠšΡ€ΠΎΠΌΠ΅ Ρ‚ΠΎΠ³ΠΎ, Π² werf Β«ΠΈΠ· ΠΊΠΎΡ€ΠΎΠ±ΠΊΠΈΒ» Ρ€Π°Π±ΠΎΡ‚Π°ΡŽΡ‚ (Π²ΠΊΠ»ΡŽΡ‡Π΅Π½Ρ‹ ΠΏΠΎ ΡƒΠΌΠΎΠ»Ρ‡Π°Π½ΠΈΡŽ): -* [**ΠΏΠ°Ρ€Π°Π»Π»Π΅Π»ΡŒΠ½Π°Ρ сборка**]({{ site.url }}/documentation/v2/internals/build_process.html#ΠΏΠ°Ρ€Π°Π»Π»Π΅Π»ΡŒΠ½Π°Ρ-сборка), ΠΊΠΎΠ³Π΄Π° нСзависимыС ΠΎΠ±Ρ€Π°Π·Ρ‹ ΡΠΎΠ±ΠΈΡ€Π°ΡŽΡ‚ΡΡ ΠΎΠ΄Π½ΠΎΠ²Ρ€Π΅ΠΌΠ΅Π½Π½ΠΎ; +* [**ΠΏΠ°Ρ€Π°Π»Π»Π΅Π»ΡŒΠ½Π°Ρ сборка**]({{ site.url }}/docs/v2/internals/build_process.html#ΠΏΠ°Ρ€Π°Π»Π»Π΅Π»ΡŒΠ½Π°Ρ-сборка), ΠΊΠΎΠ³Π΄Π° нСзависимыС ΠΎΠ±Ρ€Π°Π·Ρ‹ ΡΠΎΠ±ΠΈΡ€Π°ΡŽΡ‚ΡΡ ΠΎΠ΄Π½ΠΎΠ²Ρ€Π΅ΠΌΠ΅Π½Π½ΠΎ; * **распрСдСлСнный ΠΈΠΌΠΌΡƒΡ‚Π°Π±Π΅Π»ΡŒΠ½Ρ‹ΠΉ кэш**, ΠΊΠΎΡ‚ΠΎΡ€Ρ‹ΠΉ благодаря ΠΌΠ΅Ρ…Π°Π½ΠΈΠ·ΠΌΠ°ΠΌ синхронизации ΠΈ Π±Π»ΠΎΠΊΠΈΡ€ΠΎΠ²ΠΎΠΊ позволяСт ΠΏΡ€ΠΎΠΈΠ·Π²ΠΎΠ»ΡŒΠ½ΠΎΠΌΡƒ числу сборщиков Ρ€Π°Π±ΠΎΡ‚Π°Ρ‚ΡŒ с ΠΎΠ±Ρ‰ΠΈΠΌ кэшСм Π² container registry, Π½Π΅ Π½Π°Ρ€ΡƒΡˆΠ°Ρ Π²ΠΎΡΠΏΡ€ΠΎΠΈΠ·Π²ΠΎΠ΄ΠΈΠΌΠΎΡΡ‚ΡŒ Ρ€Π°Π½Π½Π΅Π΅ собранных слоёв ΠΈ ΠΎΠ±Ρ€Π°Π·ΠΎΠ². Для этого ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΡƒΠ΅Ρ‚ΡΡ ΠΏΠΎΠ΄Ρ…ΠΎΠ΄, основанный Π½Π° идСях [MVCC](https://ru.wikipedia.org/wiki/MVCC) ΠΈ [optimistic locking](https://en.wikipedia.org/wiki/Optimistic_concurrency_control). -ΠŸΠΎΠ΄Ρ€ΠΎΠ±Π½Π΅Π΅ ΠΎ Ρ‚ΠΎΠΌ, ΠΊΠ°ΠΊ хранятся Π΄Π°Π½Π½Ρ‹Π΅ Π² registry, ΠΌΠΎΠΆΠ½ΠΎ ΠΏΠΎΡ‡ΠΈΡ‚Π°Ρ‚ΡŒ [Π² Π΄ΠΎΠΊΡƒΠΌΠ΅Π½Ρ‚Π°Ρ†ΠΈΠΈ werf]({{ site.url }}/documentation/v2/internals/stages_and_storage.html). Π’Π°ΠΌ написано, ΠΊΠ°ΠΊ устроСн процСсс сборки, ΠΊΠ°ΠΊ ΡƒΡ‡ΠΈΡ‚Ρ‹Π²Π°ΡŽΡ‚ΡΡ зависимости ΠΌΠ΅ΠΆΠ΄Ρƒ стадиями сборки, Π° Ρ‚Π°ΠΊΠΆΠ΅ β€” ΠΊΠ°ΠΊ устроСно ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΠ΅ ΠΏΠΎΠ»ΡƒΡ‡Π΅Π½Π½Ρ‹Ρ… ΠΎΠ±Ρ€Π°Π·ΠΎΠ². +ΠŸΠΎΠ΄Ρ€ΠΎΠ±Π½Π΅Π΅ ΠΎ Ρ‚ΠΎΠΌ, ΠΊΠ°ΠΊ хранятся Π΄Π°Π½Π½Ρ‹Π΅ Π² registry, ΠΌΠΎΠΆΠ½ΠΎ ΠΏΠΎΡ‡ΠΈΡ‚Π°Ρ‚ΡŒ [Π² Π΄ΠΎΠΊΡƒΠΌΠ΅Π½Ρ‚Π°Ρ†ΠΈΠΈ werf]({{ site.url }}/docs/v2/internals/stages_and_storage.html). Π’Π°ΠΌ написано, ΠΊΠ°ΠΊ устроСн процСсс сборки, ΠΊΠ°ΠΊ ΡƒΡ‡ΠΈΡ‚Ρ‹Π²Π°ΡŽΡ‚ΡΡ зависимости ΠΌΠ΅ΠΆΠ΄Ρƒ стадиями сборки, Π° Ρ‚Π°ΠΊΠΆΠ΅ β€” ΠΊΠ°ΠΊ устроСно ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΠ΅ ΠΏΠΎΠ»ΡƒΡ‡Π΅Π½Π½Ρ‹Ρ… ΠΎΠ±Ρ€Π°Π·ΠΎΠ². ### Π’Π΅Π³ΠΈΡ€ΠΎΠ²Π°Π½ΠΈΠ΅ ΠΎΠ±Ρ€Π°Π·ΠΎΠ² @@ -84,7 +84,7 @@ _Π‘ΠΎΠ»Π΅Π΅ ΠΏΠΎΠ΄Ρ€ΠΎΠ±Π½ΡƒΡŽ Π΄ΠΎΠΊΡƒΠΌΠ΅Π½Ρ‚Π°Ρ†ΠΈΡŽ ΠΏΠΎ Π³ΠΈΡ‚Π΅Ρ€ΠΌΠΈΠ½ΠΈ werf ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΡƒΠ΅Ρ‚ Helm для дСплоя прилоТСния. [Helm-Ρ‡Π°Ρ€Ρ‚](https://helm.sh/docs/topics/charts/) β€” это Π½Π°Π±ΠΎΡ€ Ρ„Π°ΠΉΠ»ΠΎΠ², ΠΊΠΎΡ‚ΠΎΡ€Ρ‹ΠΉ описываСт связанный Π½Π°Π±ΠΎΡ€ ΠΎΠ±ΡŠΠ΅ΠΊΡ‚ΠΎΠ² Kubernetes. Когда Ρ‡Π°Ρ€Ρ‚ разворачиваСтся Π² кластСрС Π² ΠΎΠΏΡ€Π΅Π΄Π΅Π»Ρ‘Π½Π½ΠΎΠ΅ ΠΎΠΊΡ€ΡƒΠΆΠ΅Π½ΠΈΠ΅ β€” создаётся _Ρ€Π΅Π»ΠΈΠ·_. {% offtopic title="Π“Π΄Π΅ ΠΏΠΎΡ‡ΠΈΡ‚Π°Ρ‚ΡŒ ΠΏΠΎΠ΄Ρ€ΠΎΠ±Π½Π΅Π΅" %} -Π’ [Π΄ΠΎΠΊΡƒΠΌΠ΅Π½Ρ‚Π°Ρ†ΠΈΠΈ werf]({{ site.url }}/documentation/v2/advanced/helm/releases/release.html) Π΅ΡΡ‚ΡŒ ΠΏΠΎΠ΄Ρ€ΠΎΠ±Π½ΠΎΠ΅ описаниС Ρ‚ΠΎΠ³ΠΎ, ΠΊΠ°ΠΊ устроСна Ρ€Π°Π±ΠΎΡ‚Π° с Ρ€Π΅Π»ΠΈΠ·Π°ΠΌΠΈ, ΠΈΡ… Ρ…Ρ€Π°Π½Π΅Π½ΠΈΠ΅ ΠΈ ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΠ΅. +Π’ [Π΄ΠΎΠΊΡƒΠΌΠ΅Π½Ρ‚Π°Ρ†ΠΈΠΈ werf]({{ site.url }}/docs/v2/advanced/helm/releases/release.html) Π΅ΡΡ‚ΡŒ ΠΏΠΎΠ΄Ρ€ΠΎΠ±Π½ΠΎΠ΅ описаниС Ρ‚ΠΎΠ³ΠΎ, ΠΊΠ°ΠΊ устроСна Ρ€Π°Π±ΠΎΡ‚Π° с Ρ€Π΅Π»ΠΈΠ·Π°ΠΌΠΈ, ΠΈΡ… Ρ…Ρ€Π°Π½Π΅Π½ΠΈΠ΅ ΠΈ ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΠ΅. {% endofftopic %} werf всСцСло ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΡƒΠ΅Ρ‚ ΠΏΠΎΠ»ΠΈΡ‚ΠΈΠΊΡƒ Π³ΠΈΡ‚Π΅Ρ€ΠΌΠΈΠ½ΠΈΠ·ΠΌΠ° ΠΏΡ€ΠΈ Ρ€Π°Π±ΠΎΡ‚Π΅ с Ρ€Π΅Π»ΠΈΠ·Π°ΠΌΠΈ. Для Helm-Ρ€Π΅Π»ΠΈΠ·ΠΎΠ² примСняСтся ΠΌΠ΅Ρ…Π°Π½ΠΈΠΊΠ° [3-way merge](https://helm.sh/docs/faq/#improved-upgrade-strategy-3-way-strategic-merge-patches): измСнСния, Π²Ρ€ΡƒΡ‡Π½ΡƒΡŽ внСсённыС Π² кластСр ΠΈ ΠΏΡ€ΠΎΡ‚ΠΈΠ²ΠΎΡ€Π΅Ρ‡Π°Ρ‰ΠΈΠ΅ Ρ‚ΠΎΠΌΡƒ, Ρ‡Ρ‚ΠΎ описано Π² Git, Π±ΡƒΠ΄ΡƒΡ‚ ΠΏΡ€ΠΈΠ²Π΅Π΄Π΅Π½Ρ‹ ΠΊ ΡΠΎΡΡ‚ΠΎΡΠ½ΠΈΡŽ Π² Git. ΠžΠ±Ρ€Π°Ρ‚ΠΈΡ‚Π΅ Π²Π½ΠΈΠΌΠ°Π½ΠΈΠ΅, Ρ‡Ρ‚ΠΎ внСсённыС Π²Ρ€ΡƒΡ‡Π½ΡƒΡŽ измСнСния, _Π½Π΅_ ΠΏΡ€ΠΎΡ‚ΠΈΠ²ΠΎΡ€Π΅Ρ‡Π°Ρ‰ΠΈΠ΅ Git, ΠΎΡΡ‚Π°ΡŽΡ‚ΡΡ Π½Π΅ ΠΏΠΎΠ΄ ΠΊΠΎΠ½Ρ‚Ρ€ΠΎΠ»Π΅ΠΌ Helm ΠΈ werf. @@ -97,15 +97,15 @@ werf создаСт Ρ€Π΅Π»ΠΈΠ·Ρ‹ ΡΠ°ΠΌΠΎΡΡ‚ΠΎΡΡ‚Π΅Π»ΡŒΠ½ΠΎ, Π½ΠΎ Ссли Π² ΠžΠΏΡ€Π΅Π΄Π΅Π»Π΅Π½Π½ΠΎΠ΅ состояниС Π²Ρ‹ΠΊΠ°Ρ‡Π΅Π½Π½ΠΎΠ³ΠΎ прилоТСния называСтся Ρ€Π΅Π»ΠΈΠ·ΠΎΠΌ. Π Π΅Π»ΠΈΠ·Ρ‹ ΠΏΠΎΠΊΠ°Π·Ρ‹Π²Π°ΡŽΡ‚, Ρ‡Ρ‚ΠΎ ΠΊΠΎΠ½ΠΊΡ€Π΅Ρ‚Π½ΠΎ Π² кластСрС установлСно ΠΏΡ€ΠΈ ΠΏΠΎΠΌΠΎΡ‰ΠΈ werf ΠΈ Helm, Π² ΠΊΠ°ΠΊΠΎΠΌ ΠΎΠΊΡ€ΡƒΠΆΠ΅Π½ΠΈΠΈ ΠΈ Π² ΠΊΠ°ΠΊΠΎΠΌ состоянии ΠΎΠ½ΠΎ находится. -Π§Ρ‚ΠΎΠ±Ρ‹ ΠΏΠΎΡΠΌΠΎΡ‚Ρ€Π΅Ρ‚ΡŒ список Ρ€Π΅Π»ΠΈΠ·ΠΎΠ² ΠΈΠ»ΠΈ Π½Π°ΠΉΡ‚ΠΈ, ΠΊΠ°ΠΊ называСтся Π½ΡƒΠΆΠ½Ρ‹ΠΉ Π²Π°ΠΌ Ρ€Π΅Π»ΠΈΠ·, Π²ΠΎΡΠΏΠΎΠ»ΡŒΠ·ΡƒΠΉΡ‚Π΅ΡΡŒ CLI-ΠΊΠΎΠΌΠ°Π½Π΄ΠΎΠΉ [`werf helm list -A`]({{ site.url }}/documentation/v2/reference/cli/werf_helm_list.html). +Π§Ρ‚ΠΎΠ±Ρ‹ ΠΏΠΎΡΠΌΠΎΡ‚Ρ€Π΅Ρ‚ΡŒ список Ρ€Π΅Π»ΠΈΠ·ΠΎΠ² ΠΈΠ»ΠΈ Π½Π°ΠΉΡ‚ΠΈ, ΠΊΠ°ΠΊ называСтся Π½ΡƒΠΆΠ½Ρ‹ΠΉ Π²Π°ΠΌ Ρ€Π΅Π»ΠΈΠ·, Π²ΠΎΡΠΏΠΎΠ»ΡŒΠ·ΡƒΠΉΡ‚Π΅ΡΡŒ CLI-ΠΊΠΎΠΌΠ°Π½Π΄ΠΎΠΉ [`werf helm list -A`]({{ site.url }}/docs/v2/reference/cli/werf_helm_list.html). ### Π£Π΄Π°Π»ΠΈΡ‚ΡŒ лишнСС -Π§Ρ‚ΠΎΠ±Ρ‹ ΡƒΠ΄Π°Π»ΠΈΡ‚ΡŒ Ρ€Π΅Π»ΠΈΠ· прилоТСния ΠΈΠ· Kubernetes, Π²ΠΎΡΠΏΠΎΠ»ΡŒΠ·ΡƒΠΉΡ‚Π΅ΡΡŒ [`werf dismiss`]({{ site.url }}/documentation/v2/reference/cli/werf_dismiss.html). +Π§Ρ‚ΠΎΠ±Ρ‹ ΡƒΠ΄Π°Π»ΠΈΡ‚ΡŒ Ρ€Π΅Π»ΠΈΠ· прилоТСния ΠΈΠ· Kubernetes, Π²ΠΎΡΠΏΠΎΠ»ΡŒΠ·ΡƒΠΉΡ‚Π΅ΡΡŒ [`werf dismiss`]({{ site.url }}/docs/v2/reference/cli/werf_dismiss.html). ### ΠžΡ‚Π»Π°Π΄ΠΊΠ° установки -ΠžΡ‚Π»Π°Π΄ΠΊΠ° позволяСт ΠΏΠΎΡΠΌΠΎΡ‚Ρ€Π΅Ρ‚ΡŒ, Ρ‡Ρ‚ΠΎ пошло Π½Π΅ Ρ‚Π°ΠΊ Π² процСссС Ρ€Π°Π±ΠΎΡ‚Ρ‹ werf. Π—Π°Ρ‡Π°ΡΡ‚ΡƒΡŽ Π²ΠΎΠ·Π½ΠΈΠΊΠ°ΡŽΡ‚ слоТности ΠΏΡ€ΠΈ Ρ€Π°Π·Π²ΠΎΡ€Π°Ρ‡ΠΈΠ²Π°Π½ΠΈΠΈ Ρ€Π΅Π»ΠΈΠ·Π° ΠΈΠ·-Π·Π° ошибок, Π΄ΠΎΠΏΡƒΡ‰Π΅Π½Π½Ρ‹Ρ… ΠΏΡ€ΠΈ написании Ρ‡Π°Ρ€Ρ‚ΠΎΠ². ΠžΡ‚Π»Π°Π΄ΠΈΡ‚ΡŒ Ρ‚Π°ΠΊΠΈΠ΅ ΠΏΡ€ΠΎΠ±Π»Π΅ΠΌΡ‹ ΠΏΠΎΠΌΠΎΠ³Π°Π΅Ρ‚ ΠΊΠΎΠΌΠ°Π½Π΄Π° [`werf render`]({{ site.url }}/documentation/v2/reference/cli/werf_render.html). +ΠžΡ‚Π»Π°Π΄ΠΊΠ° позволяСт ΠΏΠΎΡΠΌΠΎΡ‚Ρ€Π΅Ρ‚ΡŒ, Ρ‡Ρ‚ΠΎ пошло Π½Π΅ Ρ‚Π°ΠΊ Π² процСссС Ρ€Π°Π±ΠΎΡ‚Ρ‹ werf. Π—Π°Ρ‡Π°ΡΡ‚ΡƒΡŽ Π²ΠΎΠ·Π½ΠΈΠΊΠ°ΡŽΡ‚ слоТности ΠΏΡ€ΠΈ Ρ€Π°Π·Π²ΠΎΡ€Π°Ρ‡ΠΈΠ²Π°Π½ΠΈΠΈ Ρ€Π΅Π»ΠΈΠ·Π° ΠΈΠ·-Π·Π° ошибок, Π΄ΠΎΠΏΡƒΡ‰Π΅Π½Π½Ρ‹Ρ… ΠΏΡ€ΠΈ написании Ρ‡Π°Ρ€Ρ‚ΠΎΠ². ΠžΡ‚Π»Π°Π΄ΠΈΡ‚ΡŒ Ρ‚Π°ΠΊΠΈΠ΅ ΠΏΡ€ΠΎΠ±Π»Π΅ΠΌΡ‹ ΠΏΠΎΠΌΠΎΠ³Π°Π΅Ρ‚ ΠΊΠΎΠΌΠ°Π½Π΄Π° [`werf render`]({{ site.url }}/docs/v2/reference/cli/werf_render.html). Π­Ρ‚Π° ΠΊΠΎΠΌΠ°Π½Π΄Π° ΠΏΡ€ΠΎΠ²ΠΎΠ΄ΠΈΡ‚ вСсь Ρ†ΠΈΠΊΠ» сборки ΠΈ Π³Π΅Π½Π΅Ρ€Π°Ρ†ΠΈΠΈ Ρ‡Π°Ρ€Ρ‚ΠΎΠ² ΠΈ β€” вмСсто дСплоя ΠΏΠΎΠ»ΡƒΡ‡Π΅Π½Π½ΠΎΠ³ΠΎ Ρ€Π΅Π»ΠΈΠ·Π° Π² Kubernetes β€” Π²Ρ‹Π²ΠΎΠ΄ΠΈΡ‚ ΠΏΠΎΠ»ΡƒΡ‡Π΅Π½Π½Ρ‹Π΅ Ρ‡Π°Ρ€Ρ‚Ρ‹. Π­Ρ‚ΠΎ «тяТёлая» опСрация, ΠΏΠΎΠΊΠ°Π·Ρ‹Π²Π°ΡŽΡ‰Π°Ρ ΠΊΠΎΠ½Π΅Ρ‡Π½Ρ‹ΠΉ Ρ€Π΅Π·ΡƒΠ»ΡŒΡ‚Π°Ρ‚ со всСми Ρ€Π΅Π°Π»ΡŒΠ½Ρ‹ΠΌΠΈ подставлСнными значСниями. @@ -113,16 +113,16 @@ _ΠžΠ±Ρ€Π°Ρ‚ΠΈΡ‚Π΅ Π²Π½ΠΈΠΌΠ°Π½ΠΈΠ΅, Ρ‡Ρ‚ΠΎ, ΠΊΠ°ΠΊ ΠΈ всС Π΄Ρ€ΡƒΠ³ΠΈΠ΅ ΠΊΠΎΠΌ ## ΠžΡ‡ΠΈΡΡ‚ΠΊΠ° -Π‘ΠΎ Π²Ρ€Π΅ΠΌΠ΅Π½Π΅ΠΌ Π² Ρ…Ρ€Π°Π½ΠΈΠ»ΠΈΡ‰Π΅ (локально ΠΈΠ»ΠΈ Π² registry) ΠΌΠΎΠΆΠ΅Ρ‚ Π½Π°ΠΊΠΎΠΏΠΈΡ‚ΡŒΡΡ мноТСство Π΄Π°Π½Π½Ρ‹Ρ…. Π•ΡΡ‚ΡŒ Π΄Π²Π΅ Π³Ρ€ΡƒΠΏΠΏΡ‹ ΠΊΠΎΠΌΠ°Π½Π΄, ΠΊΠΎΡ‚ΠΎΡ€Ρ‹Π΅ Π·Π°Π½ΠΈΠΌΠ°ΡŽΡ‚ΡΡ очисткой, Π½ΠΎ ΠΈΠΌΠ΅ΡŽΡ‚ Ρ€Π°Π·Π½ΠΎΠ΅ ΠΏΡ€Π΅Π΄Π½Π°Π·Π½Π°Ρ‡Π΅Π½ΠΈΠ΅: `werf cleanup` ΠΈ `werf purge` (ΠΏΠΎΠ΄Ρ€ΠΎΠ±Π½Π΅Π΅ ΠΌΠΎΠΆΠ½ΠΎ ΠΏΡ€ΠΎΡ‡ΠΈΡ‚Π°Ρ‚ΡŒ Π² [Π΄ΠΎΠΊΡƒΠΌΠ΅Π½Ρ‚Π°Ρ†ΠΈΠΈ]({{ site.url }}/documentation/v2/advanced/cleanup.html)). ΠŸΠ΅Ρ€Π²Π°Ρ Ρ€Π°Π±ΠΎΡ‚Π°Π΅Ρ‚ Ρ‚ΠΎΠ»ΡŒΠΊΠΎ с Π΄Π°Π½Π½Ρ‹ΠΌΠΈ Π² registry, Π° вторая β€” со всСм, Ρ‡Ρ‚ΠΎ касаСтся werf. +Π‘ΠΎ Π²Ρ€Π΅ΠΌΠ΅Π½Π΅ΠΌ Π² Ρ…Ρ€Π°Π½ΠΈΠ»ΠΈΡ‰Π΅ (локально ΠΈΠ»ΠΈ Π² registry) ΠΌΠΎΠΆΠ΅Ρ‚ Π½Π°ΠΊΠΎΠΏΠΈΡ‚ΡŒΡΡ мноТСство Π΄Π°Π½Π½Ρ‹Ρ…. Π•ΡΡ‚ΡŒ Π΄Π²Π΅ Π³Ρ€ΡƒΠΏΠΏΡ‹ ΠΊΠΎΠΌΠ°Π½Π΄, ΠΊΠΎΡ‚ΠΎΡ€Ρ‹Π΅ Π·Π°Π½ΠΈΠΌΠ°ΡŽΡ‚ΡΡ очисткой, Π½ΠΎ ΠΈΠΌΠ΅ΡŽΡ‚ Ρ€Π°Π·Π½ΠΎΠ΅ ΠΏΡ€Π΅Π΄Π½Π°Π·Π½Π°Ρ‡Π΅Π½ΠΈΠ΅: `werf cleanup` ΠΈ `werf purge` (ΠΏΠΎΠ΄Ρ€ΠΎΠ±Π½Π΅Π΅ ΠΌΠΎΠΆΠ½ΠΎ ΠΏΡ€ΠΎΡ‡ΠΈΡ‚Π°Ρ‚ΡŒ Π² [Π΄ΠΎΠΊΡƒΠΌΠ΅Π½Ρ‚Π°Ρ†ΠΈΠΈ]({{ site.url }}/docs/v2/advanced/cleanup.html)). ΠŸΠ΅Ρ€Π²Π°Ρ Ρ€Π°Π±ΠΎΡ‚Π°Π΅Ρ‚ Ρ‚ΠΎΠ»ΡŒΠΊΠΎ с Π΄Π°Π½Π½Ρ‹ΠΌΠΈ Π² registry, Π° вторая β€” со всСм, Ρ‡Ρ‚ΠΎ касаСтся werf. ### werf cleanup -Для рСгулярной очистки registry ΠΎΡ‚ Π½Π΅Π°ΠΊΡ‚ΡƒΠ°Π»ΡŒΠ½Ρ‹Ρ… Π΄Π°Π½Π½Ρ‹Ρ… Π΅ΡΡ‚ΡŒ бСзопасная ΠΊΠΎΠΌΠ°Π½Π΄Π° [`werf cleanup`]({{ site.url }}/documentation/v2/reference/cli/werf_cleanup.html). Она бСзопасно удаляСт ΠΎΠ±Ρ€Π°Π·Ρ‹, ΠΊΠΎΡ‚ΠΎΡ€Ρ‹Π΅ Π±ΠΎΠ»Π΅Π΅ Π½Π΅ Ρ‚Ρ€Π΅Π±ΡƒΡŽΡ‚ΡΡ, с ΠΏΠΎΠΌΠΎΡ‰ΡŒΡŽ ΠΏΡ€ΠΎΠ΄Π²ΠΈΠ½ΡƒΡ‚ΠΎΠ³ΠΎ Π°Π»Π³ΠΎΡ€ΠΈΡ‚ΠΌΠ°, ΡƒΡ‡ΠΈΡ‚Ρ‹Π²Π°ΡŽΡ‰Π΅Π³ΠΎ Git-ΠΈΡΡ‚ΠΎΡ€ΠΈΡŽ, содСрТимоС registry ΠΈ состояниС кластСра. Команда ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΡƒΠ΅Ρ‚ΡΡ с ΠΊΠ»ΡŽΡ‡ΠΎΠΌ `--repo ` для очистки Π΄Π°Π½Π½Ρ‹Ρ… ΠΎΠΏΡ€Π΅Π΄Π΅Π»Π΅Π½Π½ΠΎΠ³ΠΎ project. +Для рСгулярной очистки registry ΠΎΡ‚ Π½Π΅Π°ΠΊΡ‚ΡƒΠ°Π»ΡŒΠ½Ρ‹Ρ… Π΄Π°Π½Π½Ρ‹Ρ… Π΅ΡΡ‚ΡŒ бСзопасная ΠΊΠΎΠΌΠ°Π½Π΄Π° [`werf cleanup`]({{ site.url }}/docs/v2/reference/cli/werf_cleanup.html). Она бСзопасно удаляСт ΠΎΠ±Ρ€Π°Π·Ρ‹, ΠΊΠΎΡ‚ΠΎΡ€Ρ‹Π΅ Π±ΠΎΠ»Π΅Π΅ Π½Π΅ Ρ‚Ρ€Π΅Π±ΡƒΡŽΡ‚ΡΡ, с ΠΏΠΎΠΌΠΎΡ‰ΡŒΡŽ ΠΏΡ€ΠΎΠ΄Π²ΠΈΠ½ΡƒΡ‚ΠΎΠ³ΠΎ Π°Π»Π³ΠΎΡ€ΠΈΡ‚ΠΌΠ°, ΡƒΡ‡ΠΈΡ‚Ρ‹Π²Π°ΡŽΡ‰Π΅Π³ΠΎ Git-ΠΈΡΡ‚ΠΎΡ€ΠΈΡŽ, содСрТимоС registry ΠΈ состояниС кластСра. Команда ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΡƒΠ΅Ρ‚ΡΡ с ΠΊΠ»ΡŽΡ‡ΠΎΠΌ `--repo ` для очистки Π΄Π°Π½Π½Ρ‹Ρ… ΠΎΠΏΡ€Π΅Π΄Π΅Π»Π΅Π½Π½ΠΎΠ³ΠΎ project. -Для очистки хоста ΠΎΡ‚ Π½Π΅Π°ΠΊΡ‚ΡƒΠ°Π»ΡŒΠ½Ρ‹Ρ… Π΄Π°Π½Π½Ρ‹Ρ…, связанных с werf, ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΡƒΠ΅Ρ‚ΡΡ [`werf host cleanup`]({{ site.url }}/documentation/v2/advanced/cleanup.html#очистка-Π½Π΅Π°ΠΊΡ‚ΡƒΠ°Π»ΡŒΠ½Ρ‹Ρ…-Π΄Π°Π½Π½Ρ‹Ρ…-1). +Для очистки хоста ΠΎΡ‚ Π½Π΅Π°ΠΊΡ‚ΡƒΠ°Π»ΡŒΠ½Ρ‹Ρ… Π΄Π°Π½Π½Ρ‹Ρ…, связанных с werf, ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΡƒΠ΅Ρ‚ΡΡ [`werf host cleanup`]({{ site.url }}/docs/v2/advanced/cleanup.html#очистка-Π½Π΅Π°ΠΊΡ‚ΡƒΠ°Π»ΡŒΠ½Ρ‹Ρ…-Π΄Π°Π½Π½Ρ‹Ρ…-1). ### werf purge -Если Π΅ΡΡ‚ΡŒ Π½Π΅ΠΎΠ±Ρ…ΠΎΠ΄ΠΈΠΌΠΎΡΡ‚ΡŒ ΠΎΡΠ²ΠΎΠ±ΠΎΠ΄ΠΈΡ‚ΡŒ мСсто Π½Π° дискС, ΡƒΠ΄Π°Π»ΠΈΠ² всС ΠΎΠ±Ρ€Π°Π·Ρ‹ ΠΈ Π΄Ρ€ΡƒΠ³ΠΈΠ΅ Π΄Π°Π½Π½Ρ‹Π΅, слСдуСт ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΠΎΠ²Π°Ρ‚ΡŒ [`werf host purge`]({{ site.url }}/documentation/v2/reference/cli/werf_host_purge.html). +Если Π΅ΡΡ‚ΡŒ Π½Π΅ΠΎΠ±Ρ…ΠΎΠ΄ΠΈΠΌΠΎΡΡ‚ΡŒ ΠΎΡΠ²ΠΎΠ±ΠΎΠ΄ΠΈΡ‚ΡŒ мСсто Π½Π° дискС, ΡƒΠ΄Π°Π»ΠΈΠ² всС ΠΎΠ±Ρ€Π°Π·Ρ‹ ΠΈ Π΄Ρ€ΡƒΠ³ΠΈΠ΅ Π΄Π°Π½Π½Ρ‹Π΅, слСдуСт ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΠΎΠ²Π°Ρ‚ΡŒ [`werf host purge`]({{ site.url }}/docs/v2/reference/cli/werf_host_purge.html). -Для ΠΏΠΎΠ»Π½ΠΎΠ³ΠΎ удалСния Π½Π° хостС всСго, Ρ‡Ρ‚ΠΎ связано с werf, слСдуСт ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΠΎΠ²Π°Ρ‚ΡŒ [`werf purge`]({{ site.url }}/documentation/v2/reference/cli/werf_purge.html). ΠŸΠΎΠΌΠ½ΠΈΡ‚Π΅, Ρ‡Ρ‚ΠΎ это ΠΠ•Π‘Π•Π—ΠžΠŸΠΠ‘ΠΠΠ― ΠšΠžΠœΠΠΠ”Π, которая удаляСт всС ΠΎΠ±Ρ€Π°Π·Ρ‹! +Для ΠΏΠΎΠ»Π½ΠΎΠ³ΠΎ удалСния Π½Π° хостС всСго, Ρ‡Ρ‚ΠΎ связано с werf, слСдуСт ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΠΎΠ²Π°Ρ‚ΡŒ [`werf purge`]({{ site.url }}/docs/v2/reference/cli/werf_purge.html). ΠŸΠΎΠΌΠ½ΠΈΡ‚Π΅, Ρ‡Ρ‚ΠΎ это ΠΠ•Π‘Π•Π—ΠžΠŸΠΠ‘ΠΠΠ― ΠšΠžΠœΠΠΠ”Π, которая удаляСт всС ΠΎΠ±Ρ€Π°Π·Ρ‹! diff --git a/_includes/ru/guides/200_real_apps/020_logging.md.liquid b/_includes/ru/guides/200_real_apps/020_logging.md.liquid index 86cef68a4..dfbf18747 100644 --- a/_includes/ru/guides/200_real_apps/020_logging.md.liquid +++ b/_includes/ru/guides/200_real_apps/020_logging.md.liquid @@ -62,7 +62,7 @@ annotations: werf.io/log-regex: ".*ERROR.*" ``` -Бписок всСх доступных Π°Π½Π½ΠΎΡ‚Π°Ρ†ΠΈΠΉ ΠΌΠΎΠΆΠ½ΠΎ ΠΏΠΎΡΠΌΠΎΡ‚Ρ€Π΅Ρ‚ΡŒ [здСсь]({{ site.url }}/documentation/v2/reference/deploy_annotations.html). +Бписок всСх доступных Π°Π½Π½ΠΎΡ‚Π°Ρ†ΠΈΠΉ ΠΌΠΎΠΆΠ½ΠΎ ΠΏΠΎΡΠΌΠΎΡ‚Ρ€Π΅Ρ‚ΡŒ [здСсь]({{ site.url }}/docs/v2/reference/deploy_annotations.html). > _Π­Ρ‚ΠΈ Π°Π½Π½ΠΎΡ‚Π°Ρ†ΠΈΠΈ Π²Π»ΠΈΡΡŽΡ‚ Ρ‚ΠΎΠ»ΡŒΠΊΠΎ Π½Π° Ρ‚ΠΎ, ΠΊΠ°ΠΊ Π»ΠΎΠ³ΠΈ ΠΎΡ‚ΠΎΠ±Ρ€Π°ΠΆΠ°ΡŽΡ‚ΡΡ ΠΏΡ€ΠΈ Π΄Π΅ΠΏΠ»ΠΎΠ΅ с werf. Они Π½Π΅ ΠΎΠΊΠ°Π·Ρ‹Π²Π°ΡŽΡ‚ Π½ΠΈΠΊΠ°ΠΊΠΎΠ³ΠΎ влияния Π½Π° Ρ€Π°Π·Π²Π΅Ρ€Ρ‚Ρ‹Π²Π°Π΅ΠΌΠΎΠ΅ ΠΏΡ€ΠΈΠ»ΠΎΠΆΠ΅Π½ΠΈΠ΅ ΠΈΠ»ΠΈ Π΅Π³ΠΎ ΠΊΠΎΠ½Ρ„ΠΈΠ³ΡƒΡ€Π°Ρ†ΠΈΡŽ. Π›ΠΎΠ³ΠΈ ΠΏΠΎ-ΠΏΡ€Π΅ΠΆΠ½Π΅ΠΌΡƒ доступны Π² stdout/stderr ΠΊΠΎΠ½Ρ‚Π΅ΠΉΠ½Π΅Ρ€Π° Π² ΠΏΠ΅Ρ€Π²ΠΎΠ½Π°Ρ‡Π°Π»ΡŒΠ½ΠΎΠΌ Π²ΠΈΠ΄Π΅._ diff --git a/_includes/ru/guides/200_real_apps/080_configuration.md.liquid b/_includes/ru/guides/200_real_apps/080_configuration.md.liquid index f50ff2981..2614376a1 100644 --- a/_includes/ru/guides/200_real_apps/080_configuration.md.liquid +++ b/_includes/ru/guides/200_real_apps/080_configuration.md.liquid @@ -33,9 +33,9 @@ ConfigMap ΠΏΡ€Π΅Π΄Π½Π°Π·Π½Π°Ρ‡Π΅Π½ для хранСния Π½Π΅ΠΊΠΎΠ½Ρ„ΠΈΠ΄Π΅Π½ ИспользованиС Helm-Ρ‡Π°Ρ€Ρ‚Π° для развёртывания прилоТСния Π΄Π°Ρ‘Ρ‚ ряд прСимущСств β€” Π½Π°ΠΏΡ€ΠΈΠΌΠ΅Ρ€, Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎΡΡ‚ΡŒ ΡˆΠ°Π±Π»ΠΎΠ½ΠΈΠ·ΠΈΡ€ΠΎΠ²Π°Ρ‚ΡŒ манифСсты. ΠšΠ»ΡŽΡ‡Π΅Π²ΠΎΠΉ встроСнный ΠΎΠ±ΡŠΠ΅ΠΊΡ‚ ΡˆΠ°Π±Π»ΠΎΠ½ΠΈΠ·Π°Ρ†ΠΈΠΈ β€” это `Values`, ΠΊΠΎΡ‚ΠΎΡ€Ρ‹ΠΉ прСдоставляСт доступ ΠΊ значСниям, ΠΏΠ΅Ρ€Π΅Π΄Π°Π²Π°Π΅ΠΌΡ‹ΠΌ Π² Ρ‡Π°Ρ€Ρ‚ ΠΈΠ· Ρ€Π°Π·Π»ΠΈΡ‡Π½Ρ‹Ρ… источников. ΠŸΡ€ΠΈ использовании werf всС Π΄Π°Π½Π½Ρ‹Π΅, ΠΏΠ΅Ρ€Π΅Π΄Π°Π²Π°Π΅ΠΌΡ‹Π΅ Π² chart, ΠΌΠΎΠΆΠ½ΠΎ условно Ρ€Π°Π·Π΄Π΅Π»ΠΈΡ‚ΡŒ Π½Π° нСсколько ΠΊΠ°Ρ‚Π΅Π³ΠΎΡ€ΠΈΠΉ: -- [ΠΎΠ±Ρ‹Ρ‡Π½Ρ‹Π΅ ΠΏΠΎΠ»ΡŒΠ·ΠΎΠ²Π°Ρ‚Π΅Π»ΡŒΡΠΊΠΈΠ΅ Π΄Π°Π½Π½Ρ‹Π΅]({{ site.url }}/documentation/v2/advanced/helm/configuration/values.html#ΠΎΠ±Ρ‹Ρ‡Π½Ρ‹Π΅-ΠΏΠΎΠ»ΡŒΠ·ΠΎΠ²Π°Ρ‚Π΅Π»ΡŒΡΠΊΠΈΠ΅-Π΄Π°Π½Π½Ρ‹Π΅): ΠΏΠ°Ρ€Π°ΠΌΠ΅Ρ‚Ρ€Ρ‹ ΠΈΠ· Ρ„Π°ΠΉΠ»ΠΎΠ² `values.yaml` ΠΈ ΡΠΎΠΎΡ‚Π²Π΅Ρ‚ΡΡ‚Π²ΡƒΡŽΡ‰ΠΈΡ… ΠΎΠΏΡ†ΠΈΠΉ; -- [ΠΏΠΎΠ»ΡŒΠ·ΠΎΠ²Π°Ρ‚Π΅Π»ΡŒΡΠΊΠΈΠ΅ сСкрСты]({{ site.url }}/documentation/v2/advanced/helm/configuration/values.html#ΠΏΠΎΠ»ΡŒΠ·ΠΎΠ²Π°Ρ‚Π΅Π»ΡŒΡΠΊΠΈΠ΅-сСкрСты): ΠΏΠ°Ρ€Π°ΠΌΠ΅Ρ‚Ρ€Ρ‹ ΠΈΠ· Ρ„Π°ΠΉΠ»ΠΎΠ² `secret-values.yaml`; -- [сСрвисныС Π΄Π°Π½Π½Ρ‹Π΅]({{ site.url }}/documentation/v2/advanced/helm/configuration/values.html#сСрвисныС-Π΄Π°Π½Π½Ρ‹Π΅): информация ΠΎ ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π΅, Ρ€Π΅Π»ΠΈΠ·Π΅, собранных ΠΎΠ±Ρ€Π°Π·Π°Ρ… ΠΈ Ρ‚.Π΄. +- [ΠΎΠ±Ρ‹Ρ‡Π½Ρ‹Π΅ ΠΏΠΎΠ»ΡŒΠ·ΠΎΠ²Π°Ρ‚Π΅Π»ΡŒΡΠΊΠΈΠ΅ Π΄Π°Π½Π½Ρ‹Π΅]({{ site.url }}/docs/v2/advanced/helm/configuration/values.html#ΠΎΠ±Ρ‹Ρ‡Π½Ρ‹Π΅-ΠΏΠΎΠ»ΡŒΠ·ΠΎΠ²Π°Ρ‚Π΅Π»ΡŒΡΠΊΠΈΠ΅-Π΄Π°Π½Π½Ρ‹Π΅): ΠΏΠ°Ρ€Π°ΠΌΠ΅Ρ‚Ρ€Ρ‹ ΠΈΠ· Ρ„Π°ΠΉΠ»ΠΎΠ² `values.yaml` ΠΈ ΡΠΎΠΎΡ‚Π²Π΅Ρ‚ΡΡ‚Π²ΡƒΡŽΡ‰ΠΈΡ… ΠΎΠΏΡ†ΠΈΠΉ; +- [ΠΏΠΎΠ»ΡŒΠ·ΠΎΠ²Π°Ρ‚Π΅Π»ΡŒΡΠΊΠΈΠ΅ сСкрСты]({{ site.url }}/docs/v2/advanced/helm/configuration/values.html#ΠΏΠΎΠ»ΡŒΠ·ΠΎΠ²Π°Ρ‚Π΅Π»ΡŒΡΠΊΠΈΠ΅-сСкрСты): ΠΏΠ°Ρ€Π°ΠΌΠ΅Ρ‚Ρ€Ρ‹ ΠΈΠ· Ρ„Π°ΠΉΠ»ΠΎΠ² `secret-values.yaml`; +- [сСрвисныС Π΄Π°Π½Π½Ρ‹Π΅]({{ site.url }}/docs/v2/advanced/helm/configuration/values.html#сСрвисныС-Π΄Π°Π½Π½Ρ‹Π΅): информация ΠΎ ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π΅, Ρ€Π΅Π»ΠΈΠ·Π΅, собранных ΠΎΠ±Ρ€Π°Π·Π°Ρ… ΠΈ Ρ‚.Π΄. ## ΠŸΠ΅Ρ€Π΅ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΠΎΠ²Π°Π½ΠΈΠ΅ ΠΊΠΎΠ½Ρ„ΠΈΠ³ΡƒΡ€Π°Ρ†ΠΈΠΈ с Values ΠΈ ConfigMap @@ -69,7 +69,7 @@ ConfigMap ΠΏΡ€Π΅Π΄Π½Π°Π·Π½Π°Ρ‡Π΅Π½ для хранСния Π½Π΅ΠΊΠΎΠ½Ρ„ΠΈΠ΄Π΅Π½ Π§Ρ‚ΠΎΠ±Ρ‹ Π½Π°Ρ‡Π°Ρ‚ΡŒ Ρ€Π°Π±ΠΎΡ‚Ρƒ с сСкрСтами, сначала трСбуСтся ΡΠ³Π΅Π½Π΅Ρ€ΠΈΡ€ΠΎΠ²Π°Ρ‚ΡŒ симмСтричный ΠΊΠ»ΡŽΡ‡ ΡˆΠΈΡ„Ρ€ΠΎΠ²Π°Π½ΠΈΡ, Ρ‡Ρ‚ΠΎ ΠΌΠΎΠΆΠ½ΠΎ ΡΠ΄Π΅Π»Π°Ρ‚ΡŒ ΠΊΠΎΠΌΠ°Π½Π΄ΠΎΠΉ `werf helm secret generate-secret-key`. Однако, ΠΏΠΎΡΠΊΠΎΠ»ΡŒΠΊΡƒ ΠΌΡ‹ ΡƒΠΆΠ΅ Π·Π°Ρ€Π°Π½Π΅Π΅ ΠΏΠΎΠ΄Π³ΠΎΡ‚ΠΎΠ²ΠΈΠ»ΠΈ ΠΈ Π·Π°ΡˆΠΈΡ„Ρ€ΠΎΠ²Π°Π»ΠΈ сСкрСты, Ρ‚ΠΎ ΠΈ ΠΊΠ»ΡŽΡ‡ ΡˆΠΈΡ„Ρ€ΠΎΠ²Π°Π½ΠΈΡ ΠΌΡ‹ сгСнСрировали Π·Π° вас. Он находится Π² Ρ€Π΅ΠΏΠΎΠ·ΠΈΡ‚ΠΎΡ€ΠΈΠΈ Π² Ρ„Π°ΠΉΠ»Π΅ `.werf_secret_key` ΠΈ Π½Π°Ρ‡Π½Ρ‘Ρ‚ ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΠΎΠ²Π°Ρ‚ΡŒΡΡ автоматичСски. ->_ΠŸΡ€ΠΈ Ρ€Π°Π±ΠΎΡ‚Π΅ с Ρ€Π΅Π°Π»ΡŒΠ½Ρ‹ΠΌΠΈ прилоТСниями ΠΊΠ»ΡŽΡ‡ НЕЛЬЗЯ Ρ…Ρ€Π°Π½ΠΈΡ‚ΡŒ Π² Ρ€Π΅ΠΏΠΎΠ·ΠΈΡ‚ΠΎΡ€ΠΈΠΈ. ВмСсто этого рСкомСндуСтся ΠΏΠ΅Ρ€Π΅Π΄Π°Π²Π°Ρ‚ΡŒ Π΅Π³ΠΎ Ρ‡Π΅Ρ€Π΅Π· ΠΏΠ΅Ρ€Π΅ΠΌΠ΅Π½Π½ΡƒΡŽ окруТСния `WERF_SECRET_KEY`, храня Π΅Π³ΠΎ Π² бСзопасном мСстС. ΠŸΠΎΠ΄Ρ€ΠΎΠ±Π½Π΅Π΅ ΠΏΡ€ΠΎ Ρ€Π°Π±ΠΎΡ‚Ρƒ с ΠΊΠ»ΡŽΡ‡Π°ΠΌΠΈ ΡˆΠΈΡ„Ρ€ΠΎΠ²Π°Π½ΠΈΡ ΠΌΠΎΠΆΠ½ΠΎ ΠΏΡ€ΠΎΡ‡ΠΈΡ‚Π°Ρ‚ΡŒ Π² [Π΄ΠΎΠΊΡƒΠΌΠ΅Π½Ρ‚Π°Ρ†ΠΈΠΈ werf]({{ site.url }}/documentation/v2/advanced/helm/configuration/secrets.html#%D0%BA%D0%BB%D1%8E%D1%87-%D1%88%D0%B8%D1%84%D1%80%D0%BE%D0%B2%D0%B0%D0%BD%D0%B8%D1%8F)._ +>_ΠŸΡ€ΠΈ Ρ€Π°Π±ΠΎΡ‚Π΅ с Ρ€Π΅Π°Π»ΡŒΠ½Ρ‹ΠΌΠΈ прилоТСниями ΠΊΠ»ΡŽΡ‡ НЕЛЬЗЯ Ρ…Ρ€Π°Π½ΠΈΡ‚ΡŒ Π² Ρ€Π΅ΠΏΠΎΠ·ΠΈΡ‚ΠΎΡ€ΠΈΠΈ. ВмСсто этого рСкомСндуСтся ΠΏΠ΅Ρ€Π΅Π΄Π°Π²Π°Ρ‚ΡŒ Π΅Π³ΠΎ Ρ‡Π΅Ρ€Π΅Π· ΠΏΠ΅Ρ€Π΅ΠΌΠ΅Π½Π½ΡƒΡŽ окруТСния `WERF_SECRET_KEY`, храня Π΅Π³ΠΎ Π² бСзопасном мСстС. ΠŸΠΎΠ΄Ρ€ΠΎΠ±Π½Π΅Π΅ ΠΏΡ€ΠΎ Ρ€Π°Π±ΠΎΡ‚Ρƒ с ΠΊΠ»ΡŽΡ‡Π°ΠΌΠΈ ΡˆΠΈΡ„Ρ€ΠΎΠ²Π°Π½ΠΈΡ ΠΌΠΎΠΆΠ½ΠΎ ΠΏΡ€ΠΎΡ‡ΠΈΡ‚Π°Ρ‚ΡŒ Π² [Π΄ΠΎΠΊΡƒΠΌΠ΅Π½Ρ‚Π°Ρ†ΠΈΠΈ werf]({{ site.url }}/docs/v2/advanced/helm/configuration/secrets.html#%D0%BA%D0%BB%D1%8E%D1%87-%D1%88%D0%B8%D1%84%D1%80%D0%BE%D0%B2%D0%B0%D0%BD%D0%B8%D1%8F)._ ΠšΠΎΠ½Ρ„ΠΈΠ³ΡƒΡ€Π°Ρ†ΠΈΡ прилоТСния содСрТит Π΄Π°Π½Π½Ρ‹Π΅, ΠΊΠΎΡ‚ΠΎΡ€Ρ‹Π΅ Π½Π΅ Π΄ΠΎΠ»ΠΆΠ½Ρ‹ Ρ…Ρ€Π°Π½ΠΈΡ‚ΡŒΡΡ Π² Π½Π΅Π·Π°ΡˆΠΈΡ„Ρ€ΠΎΠ²Π°Π½Π½ΠΎΠΌ Π²ΠΈΠ΄Π΅ Π² Ρ€Π΅ΠΏΠΎΠ·ΠΈΡ‚ΠΎΡ€ΠΈΠΈ β€” Π½Π°ΠΏΡ€ΠΈΠΌΠ΅Ρ€, Π»ΠΎΠ³ΠΈΠ½ ΠΈ ΠΏΠ°Ρ€ΠΎΠ»ΡŒ ΠΎΡ‚ Π±Π°Π·Ρ‹ Π΄Π°Π½Π½Ρ‹Ρ…. ВмСсто Ρ‚ΠΎΠ³ΠΎ, Ρ‡Ρ‚ΠΎΠ±Ρ‹ Ρ…Ρ€Π°Π½ΠΈΡ‚ΡŒ Π»ΠΎΠ³ΠΈΠ½ ΠΈ ΠΏΠ°Ρ€ΠΎΠ»ΡŒ Π² ΠΎΡ‚ΠΊΡ€Ρ‹Ρ‚ΠΎΠΌ Π²ΠΈΠ΄Π΅ Π² {% include guides/200_real_apps/080_configuration/{{ page.framework_id }}/055_loginpas_storage.md.liquid %} ΠΌΡ‹ Π±ΡƒΠ΄Π΅ΠΌ Ρ…Ρ€Π°Π½ΠΈΡ‚ΡŒ ΠΈΡ… Π·Π°ΡˆΠΈΡ„Ρ€ΠΎΠ²Π°Π½Π½Ρ‹ΠΌΠΈ Π² `.helm/secret-values.yaml` вмСстС с Π΄Ρ€ΡƒΠ³ΠΈΠΌΠΈ сСкрСтными ΠΏΠ°Ρ€Π°ΠΌΠ΅Ρ‚Ρ€Π°ΠΌΠΈ: {% include guides/200_real_apps/080_configuration/{{ page.framework_id }}/060_secret_values.md.liquid %} @@ -92,9 +92,9 @@ werf helm secret values decrypt .helm/secret-values.yaml {% include guides/200_real_apps/080_configuration/{{ page.framework_id }}/085_configs_including.md.liquid %} -Для хранСния ΠΈ монтирования сСкрСтных ΠΊΠΎΠ½Ρ„ΠΈΠ³ΡƒΡ€Π°Ρ†ΠΈΠΎΠ½Π½Ρ‹Ρ… Ρ„Π°ΠΉΠ»ΠΎΠ² Ρ†Π΅Π»ΠΈΠΊΠΎΠΌ Ρ‚Π°ΠΊΠΆΠ΅ ΠΌΠΎΠΆΠ½ΠΎ ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΠΎΠ²Π°Ρ‚ΡŒ Secret. Выглядит это Π°Π½Π°Π»ΠΎΠ³ΠΈΡ‡Π½ΠΎ использованию ConfigMap для монтирования нСсСкрСтных Ρ„Π°ΠΉΠ»ΠΎΠ² ΠΊΠΎΠ½Ρ„ΠΈΠ³ΡƒΡ€Π°Ρ†ΠΈΠΈ, [описанному Π²Ρ‹ΡˆΠ΅](#Ρ…Ρ€Π°Π½Π΅Π½ΠΈΠ΅-ΠΊΠΎΠ½Ρ„ΠΈΠ³ΡƒΡ€Π°Ρ†ΠΈΠΎΠ½Π½Ρ‹Ρ…-Ρ„Π°ΠΉΠ»ΠΎΠ²-прилоТСния-Π²-configmap), Π·Π° Ρ‚Π΅ΠΌ лишь ΠΈΡΠΊΠ»ΡŽΡ‡Π΅Π½ΠΈΠ΅ΠΌ, Ρ‡Ρ‚ΠΎ само содСрТаниС Secret Π΄ΠΎΠ»ΠΆΠ½ΠΎ Ρ…Ρ€Π°Π½ΠΈΡ‚ΡŒΡΡ Π·Π°ΡˆΠΈΡ„Ρ€ΠΎΠ²Π°Π½Π½Ρ‹ΠΌ Π² Ρ„Π°ΠΉΠ»Π°Ρ… `.helm/secret/...` ΠΈΠ»ΠΈ Π² `.helm/secret-values.yaml`. ΠŸΠΎΠ΄Ρ€ΠΎΠ±Π½Π΅Π΅ ΠΎΠ± этом ΠΌΠΎΠΆΠ½ΠΎ ΠΏΡ€ΠΎΡ‡ΠΈΡ‚Π°Ρ‚ΡŒ Π² [Π΄ΠΎΠΊΡƒΠΌΠ΅Π½Ρ‚Π°Ρ†ΠΈΠΈ werf]({{ site.url }}/documentation/v2/advanced/helm/configuration/secrets.html#%D1%81%D0%B5%D0%BA%D1%80%D0%B5%D1%82%D0%BD%D1%8B%D0%B5-%D1%84%D0%B0%D0%B9%D0%BB%D1%8B). +Для хранСния ΠΈ монтирования сСкрСтных ΠΊΠΎΠ½Ρ„ΠΈΠ³ΡƒΡ€Π°Ρ†ΠΈΠΎΠ½Π½Ρ‹Ρ… Ρ„Π°ΠΉΠ»ΠΎΠ² Ρ†Π΅Π»ΠΈΠΊΠΎΠΌ Ρ‚Π°ΠΊΠΆΠ΅ ΠΌΠΎΠΆΠ½ΠΎ ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΠΎΠ²Π°Ρ‚ΡŒ Secret. Выглядит это Π°Π½Π°Π»ΠΎΠ³ΠΈΡ‡Π½ΠΎ использованию ConfigMap для монтирования нСсСкрСтных Ρ„Π°ΠΉΠ»ΠΎΠ² ΠΊΠΎΠ½Ρ„ΠΈΠ³ΡƒΡ€Π°Ρ†ΠΈΠΈ, [описанному Π²Ρ‹ΡˆΠ΅](#Ρ…Ρ€Π°Π½Π΅Π½ΠΈΠ΅-ΠΊΠΎΠ½Ρ„ΠΈΠ³ΡƒΡ€Π°Ρ†ΠΈΠΎΠ½Π½Ρ‹Ρ…-Ρ„Π°ΠΉΠ»ΠΎΠ²-прилоТСния-Π²-configmap), Π·Π° Ρ‚Π΅ΠΌ лишь ΠΈΡΠΊΠ»ΡŽΡ‡Π΅Π½ΠΈΠ΅ΠΌ, Ρ‡Ρ‚ΠΎ само содСрТаниС Secret Π΄ΠΎΠ»ΠΆΠ½ΠΎ Ρ…Ρ€Π°Π½ΠΈΡ‚ΡŒΡΡ Π·Π°ΡˆΠΈΡ„Ρ€ΠΎΠ²Π°Π½Π½Ρ‹ΠΌ Π² Ρ„Π°ΠΉΠ»Π°Ρ… `.helm/secret/...` ΠΈΠ»ΠΈ Π² `.helm/secret-values.yaml`. ΠŸΠΎΠ΄Ρ€ΠΎΠ±Π½Π΅Π΅ ΠΎΠ± этом ΠΌΠΎΠΆΠ½ΠΎ ΠΏΡ€ΠΎΡ‡ΠΈΡ‚Π°Ρ‚ΡŒ Π² [Π΄ΠΎΠΊΡƒΠΌΠ΅Π½Ρ‚Π°Ρ†ΠΈΠΈ werf]({{ site.url }}/docs/v2/advanced/helm/configuration/secrets.html#%D1%81%D0%B5%D0%BA%D1%80%D0%B5%D1%82%D0%BD%D1%8B%D0%B5-%D1%84%D0%B0%D0%B9%D0%BB%D1%8B). -Π‘ΠΎΠ»ΡŒΡˆΠ΅ ΠΈΠ½Ρ„ΠΎΡ€ΠΌΠ°Ρ†ΠΈΠΈ ΠΏΠΎ Ρ€Π°Π±ΠΎΡ‚Π΅ с сСкрСтами Ρ‚Π°ΠΊΠΆΠ΅ доступно Π² [Π΄ΠΎΠΊΡƒΠΌΠ΅Π½Ρ‚Π°Ρ†ΠΈΠΈ werf]({{ site.url }}/documentation/v2/advanced/helm/configuration/secrets.html). +Π‘ΠΎΠ»ΡŒΡˆΠ΅ ΠΈΠ½Ρ„ΠΎΡ€ΠΌΠ°Ρ†ΠΈΠΈ ΠΏΠΎ Ρ€Π°Π±ΠΎΡ‚Π΅ с сСкрСтами Ρ‚Π°ΠΊΠΆΠ΅ доступно Π² [Π΄ΠΎΠΊΡƒΠΌΠ΅Π½Ρ‚Π°Ρ†ΠΈΠΈ werf]({{ site.url }}/docs/v2/advanced/helm/configuration/secrets.html). ## ΠŸΡ€ΠΎΠ²Π΅Ρ€ΠΊΠ° работоспособности diff --git a/_includes/ru/guides/400_ci_cd_workflow/030_gitlab_ci_cd.md.liquid b/_includes/ru/guides/400_ci_cd_workflow/030_gitlab_ci_cd.md.liquid index ea7b3351b..42b084113 100644 --- a/_includes/ru/guides/400_ci_cd_workflow/030_gitlab_ci_cd.md.liquid +++ b/_includes/ru/guides/400_ci_cd_workflow/030_gitlab_ci_cd.md.liquid @@ -64,7 +64,7 @@ sudo usermod -aG docker gitlab-runner ``` -1. [Установим werf](/documentation/index.html). +1. [Установим werf](/docs/index.html). 1. Установим `kubectl` ΠΈ скопируСм Ρ„Π°ΠΉΠ» ΠΊΠΎΠ½Ρ„ΠΈΠ³ΡƒΡ€Π°Ρ†ΠΈΠΈ `kubectl` Π² домашнюю ΠΏΠ°ΠΏΠΊΡƒ ΠΏΠΎΠ»ΡŒΠ·ΠΎΠ²Π°Ρ‚Π΅Π»Ρ `gitlab-runner. ```shell mkdir -p /home/gitlab-runner/.kube && @@ -187,9 +187,9 @@ Stop Review: Π’ Π·Π°Π΄Π°Π½ΠΈΠ΅ `Review` описываСтся Ρ€Π°Π·Π²Ρ‘Ρ€Ρ‚Ρ‹Π²Π°Π½ΠΈΠ΅ review-Ρ€Π΅Π»ΠΈΠ·Π° Π² динамичСскоС ΠΎΠΊΡ€ΡƒΠΆΠ΅Π½ΠΈΠ΅, Π² основу ΠΈΠΌΠ΅Π½ΠΈ ΠΊΠΎΡ‚ΠΎΡ€ΠΎΠ³ΠΎ закладываСтся ΡƒΠ½ΠΈΠΊΠ°Π»ΡŒΠ½Ρ‹ΠΉ ΠΈΠ΄Π΅Π½Ρ‚ΠΈΡ„ΠΈΠΊΠ°Ρ‚ΠΎΡ€ MR. ΠŸΠ°Ρ€Π°ΠΌΠ΅Ρ‚Ρ€ `auto_stop_in` позволяСт ΡƒΠΊΠ°Π·Π°Ρ‚ΡŒ ΠΏΠ΅Ρ€ΠΈΠΎΠ΄ отсутствия активности Π² MR, послС ΠΊΠΎΡ‚ΠΎΡ€ΠΎΠ³ΠΎ ΠΎΠΊΡ€ΡƒΠΆΠ΅Π½ΠΈΠ΅ GitLab Π±ΡƒΠ΄Π΅Ρ‚ автоматичСски остановлСно. ΠžΡΡ‚Π°Π½ΠΎΠ²ΠΊΠ° окруТСния GitLab сама ΠΏΠΎ сСбС Π½ΠΈΠΊΠ°ΠΊ Π½Π΅ влияСт Π½Π° рСсурсы Π² кластСрС, review-Ρ€Π΅Π»ΠΈΠ·, поэтому Π² Π΄ΠΎΠΏΠΎΠ»Π½Π΅Π½ΠΈΠΈ Π½Π΅ΠΎΠ±Ρ…ΠΎΠ΄ΠΈΠΌΠΎ ΠΎΠΏΡ€Π΅Π΄Π΅Π»ΠΈΡ‚ΡŒ Π·Π°Π΄Π°Π½ΠΈΠ΅, ΠΊΠΎΡ‚ΠΎΡ€ΠΎΠ΅ вызываСтся ΠΏΡ€ΠΈ остановкС (`on_stop`). Π’ нашСм случаС, это Π·Π°Π΄Π°Π½ΠΈΠ΅ `Stop Review`. -Π—Π°Π΄Π°Π½ΠΈΠ΅ `Stop Review` выполняСт ΡƒΠ΄Π°Π»Π΅Π½ΠΈΠ΅ review-Ρ€Π΅Π»ΠΈΠ·Π°, Π° Ρ‚Π°ΠΊΠΆΠ΅ остановку окруТСния GitLab (`action: stop`): werf удаляСт helm-Ρ€Π΅Π»ΠΈΠ· ΠΈ namespace Π² Kubernetes со всСм Π΅Π³ΠΎ содСрТимым ([werf dismiss]({{ site.url }}/documentation/v2/reference/cli/werf_dismiss.html)). Π—Π°Π΄Π°Π½ΠΈΠ΅ `Stop Review` ΠΌΠΎΠΆΠ΅Ρ‚ Π±Ρ‹Ρ‚ΡŒ Π·Π°ΠΏΡƒΡ‰Π΅Π½ΠΎ Π²Ρ€ΡƒΡ‡Π½ΡƒΡŽ послС дСплоя Π½Π° review ΠΊΠΎΠ½Ρ‚ΡƒΡ€, Π° Ρ‚Π°ΠΊΠΆΠ΅ автоматичСски GitLab-сСрвСром, Π½Π°ΠΏΡ€ΠΈΠΌΠ΅Ρ€, ΠΏΡ€ΠΈ ΡƒΠ΄Π°Π»Π΅Π½ΠΈΠΈ ΡΠΎΠΎΡ‚Π²Π΅Ρ‚ΡΡ‚Π²ΡƒΡŽΡ‰Π΅ΠΉ Π²Π΅Ρ‚ΠΊΠΈ Π² Ρ€Π΅Π·ΡƒΠ»ΡŒΡ‚Π°Ρ‚Π΅ слияния Π²Π΅Ρ‚ΠΊΠΈ с master ΠΈ указания ΡΠΎΠΎΡ‚Π²Π΅Ρ‚ΡΡ‚Π²ΡƒΡŽΡ‰Π΅ΠΉ ΠΎΠΏΡ†ΠΈΠΈ Π² интСрфСйсС GitLab. +Π—Π°Π΄Π°Π½ΠΈΠ΅ `Stop Review` выполняСт ΡƒΠ΄Π°Π»Π΅Π½ΠΈΠ΅ review-Ρ€Π΅Π»ΠΈΠ·Π°, Π° Ρ‚Π°ΠΊΠΆΠ΅ остановку окруТСния GitLab (`action: stop`): werf удаляСт helm-Ρ€Π΅Π»ΠΈΠ· ΠΈ namespace Π² Kubernetes со всСм Π΅Π³ΠΎ содСрТимым ([werf dismiss]({{ site.url }}/docs/v2/reference/cli/werf_dismiss.html)). Π—Π°Π΄Π°Π½ΠΈΠ΅ `Stop Review` ΠΌΠΎΠΆΠ΅Ρ‚ Π±Ρ‹Ρ‚ΡŒ Π·Π°ΠΏΡƒΡ‰Π΅Π½ΠΎ Π²Ρ€ΡƒΡ‡Π½ΡƒΡŽ послС дСплоя Π½Π° review ΠΊΠΎΠ½Ρ‚ΡƒΡ€, Π° Ρ‚Π°ΠΊΠΆΠ΅ автоматичСски GitLab-сСрвСром, Π½Π°ΠΏΡ€ΠΈΠΌΠ΅Ρ€, ΠΏΡ€ΠΈ ΡƒΠ΄Π°Π»Π΅Π½ΠΈΠΈ ΡΠΎΠΎΡ‚Π²Π΅Ρ‚ΡΡ‚Π²ΡƒΡŽΡ‰Π΅ΠΉ Π²Π΅Ρ‚ΠΊΠΈ Π² Ρ€Π΅Π·ΡƒΠ»ΡŒΡ‚Π°Ρ‚Π΅ слияния Π²Π΅Ρ‚ΠΊΠΈ с master ΠΈ указания ΡΠΎΠΎΡ‚Π²Π΅Ρ‚ΡΡ‚Π²ΡƒΡŽΡ‰Π΅ΠΉ ΠΎΠΏΡ†ΠΈΠΈ Π² интСрфСйсС GitLab. -Для выполнСния `werf dismiss` трСбуСтся werf.yaml, Ρ‚Π°ΠΊ ΠΊΠ°ΠΊ Π² Π½Ρ‘ΠΌ ΡΠΎΠ΄Π΅Ρ€ΠΆΠ°Ρ‚ΡŒΡΡ [ΡˆΠ°Π±Π»ΠΎΠ½Ρ‹ ΠΈΠΌΠ΅Π½ΠΈ Ρ€Π΅Π»ΠΈΠ·Π° ΠΈ namespace]({{ site.url }}/documentation/v2/usage/deploy/releases.html#имя-Ρ€Π΅Π»ΠΈΠ·Π°"). ΠŸΡ€ΠΈ ΡƒΠ΄Π°Π»Π΅Π½ΠΈΠΈ Π²Π΅Ρ‚ΠΊΠΈ Π½Π΅Ρ‚ возмоТности ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΠΎΠ²Π°Ρ‚ΡŒ исходники ΠΈΠ· git, поэтому Π² Π·Π°Π΄Π°Π½ΠΈΠΈ `Stop Review` ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΡƒΠ΅Ρ‚ΡΡ werf.yaml, сохранённый ΠΏΡ€ΠΈ Π²Ρ‹ΠΏΠΎΠ»Π½Π΅Π½ΠΈΠΈ задания `Review`, ΠΈ ΠΎΡ‚ΠΊΠ»ΡŽΡ‡Π΅Π½ΠΎ подтягиваниС ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ ΠΈΠ· git (`GIT_STRATEGY: none`). +Для выполнСния `werf dismiss` трСбуСтся werf.yaml, Ρ‚Π°ΠΊ ΠΊΠ°ΠΊ Π² Π½Ρ‘ΠΌ ΡΠΎΠ΄Π΅Ρ€ΠΆΠ°Ρ‚ΡŒΡΡ [ΡˆΠ°Π±Π»ΠΎΠ½Ρ‹ ΠΈΠΌΠ΅Π½ΠΈ Ρ€Π΅Π»ΠΈΠ·Π° ΠΈ namespace]({{ site.url }}/docs/v2/usage/deploy/releases.html#имя-Ρ€Π΅Π»ΠΈΠ·Π°"). ΠŸΡ€ΠΈ ΡƒΠ΄Π°Π»Π΅Π½ΠΈΠΈ Π²Π΅Ρ‚ΠΊΠΈ Π½Π΅Ρ‚ возмоТности ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΠΎΠ²Π°Ρ‚ΡŒ исходники ΠΈΠ· git, поэтому Π² Π·Π°Π΄Π°Π½ΠΈΠΈ `Stop Review` ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΡƒΠ΅Ρ‚ΡΡ werf.yaml, сохранённый ΠΏΡ€ΠΈ Π²Ρ‹ΠΏΠΎΠ»Π½Π΅Π½ΠΈΠΈ задания `Review`, ΠΈ ΠΎΡ‚ΠΊΠ»ΡŽΡ‡Π΅Π½ΠΎ подтягиваниС ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ ΠΈΠ· git (`GIT_STRATEGY: none`). Π’Π°ΠΊΠΈΠΌ ΠΎΠ±Ρ€Π°Π·ΠΎΠΌ, ΠΏΠΎ ΡƒΠΌΠΎΠ»Ρ‡Π°Π½ΠΈΡŽ Π·Π°ΠΊΠ»Π°Π΄Ρ‹Π²Π°Π΅ΠΌ ΡΠ»Π΅Π΄ΡƒΡŽΡ‰ΠΈΠ΅ Π²Π°Ρ€ΠΈΠ°Π½Ρ‚Ρ‹ удалСния review окруТСния: * Π²Ρ€ΡƒΡ‡Π½ΡƒΡŽ; @@ -466,7 +466,7 @@ Cleanup: {% endraw %} Π’ werf встроСн эффСктивный ΠΌΠ΅Ρ…Π°Π½ΠΈΠ·ΠΌ очистки, ΠΊΠΎΡ‚ΠΎΡ€Ρ‹ΠΉ позволяСт ΠΈΠ·Π±Π΅ΠΆΠ°Ρ‚ΡŒ пСрСполнСния container registry ΠΈ диска сборочного ΡƒΠ·Π»Π° ΠΎΡ‚ ΡƒΡΡ‚Π°Ρ€Π΅Π²ΡˆΠΈΡ… ΠΈ Π½Π΅ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΡƒΠ΅ΠΌΡ‹Ρ… ΠΎΠ±Ρ€Π°Π·ΠΎΠ². -Π‘ΠΎΠ»Π΅Π΅ ΠΏΠΎΠ΄Ρ€ΠΎΠ±Π½ΠΎ ΠΎΠ·Π½Π°ΠΊΠΎΠΌΠΈΡ‚ΡŒΡΡ с возмоТностями очистки, встроСнными Π² werf, ΠΌΠΎΠΆΠ½ΠΎ [здСсь]({{ site.url }}/documentation/v2/usage/cleanup/cr_cleanup.html). +Π‘ΠΎΠ»Π΅Π΅ ΠΏΠΎΠ΄Ρ€ΠΎΠ±Π½ΠΎ ΠΎΠ·Π½Π°ΠΊΠΎΠΌΠΈΡ‚ΡŒΡΡ с возмоТностями очистки, встроСнными Π² werf, ΠΌΠΎΠΆΠ½ΠΎ [здСсь]({{ site.url }}/docs/v2/usage/cleanup/cr_cleanup.html). Π§Ρ‚ΠΎΠ±Ρ‹ ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΠΎΠ²Π°Ρ‚ΡŒ очистку, Π½Π΅ΠΎΠ±Ρ…ΠΎΠ΄ΠΈΠΌΠΎ ΡΠΎΠ·Π΄Π°Ρ‚ΡŒ `Personal Access Token` Π² GitLab с Π½Π΅ΠΎΠ±Ρ…ΠΎΠ΄ΠΈΠΌΡ‹ΠΌΠΈ ΠΏΡ€Π°Π²Π°ΠΌΠΈ. Π‘ ΠΏΠΎΠΌΠΎΡ‰ΡŒΡŽ Π΄Π°Π½Π½ΠΎΠ³ΠΎ Ρ‚ΠΎΠΊΠ΅Π½Π° Π±ΡƒΠ΄Π΅Ρ‚ ΠΎΡΡƒΡ‰Π΅ΡΡ‚Π²Π»ΡΡ‚ΡŒΡΡ авторизация Π² container registry ΠΏΠ΅Ρ€Π΅Π΄ очисткой. diff --git a/_includes/ru/guides/400_ci_cd_workflow/040_github_actions.md.liquid b/_includes/ru/guides/400_ci_cd_workflow/040_github_actions.md.liquid index a311504ac..85f8b61ae 100644 --- a/_includes/ru/guides/400_ci_cd_workflow/040_github_actions.md.liquid +++ b/_includes/ru/guides/400_ci_cd_workflow/040_github_actions.md.liquid @@ -158,7 +158,7 @@ on: types: [closed] ``` -На шагС `Dismiss` выполняСтся ΡƒΠ΄Π°Π»Π΅Π½ΠΈΠ΅ review-Ρ€Π΅Π»ΠΈΠ·Π°: werf удаляСт helm-Ρ€Π΅Π»ΠΈΠ· ΠΈ namespace Π² Kubernetes со всСм Π΅Π³ΠΎ содСрТимым ([werf dismiss]({{ site.url }}/documentation/v2/reference/cli/werf_dismiss.html)). +На шагС `Dismiss` выполняСтся ΡƒΠ΄Π°Π»Π΅Π½ΠΈΠ΅ review-Ρ€Π΅Π»ΠΈΠ·Π°: werf удаляСт helm-Ρ€Π΅Π»ΠΈΠ· ΠΈ namespace Π² Kubernetes со всСм Π΅Π³ΠΎ содСрТимым ([werf dismiss]({{ site.url }}/docs/v2/reference/cli/werf_dismiss.html)). Π”Π°Π»Π΅Π΅ Ρ€Π°Π·Π±Π΅Ρ€Ρ‘ΠΌ основныС стратСгии ΠΏΡ€ΠΈ ΠΎΡ€Π³Π°Π½ΠΈΠ·Π°Ρ†ΠΈΠΈ развёртывания review окруТСния. @@ -384,7 +384,7 @@ curl \ ``` Π’ werf встроСн эффСктивный ΠΌΠ΅Ρ…Π°Π½ΠΈΠ·ΠΌ очистки, ΠΊΠΎΡ‚ΠΎΡ€Ρ‹ΠΉ позволяСт ΠΈΠ·Π±Π΅ΠΆΠ°Ρ‚ΡŒ пСрСполнСния container registry ΠΈ диска сборочного ΡƒΠ·Π»Π° ΠΎΡ‚ ΡƒΡΡ‚Π°Ρ€Π΅Π²ΡˆΠΈΡ… ΠΈ Π½Π΅ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΡƒΠ΅ΠΌΡ‹Ρ… ΠΎΠ±Ρ€Π°Π·ΠΎΠ². -Π‘ΠΎΠ»Π΅Π΅ ΠΏΠΎΠ΄Ρ€ΠΎΠ±Π½ΠΎ ΠΎΠ·Π½Π°ΠΊΠΎΠΌΠΈΡ‚ΡŒΡΡ с возмоТностями очистки, встроСнными Π² werf, ΠΌΠΎΠΆΠ½ΠΎ [здСсь]({{ site.url }}/documentation/v2/usage/cleanup/cr_cleanup.html). +Π‘ΠΎΠ»Π΅Π΅ ΠΏΠΎΠ΄Ρ€ΠΎΠ±Π½ΠΎ ΠΎΠ·Π½Π°ΠΊΠΎΠΌΠΈΡ‚ΡŒΡΡ с возмоТностями очистки, встроСнными Π² werf, ΠΌΠΎΠΆΠ½ΠΎ [здСсь]({{ site.url }}/docs/v2/usage/cleanup/cr_cleanup.html). ## ΠŸΠΎΠ»Π½Ρ‹ΠΉ Π½Π°Π±ΠΎΡ€ ΠΊΠΎΠ½Ρ„ΠΈΠ³ΡƒΡ€Π°Ρ†ΠΈΠΉ для Π³ΠΎΡ‚ΠΎΠ²Ρ‹Ρ… workflow diff --git a/_layouts/guides-page-base.html b/_layouts/guides-page-base.html index 6b787baf3..54f5b933c 100644 --- a/_layouts/guides-page-base.html +++ b/_layouts/guides-page-base.html @@ -13,7 +13,8 @@
    - {%- if page.name != '404.md' %} + {%- assign page_name = page.url | split: "/" | last %} + {%- if page_name == '404.html' %}
    diff --git a/assets/js/customscripts.js b/assets/js/customscripts.js index a81dfe742..a8437ac1e 100644 --- a/assets/js/customscripts.js +++ b/assets/js/customscripts.js @@ -144,7 +144,7 @@ $(document).ready(function () { let CurrentGroup = getDocGroupFromURL(); $('input[name="sitesearch"]').attr("value",function(index,currentvalue){ if (CurrentGroup) { - return currentvalue + "/documentation/" + CurrentGroup + "/" + return currentvalue + "/docs/" + CurrentGroup + "/" } else { return currentvalue } @@ -466,7 +466,7 @@ $(document).ready(function () { }); function getDocGroupFromURL() { - let result = window.location.pathname.match(/^\/documentation\/(v\d+\.\d+)/); + let result = window.location.pathname.match(/^\/docs\/(v\d+\.\d+)/); if ( result && result[1] ) { return result[1]; } @@ -474,7 +474,7 @@ function getDocGroupFromURL() { } function getDocVersionFromURL() { - let result = window.location.pathname.match(/\/documentation\/(v\d+\.\d+([^/]+)?)\/.*/); + let result = window.location.pathname.match(/\/docs\/(v\d+\.\d+([^/]+)?)\/.*/); if ( result ) { if ( result.length > 2 && result[2] ) { return result[1].replace('-plus-','+'); diff --git a/backend/common.go b/backend/common.go index 301e8474f..a5f5caa2f 100644 --- a/backend/common.go +++ b/backend/common.go @@ -49,7 +49,7 @@ type versionMenuType struct { CurrentVersion string AbsoluteVersion string // Contains explicit version, used for getting git link to source file CurrentVersionURL string - CurrentPageURLRelative string // Relative URL, without "/documentation/" + CurrentPageURLRelative string // Relative URL, without "/docs/" CurrentPageURL string // Full page URL MenuDocumentationLink string } @@ -91,7 +91,7 @@ func (m *versionMenuType) getChannelMenuData(r *http.Request, releases *Releases } if m.CurrentVersion == fmt.Sprintf("v%s", getRootRelease()) { - m.CurrentVersion = "latest" + m.CurrentVersion = getRootRelease() m.CurrentGroup = getRootRelease() } @@ -119,7 +119,7 @@ func (m *versionMenuType) getChannelMenuData(r *http.Request, releases *Releases Group: "", Channel: "", Version: "latest", - VersionURL: fmt.Sprintf("v%s", getRootRelease()), + VersionURL: "latest", IsCurrent: false, }) @@ -148,18 +148,18 @@ func (m *versionMenuType) getVersionMenuData(r *http.Request, releases *Releases re := regexp.MustCompile(`^v([0-9]+\.[0-9]+)(\..+)?$`) res := re.FindStringSubmatch(m.CurrentVersion) if res == nil { - m.MenuDocumentationLink = fmt.Sprintf("/documentation/%s/", VersionToURL(m.CurrentVersion)) + m.MenuDocumentationLink = fmt.Sprintf("/docs/%s/", VersionToURL(m.CurrentVersion)) } else { if res[2] != "" { // Version is not a group (MAJ.MIN), but the patch version // The old behavior (e.g., link to v2 for the v2.0.1 version) - // m.MenuDocumentationLink = fmt.Sprintf("/documentation/%s/", VersionToURL(res[1])) + // m.MenuDocumentationLink = fmt.Sprintf("/docs/%s/", VersionToURL(res[1])) // The new behavior (link to v2.0.1 for the v2.0.1 version) - m.MenuDocumentationLink = fmt.Sprintf("/documentation/%s/", VersionToURL(m.CurrentVersion)) + m.MenuDocumentationLink = fmt.Sprintf("/docs/%s/", VersionToURL(m.CurrentVersion)) m.AbsoluteVersion = fmt.Sprintf("%s", m.CurrentVersion) } else { // Version is a group - m.MenuDocumentationLink = fmt.Sprintf("/documentation/%s/", VersionToURL(m.CurrentVersion)) + m.MenuDocumentationLink = fmt.Sprintf("/docs/%s/", VersionToURL(m.CurrentVersion)) err, m.AbsoluteVersion = getVersionFromGroup(&ReleasesStatus, res[1]) if err != nil { log.Debugln(fmt.Sprintf("getVersionMenuData: error determine absolute version for %s (got %s)", m.CurrentVersion, m.AbsoluteVersion)) @@ -167,13 +167,13 @@ func (m *versionMenuType) getVersionMenuData(r *http.Request, releases *Releases } } - // m.MenuDocumentationLink = fmt.Sprintf("/documentation/v%s/", VersionToURL(getRootRelease())) + // m.MenuDocumentationLink = fmt.Sprintf("/docs/v%s/", VersionToURL(getRootRelease())) // if m.CurrentChannel == "" && m.CurrentGroup == "" { - // m.MenuDocumentationLink = fmt.Sprintf("/documentation/%v/", VersionToURL(m.CurrentVersion)) + // m.MenuDocumentationLink = fmt.Sprintf("/docs/%v/", VersionToURL(m.CurrentVersion)) // } else if m.CurrentChannel == "" && m.CurrentGroup != "" { - // m.MenuDocumentationLink = fmt.Sprintf("/documentation/v%v/", m.CurrentGroup) + // m.MenuDocumentationLink = fmt.Sprintf("/docs/v%v/", m.CurrentGroup) // } else { - // m.MenuDocumentationLink = fmt.Sprintf("/documentation/v%v-%v/", m.CurrentGroup, m.CurrentChannel) + // m.MenuDocumentationLink = fmt.Sprintf("/docs/v%v-%v/", m.CurrentGroup, m.CurrentChannel) // } // Add the first menu item @@ -420,7 +420,7 @@ func getPage(filename string) ([]byte, error) { } // Get the full page URL menu requested for -// E.g /documentation/v1.2.3/reference/build_process.html +// E.g /docs/v1.2.3/reference/build_process.html func getCurrentPageURL(r *http.Request) (result string) { originalURI, err := url.Parse(r.Header.Get("x-original-uri")) @@ -437,7 +437,7 @@ func getCurrentPageURL(r *http.Request) (result string) { } // Get page URL menu requested for without a leading version suffix -// E.g /reference/build_process.html for /documentation/v1.2.3/reference/build_process.html +// E.g /reference/build_process.html for /docs/v1.2.3/reference/build_process.html // if useURI == true - use requestURI instead of x-original-uri header value func getDocPageURLRelative(r *http.Request, useURI ...bool) (result string) { var ( @@ -462,7 +462,7 @@ func getDocPageURLRelative(r *http.Request, useURI ...bool) (result string) { URLtoParse = originalURI.Path } - re := regexp.MustCompile(`^/documentation/[^/]+(/.+)$`) + re := regexp.MustCompile(`^/docs/[^/]+(/.+)$`) res := re.FindStringSubmatch(URLtoParse) if res != nil { result = res[1] @@ -473,7 +473,7 @@ func getDocPageURLRelative(r *http.Request, useURI ...bool) (result string) { } // Get version URL page belongs to if request came from concrete documentation version, otherwise empty. -// E.g for the /documentation/v1.2.3-plus-fix5/reference/build_process.html return "v1.2.3-plus-fix5". +// E.g for the /docs/v1.2.3-plus-fix5/reference/build_process.html return "v1.2.3-plus-fix5". func getVersionURL(r *http.Request) (result string) { URLtoParse := "" originalURI, err := url.Parse(r.Header.Get("x-original-uri")) @@ -492,7 +492,7 @@ func getVersionURL(r *http.Request) (result string) { URLtoParse = originalURI.Path } - re := regexp.MustCompile(`^/documentation/([^/]+)/?.*$`) + re := regexp.MustCompile(`^/docs/([^/]+)/?.*$`) res := re.FindStringSubmatch(URLtoParse) if res != nil { result = res[1] diff --git a/backend/handlers.go b/backend/handlers.go index 32c3ef931..7c306074d 100644 --- a/backend/handlers.go +++ b/backend/handlers.go @@ -52,7 +52,7 @@ func groupHandler(w http.ResponseWriter, r *http.Request) { log.Debugln("Use handler - groupHandler") vars := mux.Vars(r) if err, version := getVersionFromGroup(&ReleasesStatus, vars["group"]); err == nil { - redirectURL := fmt.Sprintf("/documentation/%v%v", VersionToURL(version), getDocPageURLRelative(r, true)) + redirectURL := fmt.Sprintf("/docs/%v%v", VersionToURL(version), getDocPageURLRelative(r, true)) if rawQuery != "" { redirectURL = fmt.Sprintf("%s?%s", redirectURL, rawQuery) } @@ -60,7 +60,7 @@ func groupHandler(w http.ResponseWriter, r *http.Request) { } else { // Fall back to the version specified in the ACTIVE_RELEASE env, if got the incorrect version. activeRelease := getRootRelease() - redirectURL := fmt.Sprintf("/documentation/v%s/", activeRelease) + redirectURL := fmt.Sprintf("/docs/v%s/", activeRelease) if rawQuery != "" { redirectURL = fmt.Sprintf("%s?%s", redirectURL, rawQuery) } @@ -90,13 +90,13 @@ func unknownVersionHandler(w http.ResponseWriter, r *http.Request) { group = fmt.Sprintf("v%s", res[1]) } - re = regexp.MustCompile(`^/documentation/[^/]+(/.+)$`) + re = regexp.MustCompile(`^/docs/[^/]+(/.+)$`) res = re.FindStringSubmatch(r.URL.RequestURI()) if res != nil { pageURLRelative = res[1] } - URLToRedirect = fmt.Sprintf("/documentation/%v%v", group, pageURLRelative) + URLToRedirect = fmt.Sprintf("/docs/%v%v", group, pageURLRelative) err = validateURL(fmt.Sprintf("https://%s%s", r.Host, URLToRedirect)) if err != nil { @@ -117,7 +117,7 @@ func groupChannelHandler(w http.ResponseWriter, r *http.Request) { var version, URLToRedirect string var err error - re := regexp.MustCompile(`^/documentation/[^/]+(/.+)$`) + re := regexp.MustCompile(`^/docs/[^/]+(/.+)$`) res := re.FindStringSubmatch(r.URL.RequestURI()) if res != nil { pageURLRelative = res[1] @@ -125,7 +125,7 @@ func groupChannelHandler(w http.ResponseWriter, r *http.Request) { err, version = getVersionFromChannelAndGroup(&ReleasesStatus, vars["channel"], vars["group"]) if err == nil { - URLToRedirect = fmt.Sprintf("/documentation/%v%v", VersionToURL(version), pageURLRelative) + URLToRedirect = fmt.Sprintf("/docs/%v%v", VersionToURL(version), pageURLRelative) err = validateURL(fmt.Sprintf("https://%s%s", r.Host, URLToRedirect)) } diff --git a/backend/main.go b/backend/main.go index 2627a553f..bc24d6a9d 100644 --- a/backend/main.go +++ b/backend/main.go @@ -28,10 +28,11 @@ func newRouter() *mux.Router { r.PathPrefix("/status").HandlerFunc(statusHandler) r.PathPrefix("/backend/").HandlerFunc(ssiHandler) - r.PathPrefix("/documentation/v{group:[0-9]+.[0-9]+}-{channel:alpha|beta|ea|stable|rock-solid}").HandlerFunc(groupChannelHandler) - r.PathPrefix("/documentation/v{version:[0-9]+.[0-9]+.[0-9]+-[^/]*}").HandlerFunc(unknownVersionHandler) - r.PathPrefix("/documentation/v{group:[0-9]+}/").HandlerFunc(groupHandler) - r.PathPrefix("/documentation/v{group:[0-9]+.[0-9]+}/").HandlerFunc(groupHandler) + r.PathPrefix("/docs/v{group:[0-9]+.[0-9]+}-{channel:alpha|beta|ea|stable|rock-solid}").HandlerFunc(groupChannelHandler) + r.PathPrefix("/docs/v{version:[0-9]+.[0-9]+.[0-9]+[^/]*}").HandlerFunc(unknownVersionHandler) + r.PathPrefix("/docs/v{group:[0-9]+}/").HandlerFunc(groupHandler) + r.PathPrefix("/docs/v{group:[0-9]+.[0-9]+}/").HandlerFunc(groupHandler) + r.PathPrefix("/docs/{group:latest}/").HandlerFunc(groupHandler) r.PathPrefix("/health").HandlerFunc(healthCheckHandler) r.Path("/includes/topnav.html").HandlerFunc(topnavHandler) r.Path("/includes/version-menu.html").HandlerFunc(topnavHandler) diff --git a/bin/configurator/static/_includes/en/configurator/partials/ci/argocd_host_project_section.md.liquid b/bin/configurator/static/_includes/en/configurator/partials/ci/argocd_host_project_section.md.liquid index 152d0da13..8ed8fc3ce 100644 --- a/bin/configurator/static/_includes/en/configurator/partials/ci/argocd_host_project_section.md.liquid +++ b/bin/configurator/static/_includes/en/configurator/partials/ci/argocd_host_project_section.md.liquid @@ -84,4 +84,4 @@ This is what the repository that uses werf for building and deploying might look {% endif %} Extras: - * Add authorization options for `werf cleanup` in the container registry by following the [instructions]({{ "/documentation/v2/usage/cleanup/cr_cleanup.html#features-of-working-with-different-container-registries" | relative_url }}). + * Add authorization options for `werf cleanup` in the container registry by following the [instructions]({{ "/docs/v2/usage/cleanup/cr_cleanup.html#features-of-working-with-different-container-registries" | relative_url }}). diff --git a/bin/configurator/static/_includes/en/configurator/partials/ci/gitlab_project_main_section.md.liquid b/bin/configurator/static/_includes/en/configurator/partials/ci/gitlab_project_main_section.md.liquid index c3857ca54..942e7e5cf 100644 --- a/bin/configurator/static/_includes/en/configurator/partials/ci/gitlab_project_main_section.md.liquid +++ b/bin/configurator/static/_includes/en/configurator/partials/ci/gitlab_project_main_section.md.liquid @@ -62,4 +62,4 @@ This is how the repository that uses werf for build and deploy might look: {% endif %} Extras: - * Add authorization options for `werf cleanup` in the container registry by following [instructions]({{ "/documentation/v2/usage/cleanup/cr_cleanup.html#features-of-working-with-different-container-registries" | relative_url }}). + * Add authorization options for `werf cleanup` in the container registry by following [instructions]({{ "/docs/v2/usage/cleanup/cr_cleanup.html#features-of-working-with-different-container-registries" | relative_url }}). diff --git a/bin/configurator/static/_includes/en/configurator/tab/ci/argocd-with-gitlab-ci-cd/simple/docker-runner/linux/buildah/project.md.liquid b/bin/configurator/static/_includes/en/configurator/tab/ci/argocd-with-gitlab-ci-cd/simple/docker-runner/linux/buildah/project.md.liquid index b30fc21ed..b57cd0ecf 100644 --- a/bin/configurator/static/_includes/en/configurator/tab/ci/argocd-with-gitlab-ci-cd/simple/docker-runner/linux/buildah/project.md.liquid +++ b/bin/configurator/static/_includes/en/configurator/tab/ci/argocd-with-gitlab-ci-cd/simple/docker-runner/linux/buildah/project.md.liquid @@ -80,4 +80,4 @@ This is what the repository that uses werf for building and deploying might look {% tree_file_viewer '/examples/configurator/ci-cd/simple/argocd-with-gitlab-ci-cd/docker-runner/linux/buildah' default_file='.gitlab-ci.yml' %} Extras: - * Add authorization options for `werf cleanup` in the container registry by following the [instructions]({{ "/documentation/v2/usage/cleanup/cr_cleanup.html#features-of-working-with-different-container-registries" | relative_url }}). + * Add authorization options for `werf cleanup` in the container registry by following the [instructions]({{ "/docs/v2/usage/cleanup/cr_cleanup.html#features-of-working-with-different-container-registries" | relative_url }}). diff --git a/bin/configurator/static/_includes/en/configurator/tab/ci/argocd-with-gitlab-ci-cd/simple/kubernetes-runner/linux/buildah/project.md.liquid b/bin/configurator/static/_includes/en/configurator/tab/ci/argocd-with-gitlab-ci-cd/simple/kubernetes-runner/linux/buildah/project.md.liquid index baa302b3f..f35b49fdc 100644 --- a/bin/configurator/static/_includes/en/configurator/tab/ci/argocd-with-gitlab-ci-cd/simple/kubernetes-runner/linux/buildah/project.md.liquid +++ b/bin/configurator/static/_includes/en/configurator/tab/ci/argocd-with-gitlab-ci-cd/simple/kubernetes-runner/linux/buildah/project.md.liquid @@ -80,4 +80,4 @@ This is what the repository that uses werf for building and deploying might look {% tree_file_viewer '/examples/configurator/ci-cd/simple/argocd-with-gitlab-ci-cd/kubernetes-runner/linux/buildah' default_file='.gitlab-ci.yml' %} Extras: - * Add authorization options for `werf cleanup` in the container registry by following the [instructions]({{ "/documentation/v2/usage/cleanup/cr_cleanup.html#features-of-working-with-different-container-registries" | relative_url }}). + * Add authorization options for `werf cleanup` in the container registry by following the [instructions]({{ "/docs/v2/usage/cleanup/cr_cleanup.html#features-of-working-with-different-container-registries" | relative_url }}). diff --git a/bin/configurator/static/_includes/en/configurator/tab/ci/github-actions/simple/host-runner/linux/docker/project.md.liquid b/bin/configurator/static/_includes/en/configurator/tab/ci/github-actions/simple/host-runner/linux/docker/project.md.liquid index d8a30984a..fdf7697b3 100644 --- a/bin/configurator/static/_includes/en/configurator/tab/ci/github-actions/simple/host-runner/linux/docker/project.md.liquid +++ b/bin/configurator/static/_includes/en/configurator/tab/ci/github-actions/simple/host-runner/linux/docker/project.md.liquid @@ -15,4 +15,4 @@ This is how the repository that uses werf for build and deploy might look: {% tree_file_viewer '/examples/configurator/ci-cd/simple/github-actions/host-runner/linux/buildah' default_file='.github/workflows/prod.yml' %} Extras: - * Add authorization options for `werf cleanup` in the container registry by following [instructions]({{ "/documentation/v2/usage/cleanup/cr_cleanup.html#features-of-working-with-different-container-registries" | relative_url }}). + * Add authorization options for `werf cleanup` in the container registry by following [instructions]({{ "/docs/v2/usage/cleanup/cr_cleanup.html#features-of-working-with-different-container-registries" | relative_url }}). diff --git a/bin/configurator/static/_includes/en/configurator/tab/ci/gitlab-ci-cd/best-practice/with-per-repo-ci-cd/monorepo/docker-runner/linux/buildah/infra.md.liquid b/bin/configurator/static/_includes/en/configurator/tab/ci/gitlab-ci-cd/best-practice/with-per-repo-ci-cd/monorepo/docker-runner/linux/buildah/infra.md.liquid index 82ce07755..21c7a1439 100644 --- a/bin/configurator/static/_includes/en/configurator/tab/ci/gitlab-ci-cd/best-practice/with-per-repo-ci-cd/monorepo/docker-runner/linux/buildah/infra.md.liquid +++ b/bin/configurator/static/_includes/en/configurator/tab/ci/gitlab-ci-cd/best-practice/with-per-repo-ci-cd/monorepo/docker-runner/linux/buildah/infra.md.liquid @@ -39,7 +39,7 @@ You may also want to perform [additional configuration](https://docs.gitlab.com/ ### Configuring the container registry -[Enable garbage collection]({{ "/documentation/v2/usage/cleanup/cr_cleanup.html#automating-the-container-registry-cleanup" | relative_url }}) for your container registry. +[Enable garbage collection]({{ "/docs/v2/usage/cleanup/cr_cleanup.html#automating-the-container-registry-cleanup" | relative_url }}) for your container registry. ### Preparing the system for cross-platform building (optional) diff --git a/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/docker-runner/linux/buildah/infra.md.liquid b/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/docker-runner/linux/buildah/infra.md.liquid index cdf9e557c..f53e75072 100644 --- a/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/docker-runner/linux/buildah/infra.md.liquid +++ b/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/docker-runner/linux/buildah/infra.md.liquid @@ -28,7 +28,7 @@ If the host to run CI jobs has Linux kernel version 5.12 or lower, install `fuse ### Configuring the container registry -[Enable garbage collection]({{ "/documentation/v2/usage/cleanup/cr_cleanup.html#container-registrys-garbage-collector" | relative_url }}) for your container registry. +[Enable garbage collection]({{ "/docs/v2/usage/cleanup/cr_cleanup.html#container-registrys-garbage-collector" | relative_url }}) for your container registry. ### Preparing the system for cross-platform building (optional) diff --git a/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/docker-runner/linux/buildah/project.md.liquid b/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/docker-runner/linux/buildah/project.md.liquid index 10a94f483..a809c0267 100644 --- a/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/docker-runner/linux/buildah/project.md.liquid +++ b/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/docker-runner/linux/buildah/project.md.liquid @@ -5,4 +5,4 @@ This is how the repository that uses werf for build and deploy might look: {% tree_file_viewer '/examples/configurator/ci-cd/simple/other/docker-runner/linux/buildah' default_file='pseudo-ci-cd-config.yaml' %} Extras: - * Add authorization options for `werf cleanup` in the container registry by following [instructions]({{ "/documentation/v2/usage/cleanup/cr_cleanup.html#features-of-working-with-different-container-registries" | relative_url }}). + * Add authorization options for `werf cleanup` in the container registry by following [instructions]({{ "/docs/v2/usage/cleanup/cr_cleanup.html#features-of-working-with-different-container-registries" | relative_url }}). diff --git a/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/host-runner/linux/buildah/infra.md.liquid b/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/host-runner/linux/buildah/infra.md.liquid index 6e37964ef..7ebcad2ac 100644 --- a/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/host-runner/linux/buildah/infra.md.liquid +++ b/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/host-runner/linux/buildah/infra.md.liquid @@ -62,7 +62,7 @@ curl -sSL https://werf.io/install.sh | bash -s -- --ci ### Configuring the container registry -[Enable garbage collection]({{ "/documentation/v2/usage/cleanup/cr_cleanup.html#container-registrys-garbage-collector" | relative_url }}) for your container registry. +[Enable garbage collection]({{ "/docs/v2/usage/cleanup/cr_cleanup.html#container-registrys-garbage-collector" | relative_url }}) for your container registry. ### Preparing the system for cross-platform building (optional) diff --git a/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/host-runner/linux/buildah/project.md.liquid b/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/host-runner/linux/buildah/project.md.liquid index 8787f0be6..9aec143c9 100644 --- a/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/host-runner/linux/buildah/project.md.liquid +++ b/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/host-runner/linux/buildah/project.md.liquid @@ -5,4 +5,4 @@ This is how the repository that uses werf for build and deploy might look: {% tree_file_viewer '/examples/configurator/ci-cd/simple/other/host-runner/linux/buildah' default_file='pseudo-ci-cd-config.yaml' %} Extras: - * Add authorization options for `werf cleanup` in the container registry by following [instructions]({{ "/documentation/v2/usage/cleanup/cr_cleanup.html#features-of-working-with-different-container-registries" | relative_url }}). + * Add authorization options for `werf cleanup` in the container registry by following [instructions]({{ "/docs/v2/usage/cleanup/cr_cleanup.html#features-of-working-with-different-container-registries" | relative_url }}). diff --git a/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/host-runner/linux/docker/infra.md.liquid b/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/host-runner/linux/docker/infra.md.liquid index b81b862f7..16aae8b79 100644 --- a/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/host-runner/linux/docker/infra.md.liquid +++ b/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/host-runner/linux/docker/infra.md.liquid @@ -24,7 +24,7 @@ curl -sSL https://werf.io/install.sh | bash -s -- --ci ### Configuring the container registry -[Enable garbage collection]({{ "/documentation/v2/usage/cleanup/cr_cleanup.html#container-registrys-garbage-collector" | relative_url }}) for your container registry. +[Enable garbage collection]({{ "/docs/v2/usage/cleanup/cr_cleanup.html#container-registrys-garbage-collector" | relative_url }}) for your container registry. ### Preparing the system for cross-platform building (optional) diff --git a/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/host-runner/linux/docker/project.md.liquid b/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/host-runner/linux/docker/project.md.liquid index 7f5ab7929..ec931ba08 100644 --- a/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/host-runner/linux/docker/project.md.liquid +++ b/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/host-runner/linux/docker/project.md.liquid @@ -5,4 +5,4 @@ This is how the repository that uses werf for build and deploy might look: {% tree_file_viewer '/examples/configurator/ci-cd/simple/other/host-runner/linux/docker' default_file='pseudo-ci-cd-config.yaml' %} Extras: - * Add authorization options for `werf cleanup` in the container registry by following [instructions]({{ "/documentation/v2/usage/cleanup/cr_cleanup.html#features-of-working-with-different-container-registries" | relative_url }}). + * Add authorization options for `werf cleanup` in the container registry by following [instructions]({{ "/docs/v2/usage/cleanup/cr_cleanup.html#features-of-working-with-different-container-registries" | relative_url }}). diff --git a/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/kubernetes-runner/linux/buildah/infra.md.liquid b/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/kubernetes-runner/linux/buildah/infra.md.liquid index 393696d4a..4e2bb56bd 100644 --- a/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/kubernetes-runner/linux/buildah/infra.md.liquid +++ b/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/kubernetes-runner/linux/buildah/infra.md.liquid @@ -155,7 +155,7 @@ EOF ### Configuring the container registry -[Enable garbage collection]({{ "/documentation/v2/usage/cleanup/cr_cleanup.html#container-registrys-garbage-collector" | relative_url }}) for your container registry. +[Enable garbage collection]({{ "/docs/v2/usage/cleanup/cr_cleanup.html#container-registrys-garbage-collector" | relative_url }}) for your container registry. ### Preparing Kubernetes for multi-platform building (optional) diff --git a/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/kubernetes-runner/linux/buildah/project.md.liquid b/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/kubernetes-runner/linux/buildah/project.md.liquid index 9a6cc7f20..d21ed4513 100644 --- a/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/kubernetes-runner/linux/buildah/project.md.liquid +++ b/bin/configurator/static/_includes/en/configurator/tab/ci/other-ci-cd-system/simple/kubernetes-runner/linux/buildah/project.md.liquid @@ -5,4 +5,4 @@ This is how the repository that uses werf for build and deploy might look: {% tree_file_viewer '/examples/configurator/ci-cd/simple/other/kubernetes-runner/linux/buildah' default_file='pseudo-ci-cd-config.yaml' %} Extras: - * Add authorization options for `werf cleanup` in the container registry by following [instructions]({{ "/documentation/v2/usage/cleanup/cr_cleanup.html#features-of-working-with-different-container-registries" | relative_url }}). + * Add authorization options for `werf cleanup` in the container registry by following [instructions]({{ "/docs/v2/usage/cleanup/cr_cleanup.html#features-of-working-with-different-container-registries" | relative_url }}). diff --git a/bin/configurator/static/_includes/ru/configurator/partials/ci/argocd_host_project_section.md.liquid b/bin/configurator/static/_includes/ru/configurator/partials/ci/argocd_host_project_section.md.liquid index 855f65126..ccee0e5b1 100644 --- a/bin/configurator/static/_includes/ru/configurator/partials/ci/argocd_host_project_section.md.liquid +++ b/bin/configurator/static/_includes/ru/configurator/partials/ci/argocd_host_project_section.md.liquid @@ -84,4 +84,4 @@ EOF {% endif %} Π”ΠΎΠΏΠΎΠ»Π½ΠΈΡ‚Π΅Π»ΡŒΠ½ΠΎ: - * Π”ΠΎΠ±Π°Π²ΡŒΡ‚Π΅ ΠΏΠ°Ρ€Π°ΠΌΠ΅Ρ‚Ρ€Ρ‹ Π°Π²Ρ‚ΠΎΡ€ΠΈΠ·Π°Ρ†ΠΈΠΈ для `werf cleanup` Π² container registry, слСдуя [инструкции]({{ "/documentation/v2/usage/cleanup/cr_cleanup.html#features-of-working-with-different-container-registries" | relative_url }}). + * Π”ΠΎΠ±Π°Π²ΡŒΡ‚Π΅ ΠΏΠ°Ρ€Π°ΠΌΠ΅Ρ‚Ρ€Ρ‹ Π°Π²Ρ‚ΠΎΡ€ΠΈΠ·Π°Ρ†ΠΈΠΈ для `werf cleanup` Π² container registry, слСдуя [инструкции]({{ "/docs/v2/usage/cleanup/cr_cleanup.html#features-of-working-with-different-container-registries" | relative_url }}). diff --git a/bin/configurator/static/_includes/ru/configurator/partials/ci/gitlab_project_main_section.md.liquid b/bin/configurator/static/_includes/ru/configurator/partials/ci/gitlab_project_main_section.md.liquid index def0f29c7..4a63b74b6 100644 --- a/bin/configurator/static/_includes/ru/configurator/partials/ci/gitlab_project_main_section.md.liquid +++ b/bin/configurator/static/_includes/ru/configurator/partials/ci/gitlab_project_main_section.md.liquid @@ -62,6 +62,6 @@ {% tree_file_viewer '/examples/configurator/ci-cd/best-practice/with-per-repo-ci-cd/gitlab-ci-cd/app-repo/kubernetes-runner/linux/buildah' default_file='.gitlab-ci.yml' %} {% endif %} -{% capture registry_guide_url %}/documentation/v2/usage/cleanup/cr_cleanup.html#%D0%BE%D1%81%D0%BE%D0%B1%D0%B5%D0%BD%D0%BD%D0%BE%D1%81%D1%82%D0%B8-%D1%80%D0%B0%D0%B1%D0%BE%D1%82%D1%8B-%D1%81-%D1%80%D0%B0%D0%B7%D0%BB%D0%B8%D1%87%D0%BD%D1%8B%D0%BC%D0%B8-container-registries{% endcapture %} +{% capture registry_guide_url %}/docs/v2/usage/cleanup/cr_cleanup.html#%D0%BE%D1%81%D0%BE%D0%B1%D0%B5%D0%BD%D0%BD%D0%BE%D1%81%D1%82%D0%B8-%D1%80%D0%B0%D0%B1%D0%BE%D1%82%D1%8B-%D1%81-%D1%80%D0%B0%D0%B7%D0%BB%D0%B8%D1%87%D0%BD%D1%8B%D0%BC%D0%B8-container-registries{% endcapture %} Π”ΠΎΠΏΠΎΠ»Π½ΠΈΡ‚Π΅Π»ΡŒΠ½ΠΎ: * Π”ΠΎΠ±Π°Π²ΡŒΡ‚Π΅ для `werf cleanup` ΠΎΠΏΡ†ΠΈΠΈ Π°Π²Ρ‚ΠΎΡ€ΠΈΠ·Π°Ρ†ΠΈΠΈ Π² container registry, слСдуя [инструкциям]({{ registry_guide_url | relative_url }}). diff --git a/bin/configurator/static/_includes/ru/configurator/tab/ci/argocd-with-gitlab-ci-cd/simple/docker-runner/linux/buildah/project.md.liquid b/bin/configurator/static/_includes/ru/configurator/tab/ci/argocd-with-gitlab-ci-cd/simple/docker-runner/linux/buildah/project.md.liquid index d92580354..c6d4c3e73 100644 --- a/bin/configurator/static/_includes/ru/configurator/tab/ci/argocd-with-gitlab-ci-cd/simple/docker-runner/linux/buildah/project.md.liquid +++ b/bin/configurator/static/_includes/ru/configurator/tab/ci/argocd-with-gitlab-ci-cd/simple/docker-runner/linux/buildah/project.md.liquid @@ -80,4 +80,4 @@ EOF {% tree_file_viewer '/examples/configurator/ci-cd/simple/argocd-with-gitlab-ci-cd/docker-runner/linux/buildah' default_file='.gitlab-ci.yml' %} Π”ΠΎΠΏΠΎΠ»Π½ΠΈΡ‚Π΅Π»ΡŒΠ½ΠΎ: - * Π”ΠΎΠ±Π°Π²ΡŒΡ‚Π΅ ΠΏΠ°Ρ€Π°ΠΌΠ΅Ρ‚Ρ€Ρ‹ Π°Π²Ρ‚ΠΎΡ€ΠΈΠ·Π°Ρ†ΠΈΠΈ для `werf cleanup` Π² container registry, слСдуя [инструкции]({{ "/documentation/v2/usage/cleanup/cr_cleanup.html#features-of-working-with-different-container-registries" | relative_url }}). + * Π”ΠΎΠ±Π°Π²ΡŒΡ‚Π΅ ΠΏΠ°Ρ€Π°ΠΌΠ΅Ρ‚Ρ€Ρ‹ Π°Π²Ρ‚ΠΎΡ€ΠΈΠ·Π°Ρ†ΠΈΠΈ для `werf cleanup` Π² container registry, слСдуя [инструкции]({{ "/docs/v2/usage/cleanup/cr_cleanup.html#features-of-working-with-different-container-registries" | relative_url }}). diff --git a/bin/configurator/static/_includes/ru/configurator/tab/ci/argocd-with-gitlab-ci-cd/simple/kubernetes-runner/linux/buildah/project.md.liquid b/bin/configurator/static/_includes/ru/configurator/tab/ci/argocd-with-gitlab-ci-cd/simple/kubernetes-runner/linux/buildah/project.md.liquid index e45e942a0..a92c03f52 100644 --- a/bin/configurator/static/_includes/ru/configurator/tab/ci/argocd-with-gitlab-ci-cd/simple/kubernetes-runner/linux/buildah/project.md.liquid +++ b/bin/configurator/static/_includes/ru/configurator/tab/ci/argocd-with-gitlab-ci-cd/simple/kubernetes-runner/linux/buildah/project.md.liquid @@ -80,4 +80,4 @@ EOF {% tree_file_viewer '/examples/configurator/ci-cd/simple/argocd-with-gitlab-ci-cd/kubernetes-runner/linux/buildah' default_file='.gitlab-ci.yml' %} Π”ΠΎΠΏΠΎΠ»Π½ΠΈΡ‚Π΅Π»ΡŒΠ½ΠΎ: - * Π”ΠΎΠ±Π°Π²ΡŒΡ‚Π΅ ΠΏΠ°Ρ€Π°ΠΌΠ΅Ρ‚Ρ€Ρ‹ Π°Π²Ρ‚ΠΎΡ€ΠΈΠ·Π°Ρ†ΠΈΠΈ для `werf cleanup` Π² container registry, слСдуя [инструкции]({{ "/documentation/v2/usage/cleanup/cr_cleanup.html#features-of-working-with-different-container-registries" | relative_url }}). + * Π”ΠΎΠ±Π°Π²ΡŒΡ‚Π΅ ΠΏΠ°Ρ€Π°ΠΌΠ΅Ρ‚Ρ€Ρ‹ Π°Π²Ρ‚ΠΎΡ€ΠΈΠ·Π°Ρ†ΠΈΠΈ для `werf cleanup` Π² container registry, слСдуя [инструкции]({{ "/docs/v2/usage/cleanup/cr_cleanup.html#features-of-working-with-different-container-registries" | relative_url }}). diff --git a/bin/configurator/static/_includes/ru/configurator/tab/ci/github-actions/simple/host-runner/linux/docker/project.md.liquid b/bin/configurator/static/_includes/ru/configurator/tab/ci/github-actions/simple/host-runner/linux/docker/project.md.liquid index 2ef04e754..8686e57d5 100644 --- a/bin/configurator/static/_includes/ru/configurator/tab/ci/github-actions/simple/host-runner/linux/docker/project.md.liquid +++ b/bin/configurator/static/_includes/ru/configurator/tab/ci/github-actions/simple/host-runner/linux/docker/project.md.liquid @@ -14,6 +14,6 @@ {% tree_file_viewer '/examples/configurator/ci-cd/simple/github-actions/host-runner/linux/buildah' default_file='.github/workflows/prod.yml' %} -{% capture registry_guide_url %}/documentation/v2/usage/cleanup/cr_cleanup.html#%D0%BE%D1%81%D0%BE%D0%B1%D0%B5%D0%BD%D0%BD%D0%BE%D1%81%D1%82%D0%B8-%D1%80%D0%B0%D0%B1%D0%BE%D1%82%D1%8B-%D1%81-%D1%80%D0%B0%D0%B7%D0%BB%D0%B8%D1%87%D0%BD%D1%8B%D0%BC%D0%B8-container-registries{% endcapture %} +{% capture registry_guide_url %}/docs/v2/usage/cleanup/cr_cleanup.html#%D0%BE%D1%81%D0%BE%D0%B1%D0%B5%D0%BD%D0%BD%D0%BE%D1%81%D1%82%D0%B8-%D1%80%D0%B0%D0%B1%D0%BE%D1%82%D1%8B-%D1%81-%D1%80%D0%B0%D0%B7%D0%BB%D0%B8%D1%87%D0%BD%D1%8B%D0%BC%D0%B8-container-registries{% endcapture %} Π”ΠΎΠΏΠΎΠ»Π½ΠΈΡ‚Π΅Π»ΡŒΠ½ΠΎ: * Π”ΠΎΠ±Π°Π²ΡŒΡ‚Π΅ для `werf cleanup` ΠΎΠΏΡ†ΠΈΠΈ Π°Π²Ρ‚ΠΎΡ€ΠΈΠ·Π°Ρ†ΠΈΠΈ Π² container registry, слСдуя [инструкциям]({{ registry_guide_url | relative_url }}). diff --git a/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/docker-runner/linux/buildah/infra.md.liquid b/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/docker-runner/linux/buildah/infra.md.liquid index 35fd0e004..65a059421 100644 --- a/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/docker-runner/linux/buildah/infra.md.liquid +++ b/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/docker-runner/linux/buildah/infra.md.liquid @@ -28,7 +28,7 @@ docker volume create werf ### ΠšΠΎΠ½Ρ„ΠΈΠ³ΡƒΡ€Π°Ρ†ΠΈΡ container registry -[Π’ΠΊΠ»ΡŽΡ‡ΠΈΡ‚Π΅ сборщик мусора]({{ "/documentation/v2/usage/cleanup/cr_cleanup.html#%D1%81%D0%B1%D0%BE%D1%80%D1%89%D0%B8%D0%BA-%D0%BC%D1%83%D1%81%D0%BE%D1%80%D0%B0-container-registry" | relative_url }}) вашСго container registry. +[Π’ΠΊΠ»ΡŽΡ‡ΠΈΡ‚Π΅ сборщик мусора]({{ "/docs/v2/usage/cleanup/cr_cleanup.html#%D1%81%D0%B1%D0%BE%D1%80%D1%89%D0%B8%D0%BA-%D0%BC%D1%83%D1%81%D0%BE%D1%80%D0%B0-container-registry" | relative_url }}) вашСго container registry. ### ΠŸΠΎΠ΄Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° систСмы ΠΊ кроссплатформСнной сборкС (ΠΎΠΏΡ†ΠΈΠΎΠ½Π°Π»ΡŒΠ½ΠΎ) diff --git a/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/docker-runner/linux/buildah/project.md.liquid b/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/docker-runner/linux/buildah/project.md.liquid index e6323b680..e98fe6c89 100644 --- a/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/docker-runner/linux/buildah/project.md.liquid +++ b/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/docker-runner/linux/buildah/project.md.liquid @@ -4,6 +4,6 @@ {% tree_file_viewer '/examples/configurator/ci-cd/simple/other/docker-runner/linux/buildah' default_file='pseudo-ci-cd-config.yaml' %} -{% capture registry_guide_url %}/documentation/v2/usage/cleanup/cr_cleanup.html#%D0%BE%D1%81%D0%BE%D0%B1%D0%B5%D0%BD%D0%BD%D0%BE%D1%81%D1%82%D0%B8-%D1%80%D0%B0%D0%B1%D0%BE%D1%82%D1%8B-%D1%81-%D1%80%D0%B0%D0%B7%D0%BB%D0%B8%D1%87%D0%BD%D1%8B%D0%BC%D0%B8-container-registries{% endcapture %} +{% capture registry_guide_url %}/docs/v2/usage/cleanup/cr_cleanup.html#%D0%BE%D1%81%D0%BE%D0%B1%D0%B5%D0%BD%D0%BD%D0%BE%D1%81%D1%82%D0%B8-%D1%80%D0%B0%D0%B1%D0%BE%D1%82%D1%8B-%D1%81-%D1%80%D0%B0%D0%B7%D0%BB%D0%B8%D1%87%D0%BD%D1%8B%D0%BC%D0%B8-container-registries{% endcapture %} Π”ΠΎΠΏΠΎΠ»Π½ΠΈΡ‚Π΅Π»ΡŒΠ½ΠΎ: * Π”ΠΎΠ±Π°Π²ΡŒΡ‚Π΅ для `werf cleanup` ΠΎΠΏΡ†ΠΈΠΈ Π°Π²Ρ‚ΠΎΡ€ΠΈΠ·Π°Ρ†ΠΈΠΈ Π² container registry, слСдуя [инструкциям]({{ registry_guide_url | relative_url }}). diff --git a/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/host-runner/linux/buildah/infra.md.liquid b/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/host-runner/linux/buildah/infra.md.liquid index 6a0ca6bc7..6c8222508 100644 --- a/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/host-runner/linux/buildah/infra.md.liquid +++ b/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/host-runner/linux/buildah/infra.md.liquid @@ -62,7 +62,7 @@ curl -sSL https://werf.io/install.sh | bash -s -- --ci ### ΠšΠΎΠ½Ρ„ΠΈΠ³ΡƒΡ€Π°Ρ†ΠΈΡ container registry -[Π’ΠΊΠ»ΡŽΡ‡ΠΈΡ‚Π΅ сборщик мусора]({{ "/documentation/v2/usage/cleanup/cr_cleanup.html#%D1%81%D0%B1%D0%BE%D1%80%D1%89%D0%B8%D0%BA-%D0%BC%D1%83%D1%81%D0%BE%D1%80%D0%B0-container-registry" | relative_url }}) вашСго container registry. +[Π’ΠΊΠ»ΡŽΡ‡ΠΈΡ‚Π΅ сборщик мусора]({{ "/docs/v2/usage/cleanup/cr_cleanup.html#%D1%81%D0%B1%D0%BE%D1%80%D1%89%D0%B8%D0%BA-%D0%BC%D1%83%D1%81%D0%BE%D1%80%D0%B0-container-registry" | relative_url }}) вашСго container registry. ### ΠŸΠΎΠ΄Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° систСмы ΠΊ кроссплатформСнной сборкС (ΠΎΠΏΡ†ΠΈΠΎΠ½Π°Π»ΡŒΠ½ΠΎ) diff --git a/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/host-runner/linux/buildah/project.md.liquid b/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/host-runner/linux/buildah/project.md.liquid index 94d6a50d0..d5f59cdd6 100644 --- a/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/host-runner/linux/buildah/project.md.liquid +++ b/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/host-runner/linux/buildah/project.md.liquid @@ -4,6 +4,6 @@ {% tree_file_viewer '/examples/configurator/ci-cd/simple/other/host-runner/linux/buildah' default_file='pseudo-ci-cd-config.yaml' %} -{% capture registry_guide_url %}/documentation/v2/usage/cleanup/cr_cleanup.html#%D0%BE%D1%81%D0%BE%D0%B1%D0%B5%D0%BD%D0%BD%D0%BE%D1%81%D1%82%D0%B8-%D1%80%D0%B0%D0%B1%D0%BE%D1%82%D1%8B-%D1%81-%D1%80%D0%B0%D0%B7%D0%BB%D0%B8%D1%87%D0%BD%D1%8B%D0%BC%D0%B8-container-registries{% endcapture %} +{% capture registry_guide_url %}/docs/v2/usage/cleanup/cr_cleanup.html#%D0%BE%D1%81%D0%BE%D0%B1%D0%B5%D0%BD%D0%BD%D0%BE%D1%81%D1%82%D0%B8-%D1%80%D0%B0%D0%B1%D0%BE%D1%82%D1%8B-%D1%81-%D1%80%D0%B0%D0%B7%D0%BB%D0%B8%D1%87%D0%BD%D1%8B%D0%BC%D0%B8-container-registries{% endcapture %} Π”ΠΎΠΏΠΎΠ»Π½ΠΈΡ‚Π΅Π»ΡŒΠ½ΠΎ: * Π”ΠΎΠ±Π°Π²ΡŒΡ‚Π΅ для `werf cleanup` ΠΎΠΏΡ†ΠΈΠΈ Π°Π²Ρ‚ΠΎΡ€ΠΈΠ·Π°Ρ†ΠΈΠΈ Π² container registry, слСдуя [инструкциям]({{ registry_guide_url | relative_url }}). diff --git a/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/host-runner/linux/docker/infra.md.liquid b/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/host-runner/linux/docker/infra.md.liquid index 7d9a6acaa..6a9594f1e 100644 --- a/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/host-runner/linux/docker/infra.md.liquid +++ b/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/host-runner/linux/docker/infra.md.liquid @@ -24,7 +24,7 @@ curl -sSL https://werf.io/install.sh | bash -s -- --ci ### ΠšΠΎΠ½Ρ„ΠΈΠ³ΡƒΡ€Π°Ρ†ΠΈΡ container registry -[Π’ΠΊΠ»ΡŽΡ‡ΠΈΡ‚Π΅ сборщик мусора]({{ "/documentation/v2/usage/cleanup/cr_cleanup.html#%D1%81%D0%B1%D0%BE%D1%80%D1%89%D0%B8%D0%BA-%D0%BC%D1%83%D1%81%D0%BE%D1%80%D0%B0-container-registry" | relative_url }}) вашСго container registry. +[Π’ΠΊΠ»ΡŽΡ‡ΠΈΡ‚Π΅ сборщик мусора]({{ "/docs/v2/usage/cleanup/cr_cleanup.html#%D1%81%D0%B1%D0%BE%D1%80%D1%89%D0%B8%D0%BA-%D0%BC%D1%83%D1%81%D0%BE%D1%80%D0%B0-container-registry" | relative_url }}) вашСго container registry. ### ΠŸΠΎΠ΄Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° систСмы ΠΊ кроссплатформСнной сборкС (ΠΎΠΏΡ†ΠΈΠΎΠ½Π°Π»ΡŒΠ½ΠΎ) diff --git a/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/host-runner/linux/docker/project.md.liquid b/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/host-runner/linux/docker/project.md.liquid index d1769a31a..34db18cd6 100644 --- a/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/host-runner/linux/docker/project.md.liquid +++ b/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/host-runner/linux/docker/project.md.liquid @@ -4,6 +4,6 @@ {% tree_file_viewer '/examples/configurator/ci-cd/simple/other/host-runner/linux/docker' default_file='pseudo-ci-cd-config.yaml' %} -{% capture registry_guide_url %}/documentation/v2/usage/cleanup/cr_cleanup.html#%D0%BE%D1%81%D0%BE%D0%B1%D0%B5%D0%BD%D0%BD%D0%BE%D1%81%D1%82%D0%B8-%D1%80%D0%B0%D0%B1%D0%BE%D1%82%D1%8B-%D1%81-%D1%80%D0%B0%D0%B7%D0%BB%D0%B8%D1%87%D0%BD%D1%8B%D0%BC%D0%B8-container-registries{% endcapture %} +{% capture registry_guide_url %}/docs/v2/usage/cleanup/cr_cleanup.html#%D0%BE%D1%81%D0%BE%D0%B1%D0%B5%D0%BD%D0%BD%D0%BE%D1%81%D1%82%D0%B8-%D1%80%D0%B0%D0%B1%D0%BE%D1%82%D1%8B-%D1%81-%D1%80%D0%B0%D0%B7%D0%BB%D0%B8%D1%87%D0%BD%D1%8B%D0%BC%D0%B8-container-registries{% endcapture %} Π”ΠΎΠΏΠΎΠ»Π½ΠΈΡ‚Π΅Π»ΡŒΠ½ΠΎ: * Π”ΠΎΠ±Π°Π²ΡŒΡ‚Π΅ для `werf cleanup` ΠΎΠΏΡ†ΠΈΠΈ Π°Π²Ρ‚ΠΎΡ€ΠΈΠ·Π°Ρ†ΠΈΠΈ Π² container registry, слСдуя [инструкциям]({{ registry_guide_url | relative_url }}). diff --git a/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/kubernetes-runner/linux/buildah/infra.md.liquid b/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/kubernetes-runner/linux/buildah/infra.md.liquid index 044cea978..e51c9a52a 100644 --- a/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/kubernetes-runner/linux/buildah/infra.md.liquid +++ b/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/kubernetes-runner/linux/buildah/infra.md.liquid @@ -155,7 +155,7 @@ EOF ### ΠšΠΎΠ½Ρ„ΠΈΠ³ΡƒΡ€Π°Ρ†ΠΈΡ container registry -[Π’ΠΊΠ»ΡŽΡ‡ΠΈΡ‚Π΅ сборщик мусора]({{ "/documentation/v2/usage/cleanup/cr_cleanup.html#%D1%81%D0%B1%D0%BE%D1%80%D1%89%D0%B8%D0%BA-%D0%BC%D1%83%D1%81%D0%BE%D1%80%D0%B0-container-registry" | relative_url }}) вашСго container registry. +[Π’ΠΊΠ»ΡŽΡ‡ΠΈΡ‚Π΅ сборщик мусора]({{ "/docs/v2/usage/cleanup/cr_cleanup.html#%D1%81%D0%B1%D0%BE%D1%80%D1%89%D0%B8%D0%BA-%D0%BC%D1%83%D1%81%D0%BE%D1%80%D0%B0-container-registry" | relative_url }}) вашСго container registry. ### ΠŸΠΎΠ΄Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° кластСра Kubernetes ΠΊ ΠΌΡƒΠ»ΡŒΡ‚ΠΈΠΏΠ»Π°Ρ‚Ρ„ΠΎΡ€ΠΌΠ΅Π½Π½ΠΎΠΉ сборкС (ΠΎΠΏΡ†ΠΈΠΎΠ½Π°Π»ΡŒΠ½ΠΎ) diff --git a/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/kubernetes-runner/linux/buildah/project.md.liquid b/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/kubernetes-runner/linux/buildah/project.md.liquid index 453016093..811890640 100644 --- a/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/kubernetes-runner/linux/buildah/project.md.liquid +++ b/bin/configurator/static/_includes/ru/configurator/tab/ci/other-ci-cd-system/simple/kubernetes-runner/linux/buildah/project.md.liquid @@ -4,6 +4,6 @@ {% tree_file_viewer '/examples/configurator/ci-cd/simple/other/kubernetes-runner/linux/buildah' default_file='pseudo-ci-cd-config.yaml' %} -{% capture registry_guide_url %}/documentation/v2/usage/cleanup/cr_cleanup.html#%D0%BE%D1%81%D0%BE%D0%B1%D0%B5%D0%BD%D0%BD%D0%BE%D1%81%D1%82%D0%B8-%D1%80%D0%B0%D0%B1%D0%BE%D1%82%D1%8B-%D1%81-%D1%80%D0%B0%D0%B7%D0%BB%D0%B8%D1%87%D0%BD%D1%8B%D0%BC%D0%B8-container-registries{% endcapture %} +{% capture registry_guide_url %}/docs/v2/usage/cleanup/cr_cleanup.html#%D0%BE%D1%81%D0%BE%D0%B1%D0%B5%D0%BD%D0%BD%D0%BE%D1%81%D1%82%D0%B8-%D1%80%D0%B0%D0%B1%D0%BE%D1%82%D1%8B-%D1%81-%D1%80%D0%B0%D0%B7%D0%BB%D0%B8%D1%87%D0%BD%D1%8B%D0%BC%D0%B8-container-registries{% endcapture %} Π”ΠΎΠΏΠΎΠ»Π½ΠΈΡ‚Π΅Π»ΡŒΠ½ΠΎ: * Π”ΠΎΠ±Π°Π²ΡŒΡ‚Π΅ для `werf cleanup` ΠΎΠΏΡ†ΠΈΠΈ Π°Π²Ρ‚ΠΎΡ€ΠΈΠ·Π°Ρ†ΠΈΠΈ Π² container registry, слСдуя [инструкциям]({{ registry_guide_url | relative_url }}). diff --git a/robots.txt b/robots.txt index 9e7d36da8..e304eb850 100644 --- a/robots.txt +++ b/robots.txt @@ -8,14 +8,14 @@ User-agent: * Disallow: *.js Disallow: *?* Allow: / -Allow: /documentation/v2 -Disallow: /documentation/v2- -Disallow: /documentation/v2. -Disallow: /documentation/v1.2 -Disallow: /documentation/v1.1 -Disallow: /documentation/v -Disallow: /documentation/v1.2- -Disallow: /documentation/v1.2. +Allow: /docs/v2 +Disallow: /docs/v2- +Disallow: /docs/v2. +Disallow: /docs/v1.2 +Disallow: /docs/v1.1 +Disallow: /docs/v +Disallow: /docs/v1.2- +Disallow: /docs/v1.2. Disallow: /configurator/tabs Disallow: /guides/framework_id Sitemap: {{ site.url }}/sitemap.xml diff --git a/scripts/docs/check_broken_links.sh b/scripts/docs/check_broken_links.sh index a5004e372..3ed5683d4 100755 --- a/scripts/docs/check_broken_links.sh +++ b/scripts/docs/check_broken_links.sh @@ -11,7 +11,7 @@ cd /app && \ --empty-alt-ignore \ --check_html \ --file_ignore "/____________/" \ - --url_ignore "/localhost/,/cloudyuga.guru/,/t.me/,/slack.com/,/cncf.io/,/example.com/,/github.com/werf/,/habr.com/,/apple-touch-icon.png/,/site.webmanifest/,/favicon/,/safari-pinned-tab/,/documentation/,/guides.html/" \ + --url_ignore "/localhost/,/cloudyuga.guru/,/t.me/,/slack.com/,/cncf.io/,/example.com/,/github.com/werf/,/habr.com/,/apple-touch-icon.png/,/site.webmanifest/,/favicon/,/safari-pinned-tab/,/docs/,/guides.html/" \ --url-swap "github.com/werf/website/blob/main:github.com/werf/website/blob/$GITHUB_SHA,github.com/werf/website/tree/main:github.com/werf/website/tree/$GITHUB_SHA" \ --http-status-ignore "0,429,403" \ /app/_site diff --git a/sitemap.xml b/sitemap.xml index a8385645c..fab9c2895 100644 --- a/sitemap.xml +++ b/sitemap.xml @@ -8,7 +8,7 @@ search: exclude - {{ site.url }}/documentation/v2/sitemap.xml + {{ site.url }}/docs/v2/sitemap.xml {{ site.url }}/sitemap-site.xml