From fcf3361e71f3ba6a183581756f750d17f3af704e Mon Sep 17 00:00:00 2001 From: Smyslov Maxim Date: Thu, 10 Jul 2025 17:15:08 +0300 Subject: [PATCH 1/6] fix Signed-off-by: Smyslov Maxim --- .github/workflows/build_dev.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build_dev.yml b/.github/workflows/build_dev.yml index 1f113c4..d98080d 100644 --- a/.github/workflows/build_dev.yml +++ b/.github/workflows/build_dev.yml @@ -21,6 +21,8 @@ on: push: branches: - main + tags: + - "**" defaults: run: From ea19a4d538f09d10b0d1687c6b9fe119f75d7429 Mon Sep 17 00:00:00 2001 From: Smyslov Maxim Date: Thu, 10 Jul 2025 17:32:42 +0300 Subject: [PATCH 2/6] fix Signed-off-by: Smyslov Maxim --- .github/workflows/build_dev.yml | 2 -- .github/workflows/deploy_dev.yml | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_dev.yml b/.github/workflows/build_dev.yml index d98080d..1f113c4 100644 --- a/.github/workflows/build_dev.yml +++ b/.github/workflows/build_dev.yml @@ -21,8 +21,6 @@ on: push: branches: - main - tags: - - "**" defaults: run: diff --git a/.github/workflows/deploy_dev.yml b/.github/workflows/deploy_dev.yml index db9f925..f85bfdc 100644 --- a/.github/workflows/deploy_dev.yml +++ b/.github/workflows/deploy_dev.yml @@ -12,6 +12,7 @@ env: GOLANG_VERSION: ${{ vars.GOLANG_VERSION }} GOPROXY: ${{ secrets.GOPROXY }} SOURCE_REPO: ${{ secrets.SOURCE_REPO }} + BASE_IMAGES_VERSION: "v0.5.8" on: workflow_dispatch: @@ -57,6 +58,10 @@ jobs: shell: bash - uses: actions/checkout@v4 + - name: Download base images and auth prepare + run: | + wget https://fox.flant.com/api/v4/projects/deckhouse%2Fbase-images/packages/generic/base_images/$BASE_IMAGES_VERSION/base_images.yml -O base_images.yml + cat base_images.yml - uses: deckhouse/modules-actions/setup@v2 with: registry: ${{ vars.DEV_REGISTRY }} From b647182bc7c7ea5e93e0444e28f7ea4eb19a48d8 Mon Sep 17 00:00:00 2001 From: Smyslov Maxim Date: Thu, 10 Jul 2025 17:48:48 +0300 Subject: [PATCH 3/6] fix Signed-off-by: Smyslov Maxim --- .github/workflows/deploy_dev.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/deploy_dev.yml b/.github/workflows/deploy_dev.yml index f85bfdc..70d2c29 100644 --- a/.github/workflows/deploy_dev.yml +++ b/.github/workflows/deploy_dev.yml @@ -76,3 +76,8 @@ jobs: source_repo: ${{ secrets.SOURCE_REPO }} source_repo_ssh_key: ${{ secrets.SOURCE_REPO_SSH_KEY }} - uses: deckhouse/modules-actions/deploy@v2 + with: + module_source: "${{ vars.DEV_MODULE_SOURCE }}" + module_name: ${{ vars.MODULE_NAME }} + module_tag: ${{ github.event.inputs.tag }} + release_channel: ${{inputs.channel}} \ No newline at end of file From 7de46d9df316de2c4f8bb1f6f0b9c5d9a9912bff Mon Sep 17 00:00:00 2001 From: Smyslov Maxim Date: Fri, 11 Jul 2025 11:00:38 +0300 Subject: [PATCH 4/6] deploy dev channels division Signed-off-by: Smyslov Maxim --- .github/workflows/deploy_dev.yml | 67 +++++++++++++++++++++++++------- 1 file changed, 53 insertions(+), 14 deletions(-) diff --git a/.github/workflows/deploy_dev.yml b/.github/workflows/deploy_dev.yml index 70d2c29..d11555b 100644 --- a/.github/workflows/deploy_dev.yml +++ b/.github/workflows/deploy_dev.yml @@ -7,26 +7,30 @@ env: MODULES_MODULE_SOURCE: ${{ vars.DEV_MODULE_SOURCE }} MODULES_REGISTRY_LOGIN: ${{ vars.DEV_MODULES_REGISTRY_LOGIN }} MODULES_REGISTRY_PASSWORD: ${{ secrets.DEV_MODULES_REGISTRY_PASSWORD }} - RELEASE_CHANNEL: ${{ github.event.inputs.channel }} MODULES_MODULE_TAG: ${{ github.event.inputs.tag }} GOLANG_VERSION: ${{ vars.GOLANG_VERSION }} GOPROXY: ${{ secrets.GOPROXY }} SOURCE_REPO: ${{ secrets.SOURCE_REPO }} - BASE_IMAGES_VERSION: "v0.5.8" + BASE_IMAGES_VERSION: ${{ vars.BASE_IMAGES_VERSION }} on: workflow_dispatch: inputs: - channel: - description: "Select release channel" - type: choice - default: alpha - options: - - "alpha" - - "beta" - - "early-access" - - "stable" - - "rock-solid" + alpha: + type: boolean + description: Alpha + beta: + type: boolean + description: Beta + early-access: + type: boolean + description: Early-access + stable: + type: boolean + description: Stable + rock-solid: + type: boolean + description: Rock-solid tag: description: "The module's tag, which must include the -dev1 postfix. For example: v1.21.1-dev1" @@ -38,6 +42,7 @@ on: default: true description: "Set to true if build is required" + jobs: deploy-dev: runs-on: [self-hosted, large] @@ -75,9 +80,43 @@ jobs: module_tag: ${{ github.event.inputs.tag }} source_repo: ${{ secrets.SOURCE_REPO }} source_repo_ssh_key: ${{ secrets.SOURCE_REPO_SSH_KEY }} - - uses: deckhouse/modules-actions/deploy@v2 + - name: deploy Alpha + if: github.event.inputs.alpha == 'true' + uses: deckhouse/modules-actions/deploy@v2 + with: + module_source: "${{ vars.DEV_MODULE_SOURCE }}" + module_name: ${{ vars.MODULE_NAME }} + module_tag: ${{ github.event.inputs.tag }} + release_channel: "alpha" + - name: deploy Beta + if: github.event.inputs.beta == 'true' + uses: deckhouse/modules-actions/deploy@v2 + with: + module_source: "${{ vars.DEV_MODULE_SOURCE }}" + module_name: ${{ vars.MODULE_NAME }} + module_tag: ${{ github.event.inputs.tag }} + release_channel: "beta" + - name: deploy Early-access + if: github.event.inputs.early-access == 'true' + uses: deckhouse/modules-actions/deploy@v2 + with: + module_source: "${{ vars.DEV_MODULE_SOURCE }}" + module_name: ${{ vars.MODULE_NAME }} + module_tag: ${{ github.event.inputs.tag }} + release_channel: "early-access" + - name: deploy Stable + if: github.event.inputs.stable == 'true' + uses: deckhouse/modules-actions/deploy@v2 + with: + module_source: "${{ vars.DEV_MODULE_SOURCE }}" + module_name: ${{ vars.MODULE_NAME }} + module_tag: ${{ github.event.inputs.tag }} + release_channel: "stable" + - name: deploy Rock-solid + if: github.event.inputs.rock-solid == 'true' + uses: deckhouse/modules-actions/deploy@v2 with: module_source: "${{ vars.DEV_MODULE_SOURCE }}" module_name: ${{ vars.MODULE_NAME }} module_tag: ${{ github.event.inputs.tag }} - release_channel: ${{inputs.channel}} \ No newline at end of file + release_channel: "rock-solid" \ No newline at end of file From 4a90dab3c1894bfd43768f9b09d5981b4a1764a3 Mon Sep 17 00:00:00 2001 From: Smyslov Maxim Date: Fri, 11 Jul 2025 12:10:15 +0300 Subject: [PATCH 5/6] add BE job to deploy_prod Signed-off-by: Smyslov Maxim --- .github/workflows/deploy_prod.yml | 32 +++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/.github/workflows/deploy_prod.yml b/.github/workflows/deploy_prod.yml index cc9d83e..c763170 100644 --- a/.github/workflows/deploy_prod.yml +++ b/.github/workflows/deploy_prod.yml @@ -28,6 +28,9 @@ on: ce: type: boolean description: CE + be: + type: boolean + description: BE (GutHub variable "ALLOW_BE" should be "true") ee: type: boolean description: EE @@ -90,6 +93,35 @@ jobs: module_tag: ${{ github.event.inputs.tag }} release_channel: ${{ github.event.inputs.channel }} + job-BE: + name: Edition BE + runs-on: [self-hosted, large] + if: github.event.inputs.be == 'true' && vars.ALLOW_BE == 'true' + steps: + - run: echo "BE" + - name: SET VAR + run: | + echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/be/modules" >> "$GITHUB_ENV" + - name: ECHO VAR + run: | + echo $MODULES_MODULE_SOURCE + - uses: actions/checkout@v4 + - uses: deckhouse/modules-actions/setup@v2 + with: + registry: ${{ vars.PROD_REGISTRY }} + registry_login: ${{ vars.PROD_MODULES_REGISTRY_LOGIN }} + registry_password: ${{ secrets.PROD_MODULES_REGISTRY_PASSWORD }} + - name: Check previous release + run: | + chmod +x .github/check_previous_channel_release.sh + .github/check_previous_channel_release.sh $MODULES_MODULE_NAME be $RELEASE_CHANNEL $MODULES_MODULE_TAG license-token $MODULES_READ_REGISTRY_PASSWORD + - uses: deckhouse/modules-actions/deploy@v2 + with: + module_source: "${{ vars.PROD_REGISTRY }}/${{ vars.PROD_MODULE_SOURCE_NAME }}/be/modules" + module_name: ${{ vars.MODULE_NAME }} + module_tag: ${{ github.event.inputs.tag }} + release_channel: ${{ github.event.inputs.channel }} + job-EE: name: Edition EE runs-on: [self-hosted, large] From d0c62ffa4ebcbfa451353e6c91482f7c88bbb665 Mon Sep 17 00:00:00 2001 From: Smyslov Maxim Date: Fri, 11 Jul 2025 13:12:16 +0300 Subject: [PATCH 6/6] add environment to deploy_prod Signed-off-by: Smyslov Maxim --- .github/workflows/deploy_prod.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/deploy_prod.yml b/.github/workflows/deploy_prod.yml index c763170..61c60f4 100644 --- a/.github/workflows/deploy_prod.yml +++ b/.github/workflows/deploy_prod.yml @@ -67,6 +67,7 @@ jobs: job-CE: name: Edition CE runs-on: [self-hosted, large] + environment: ${{github.event.inputs.channel}} if: github.event.inputs.ce == 'true' steps: - run: echo "CE" @@ -96,6 +97,7 @@ jobs: job-BE: name: Edition BE runs-on: [self-hosted, large] + environment: ${{github.event.inputs.channel}} if: github.event.inputs.be == 'true' && vars.ALLOW_BE == 'true' steps: - run: echo "BE" @@ -125,6 +127,7 @@ jobs: job-EE: name: Edition EE runs-on: [self-hosted, large] + environment: ${{github.event.inputs.channel}} if: github.event.inputs.ee == 'true' steps: - run: echo "EE" @@ -154,6 +157,7 @@ jobs: job-FE: name: Edition FE runs-on: [self-hosted, large] + environment: ${{github.event.inputs.channel}} if: github.event.inputs.fe == 'true' steps: - run: echo "FE" @@ -183,6 +187,7 @@ jobs: job-SE: name: Edition SE runs-on: [self-hosted, large] + environment: ${{github.event.inputs.channel}} if: github.event.inputs.se == 'true' steps: - run: echo "SE" @@ -212,6 +217,7 @@ jobs: job-SE-plus: name: Edition SE+ runs-on: [self-hosted, large] + environment: ${{github.event.inputs.channel}} if: github.event.inputs.se-plus == 'true' steps: - run: echo "SE+"