Skip to content

Commit

Permalink
fix(v2): replace leftovers of v1.2 with v2
Browse files Browse the repository at this point in the history
Signed-off-by: Ilya Lesikov <ilya@lesikov.com>
  • Loading branch information
ilya-lesikov committed Apr 24, 2024
1 parent ded6aa6 commit 940fefe
Show file tree
Hide file tree
Showing 18 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/_docs_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
fi
- name: Deploy
uses: werf/actions/converge@v1.2
uses: werf/actions/converge@v2
with:
env: ${{ inputs.env }}
kube-config-base64-data: ${{ secrets.kubeConfig }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release_trdl-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
fetch-depth: 0

- name: Converge
uses: werf/actions/converge@v1.2
uses: werf/actions/converge@v2
with:
env: production
kube-config-base64-data: ${{ secrets.KUBECONFIG_BASE64_PROD }}
Expand All @@ -62,7 +62,7 @@ jobs:
fetch-depth: 0

- name: Install werf
uses: werf/actions/install@v1.2
uses: werf/actions/install@v2
with:
channel: alpha

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ werf is an Open Source project, and we are thrilled to develop and improve it in

## Feedback

The first thing we recommend is to check the existing [issues](https://github.com/werf/werf/issues), [discussion threads](https://github.com/werf/werf/discussions), and [documentation](https://werf.io/documentation/v1.2/) - there may already be a discussion or solution on your topic. If not, choose the appropriate way to address the issue on [the new issue form](https://github.com/werf/werf/issues/new/choose).
The first thing we recommend is to check the existing [issues](https://github.com/werf/werf/issues), [discussion threads](https://github.com/werf/werf/discussions), and [documentation](https://werf.io/documentation/v2/) - there may already be a discussion or solution on your topic. If not, choose the appropriate way to address the issue on [the new issue form](https://github.com/werf/werf/issues/new/choose).

## Contributing code

Expand Down
4 changes: 2 additions & 2 deletions Taskfile.dist.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ tasks:
# Run compose up in docs directory.
cd docs
which werf >/dev/null || source $(trdl use werf 1.2 beta)
which werf >/dev/null || source $(trdl use werf 2 beta)
werf compose up jekyll_base --dev --docker-compose-command-options="$services" --platform=linux/amd64 || true
compose:up:standalone:
Expand All @@ -589,7 +589,7 @@ tasks:
cmds:
- |
cd docs
which werf >/dev/null || source $(trdl use werf 1.2 beta)
which werf >/dev/null || source $(trdl use werf 2 beta)
# Workaround: set image variable to stub image.
WERF_JEKYLL_BASE_DOCKER_IMAGE_NAME=nginx:latest \
werf compose down
4 changes: 2 additions & 2 deletions docs/.werf/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ http {
if ($arg_usage) {
rewrite ^/documentation/(v[\d]+\.[\d]+[^\/]*|latest)/(index.html)?$ /getting_started/ permanent;
}
rewrite ^/documentation/(v[\d]+\.[\d]+[^\/]*|latest)/(index.html)?$ /documentation/v1.2/usage/project_configuration/overview.html redirect;
rewrite ^/documentation/(v[\d]+\.[\d]+[^\/]*|latest)/(index.html)?$ /documentation/v2/usage/project_configuration/overview.html redirect;
}

location ~* ^/documentation/(v[\d]+\.[\d]+[^\/]*/|latest/)?(.*)?$ {
Expand Down Expand Up @@ -114,7 +114,7 @@ http {
if ($arg_usage) {
rewrite ^/documentation/(v[\d]+\.[\d]+[^\/]*|latest)/(index.html)?$ /getting_started/ permanent;
}
rewrite ^/documentation/(v[\d]+\.[\d]+[^\/]*|latest)/(index.html)?$ /documentation/v1.2/usage/project_configuration/overview.html redirect;
rewrite ^/documentation/(v[\d]+\.[\d]+[^\/]*|latest)/(index.html)?$ /documentation/v2/usage/project_configuration/overview.html redirect;
}

location ~* ^/documentation/(v[\d]+\.[\d]+[^\/]*/|latest/)?(.*)?$ {
Expand Down
2 changes: 1 addition & 1 deletion docs/_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ site_title: werf
company_name: Flant
company_url: https://flant.com
url: https://werf.io
canonical_url_prefix: /documentation/v1.2
canonical_url_prefix: /documentation/v2
site_lang: en
site_urls:
ru: https://ru.werf.io
Expand Down
4 changes: 2 additions & 2 deletions docs/_includes/pages/en/cr_login.md.liquid
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Container registry authentication

You must log in to the container registry to work with the images. Use the [werf cr login](https://werf.io/documentation/v1.2/reference/cli/werf_cr_login.html) command as follows:
You must log in to the container registry to work with the images. Use the [werf cr login](https://werf.io/documentation/v2/reference/cli/werf_cr_login.html) command as follows:

```shell
werf cr login <registry url>
Expand All @@ -19,4 +19,4 @@ werf cr login -p token registry.example.com
werf cr login --insecure-registry registry.example.com
```

> Note: In supported CI/CD systems, the user gets authenticated to the integrated container registries as part of the [ci-env](https://werf.io/documentation/v1.2/reference/cli/werf_ci_env.html) command — you do not have to use the [werf cr login](https://werf.io/documentation/v1.2/reference/cli/werf_cr_login.html) command in this case.
> Note: In supported CI/CD systems, the user gets authenticated to the integrated container registries as part of the [ci-env](https://werf.io/documentation/v2/reference/cli/werf_ci_env.html) command — you do not have to use the [werf cr login](https://werf.io/documentation/v1.2/reference/cli/werf_cr_login.html) command in this case.
4 changes: 2 additions & 2 deletions docs/_includes/pages/ru/cr_login.md.liquid
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Аутентификация в container registry

Перед работой с образами необходимо аутентифицироваться в container registry. Сделать это можно командой [werf cr login](https://werf.io/documentation/v1.2/reference/cli/werf_cr_login.html):
Перед работой с образами необходимо аутентифицироваться в container registry. Сделать это можно командой [werf cr login](https://werf.io/documentation/v2/reference/cli/werf_cr_login.html):

```shell
werf cr login <registry url>
Expand All @@ -19,4 +19,4 @@ werf cr login -p token registry.example.com
werf cr login --insecure-registry registry.example.com
```

> В случае использования команды [ci-env](https://ru.werf.io/documentation/v1.2/reference/cli/werf_ci_env.html) с поддерживаемыми CI/CD-системами аутентификация во встроенные container registry выполняется в рамках команды, поэтому использование команды [werf cr login](https://werf.io/documentation/v1.2/reference/cli/werf_cr_login.html) в этом случае не требуется.
> В случае использования команды [ci-env](https://ru.werf.io/documentation/v2/reference/cli/werf_ci_env.html) с поддерживаемыми CI/CD-системами аутентификация во встроенные container registry выполняется в рамках команды, поэтому использование команды [werf cr login](https://werf.io/documentation/v1.2/reference/cli/werf_cr_login.html) в этом случае не требуется.
4 changes: 2 additions & 2 deletions docs/pages_en/usage/build/images.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title: Images and dependencies
permalink: usage/build/images.html
---

<!-- reference: https://werf.io/documentation/v1.2/reference/werf_yaml.html#image-section -->
<!-- reference: https://werf.io/documentation/v2/reference/werf_yaml.html#image-section -->

## Adding images

Expand All @@ -29,7 +29,7 @@ Next, for each image in `werf.yaml`, you have to define the build instructions u

### Dockerfile

<!-- reference: https://werf.io/documentation/v1.2/reference/werf_yaml.html#dockerfile-builder -->
<!-- reference: https://werf.io/documentation/v2/reference/werf_yaml.html#dockerfile-builder -->

#### Writing Dockerfile instructions

Expand Down
8 changes: 4 additions & 4 deletions docs/pages_en/usage/build/process.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ permalink: usage/build/process.html

## Tagging images

<!-- reference https://werf.io/documentation/v1.2/internals/stages_and_storage.html#stage-naming -->
<!-- reference https://werf.io/documentation/v2/internals/stages_and_storage.html#stage-naming -->

The tagging of werf images is performed automatically as part of the build process. werf uses an optimal tagging scheme based on the contents of the image, thus preventing unnecessary rebuilds and application wait times during deployment.

Expand Down Expand Up @@ -85,7 +85,7 @@ werf build --repo REPO --add-custom-tag "%image%-latest"
## Layer-by-layer image caching

<!-- reference https://werf.io/documentation/v1.2/internals/stages_and_storage.html#storage -->
<!-- reference https://werf.io/documentation/v2/internals/stages_and_storage.html#storage -->

Layer-by-layer image caching is essential part of the werf build process. werf saves and reuses the build cache in the container registry and synchronizes parallel builders.

Expand Down Expand Up @@ -154,7 +154,7 @@ Stapel images are cached layer-by-layer in the container registry by default and

## Parallelism and image assembly order

<!-- reference: https://werf.io/documentation/v1.2/internals/build_process.html#parallel-build -->
<!-- reference: https://werf.io/documentation/v2/internals/build_process.html#parallel-build -->

All the images described in `werf.yaml` are built in parallel on the same build host. If there are dependencies between the images, the build is split into stages, with each stage containing a set of independent images that can be built in parallel.

Expand Down Expand Up @@ -267,7 +267,7 @@ You can clean up a caching repository by deleting it entirely without any risks.

## Synchronizing builders

<!-- reference https://werf.io/documentation/v1.2/advanced/synchronization.html -->
<!-- reference https://werf.io/documentation/v2/advanced/synchronization.html -->

To ensure consistency among parallel builders and to guarantee the reproducibility of images and intermediate layers, werf handles the synchronization of the builders. By default, the public synchronization service at [https://synchronization.werf.io/](https://synchronization.werf.io/) is used and no extra user interaction is required.

Expand Down
2 changes: 1 addition & 1 deletion docs/pages_en/usage/cleanup/host_cleanup.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ The user can disable automatic cleanup of outdated host data using the `--disabl
```shell
# /etc/cron.d/werf-host-cleanup
SHELL=/bin/bash
*/30 * * * * gitlab-runner source ~/.profile ; source $(trdl use werf 1.2 stable) ; werf host cleanup
*/30 * * * * gitlab-runner source ~/.profile ; source $(trdl use werf 2 stable) ; werf host cleanup
```
2 changes: 1 addition & 1 deletion docs/pages_en/usage/integration_with_ci_cd_systems.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ converge:
fetch-depth: 0

- name: Install werf
uses: werf/actions/install@v1.2
uses: werf/actions/install@v2

- name: Run script
run: |
Expand Down
4 changes: 2 additions & 2 deletions docs/pages_ru/usage/build/images.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title: Образы и зависимости
permalink: usage/build/images.html
---

<!-- прим. для перевода: на основе https://werf.io/documentation/v1.2/reference/werf_yaml.html#image-section -->
<!-- прим. для перевода: на основе https://werf.io/documentation/v2/reference/werf_yaml.html#image-section -->

## Добавление образов

Expand All @@ -29,7 +29,7 @@ image: database

### Dockerfile

<!-- прим. для перевода: на основе https://werf.io/documentation/v1.2/reference/werf_yaml.html#dockerfile-builder -->
<!-- прим. для перевода: на основе https://werf.io/documentation/v2/reference/werf_yaml.html#dockerfile-builder -->

#### Написание Dockerfile-инструкций

Expand Down
6 changes: 3 additions & 3 deletions docs/pages_ru/usage/build/process.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ permalink: usage/build/process.html

## Тегирование образов

<!-- прим. для перевода: на основе https://werf.io/documentation/v1.2/internals/stages_and_storage.html#stage-naming -->
<!-- прим. для перевода: на основе https://werf.io/documentation/v2/internals/stages_and_storage.html#stage-naming -->

Тегирование образов werf выполняется автоматически в рамках сборочного процесса. Используется оптимальная схема тегирования, основанная на содержимом образа, которая предотвращает лишние пересборки и время простоя приложения при выкате.

Expand Down Expand Up @@ -152,7 +152,7 @@ staged: true

## Параллельность и порядок сборки образов

<!-- прим. для перевода: на основе https://werf.io/documentation/v1.2/internals/build_process.html#parallel-build -->
<!-- прим. для перевода: на основе https://werf.io/documentation/v2/internals/build_process.html#parallel-build -->

Все образы, описанные в `werf.yaml`, собираются параллельно на одном сборочном хосте. При наличии зависимостей между образами сборка разбивается на этапы, где каждый этап содержит набор независимых образов и может собираться параллельно.

Expand Down Expand Up @@ -265,7 +265,7 @@ werf build --repo registry.mycompany.org/project --cache-repo localhost:5000/pro

## Синхронизация сборщиков

<!-- прим. для перевода: на основе https://werf.io/documentation/v1.2/advanced/synchronization.html -->
<!-- прим. для перевода: на основе https://werf.io/documentation/v2/advanced/synchronization.html -->

Для обеспечения согласованности в работе параллельных сборщиков, а также гарантии воспроизводимости образов и промежуточных слоёв, werf берёт на себя ответственность за синхронизацию сборщиков. По умолчанию используется публичный сервис синхронизации по адресу [https://synchronization.werf.io/](https://synchronization.werf.io/) и от пользователя ничего дополнительно не требуется.

Expand Down
2 changes: 1 addition & 1 deletion docs/pages_ru/usage/cleanup/host_cleanup.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ permalink: usage/cleanup/host_cleanup.html
```shell
# /etc/cron.d/werf-host-cleanup
SHELL=/bin/bash
*/30 * * * * gitlab-runner source ~/.profile ; source $(trdl use werf 1.2 stable) ; werf host cleanup
*/30 * * * * gitlab-runner source ~/.profile ; source $(trdl use werf 2 stable) ; werf host cleanup
```
2 changes: 1 addition & 1 deletion docs/pages_ru/usage/integration_with_ci_cd_systems.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ converge:
fetch-depth: 0

- name: Install werf
uses: werf/actions/install@v1.2
uses: werf/actions/install@v2

- name: Run script
run: |
Expand Down
6 changes: 3 additions & 3 deletions scripts/werf-in-image/build-and-publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ export WERF_EXPORT_ADD_LABEL_AH1=io.artifacthub.package.readme-url=https://raw.g
WERF_EXPORT_ADD_LABEL_OC3=org.opencontainers.image.created=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
WERF_EXPORT_ADD_LABEL_OC4=org.opencontainers.image.description="Official image to run werf in containers"

werf export --tag "$DEST_SUBREPO/werf:latest" "1.2-stable-alpine"
werf export --tag "$DEST_SUBREPO/werf-argocd-cmp-sidecar:latest" "argocd-cmp-sidecar-1.2-stable-ubuntu"
werf export --tag "$DEST_SUBREPO/werf:latest" "2-stable-alpine"
werf export --tag "$DEST_SUBREPO/werf-argocd-cmp-sidecar:latest" "argocd-cmp-sidecar-2-stable-ubuntu"

for group in "1.2"; do
for group in "2"; do
werf export --tag "$DEST_SUBREPO/werf:$group" "$group-stable-alpine"
werf export --tag "$DEST_SUBREPO/werf-argocd-cmp-sidecar:$group" "argocd-cmp-sidecar-$group-stable-ubuntu"

Expand Down
2 changes: 1 addition & 1 deletion scripts/werf-in-image/werf.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
project: werf-in-image
configVersion: 1
{{- $_ := set $ "Groups" (list "1.2") }}
{{- $_ := set $ "Groups" (list "2") }}
{{- $_ := set $ "Channels" (list "alpha" "beta" "ea" "stable" "rock-solid") }}

---
Expand Down

0 comments on commit 940fefe

Please sign in to comment.