From 102007714bfb94e4cc8db5bf6a2901856d894bdb Mon Sep 17 00:00:00 2001 From: Nikita Korolev Date: Wed, 10 Jun 2026 20:02:38 +0300 Subject: [PATCH 1/2] chore(ci): use ru registry for release checks Signed-off-by: Nikita Korolev --- .github/workflows/release_module_release-channels.yml | 6 ++++++ tools/moduleversions/Taskfile.dist.yaml | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release_module_release-channels.yml b/.github/workflows/release_module_release-channels.yml index dd131e57f0..4ee0e5b02b 100644 --- a/.github/workflows/release_module_release-channels.yml +++ b/.github/workflows/release_module_release-channels.yml @@ -448,6 +448,12 @@ jobs: registry_login: ${{ secrets.PROD_READ_REGISTRY_USER }} registry_password: ${{ secrets.PROD_READ_REGISTRY_PASSWORD }} + - name: Log in to private registry + id: registry-login + uses: ./.github/actions/registry-login + with: + docker_cfg: ${{ secrets.PROD_RU_REGISTRY_DOCKER_CFG }} + - uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/tools/moduleversions/Taskfile.dist.yaml b/tools/moduleversions/Taskfile.dist.yaml index 53b524cacd..d92139c620 100644 --- a/tools/moduleversions/Taskfile.dist.yaml +++ b/tools/moduleversions/Taskfile.dist.yaml @@ -2,6 +2,7 @@ version: "3" vars: PROD_REGISTRY: registry.deckhouse.io/deckhouse + PROD_REGISTRY_RU: registry.deckhouse.ru/deckhouse CHANNEL: '{{ .CHANNEL | default "alpha" }}' VERSION: "{{ .VERSION }}" @@ -45,7 +46,7 @@ tasks: cmds: - | if [[ -z "{{ .VERSION }}" ]] || [[ -z "{{ .CHANNEL }}" ]]; then - echo "TAG and CHANNEL are required" + echo "VERSION (tag) and CHANNEL are required" exit 1 fi @@ -56,7 +57,7 @@ tasks: check_editions_version() { local editions=("ee" "fe" "ce" "se-plus") - local prod_registry="registry.deckhouse.io/deckhouse" + local prod_registry={{ .PROD_REGISTRY_RU }} local channel=$1 local version=$2 From c276ca2fc3cde2b68dc596b57f52e07167b3154f Mon Sep 17 00:00:00 2001 From: Nikita Korolev Date: Wed, 10 Jun 2026 20:30:01 +0300 Subject: [PATCH 2/2] fix Signed-off-by: Nikita Korolev --- .github/workflows/release_module_release-channels.yml | 7 ------- tools/moduleversions/Taskfile.dist.yaml | 5 ++--- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release_module_release-channels.yml b/.github/workflows/release_module_release-channels.yml index 4ee0e5b02b..fa92f90c54 100644 --- a/.github/workflows/release_module_release-channels.yml +++ b/.github/workflows/release_module_release-channels.yml @@ -441,13 +441,6 @@ jobs: with: go-version: "${{ env.GO_VERSION }}" - - name: Login to PROD_REGISTRY - uses: deckhouse/modules-actions/setup@v2 - with: - registry: ${{ vars.PROD_READ_REGISTRY }} - registry_login: ${{ secrets.PROD_READ_REGISTRY_USER }} - registry_password: ${{ secrets.PROD_READ_REGISTRY_PASSWORD }} - - name: Log in to private registry id: registry-login uses: ./.github/actions/registry-login diff --git a/tools/moduleversions/Taskfile.dist.yaml b/tools/moduleversions/Taskfile.dist.yaml index d92139c620..fb6620c5a1 100644 --- a/tools/moduleversions/Taskfile.dist.yaml +++ b/tools/moduleversions/Taskfile.dist.yaml @@ -1,8 +1,7 @@ version: "3" vars: - PROD_REGISTRY: registry.deckhouse.io/deckhouse - PROD_REGISTRY_RU: registry.deckhouse.ru/deckhouse + PROD_REGISTRY: registry.deckhouse.ru/deckhouse CHANNEL: '{{ .CHANNEL | default "alpha" }}' VERSION: "{{ .VERSION }}" @@ -57,7 +56,7 @@ tasks: check_editions_version() { local editions=("ee" "fe" "ce" "se-plus") - local prod_registry={{ .PROD_REGISTRY_RU }} + local prod_registry={{ .PROD_REGISTRY }} local channel=$1 local version=$2