Move LLVS to EE (#126)

Signed-off-by: Aleksandr Stefurishin <aleksandr.stefurishin@flant.com> Signed-off-by: v.oleynikov <vasily.oleynikov@flant.com> Signed-off-by: Pavel Karpov <pavel.karpov@flant.com> Signed-off-by: Aleksandr Zimin <alexandr.zimin@flant.com> Co-authored-by: Vasily Oleynikov <vasily.oleynikov@flant.com> Co-authored-by: Pavel Karpov <pavel.karpov@flant.com> Co-authored-by: Nikolay Demchuk <nikolay.demchuk@flant.com> Co-authored-by: Aleksandr Zimin <alexandr.zimin@flant.com>
deckhouse · Feb 18, 2025 · 48ca0f5 · 48ca0f5
1 parent 37fad98
commit 48ca0f5
Show file tree

Hide file tree

Showing 51 changed files with 1,172 additions and 279 deletions.
diff --git a/.github/workflows/build_dev.yml b/.github/workflows/build_dev.yml
@@ -6,45 +6,80 @@ env:
   MODULES_MODULE_NAME: ${{ vars.MODULE_NAME }}
   MODULES_MODULE_SOURCE: ${{ vars.DEV_MODULE_SOURCE }}
   MODULES_REGISTRY_LOGIN: ${{ vars.DEV_MODULES_REGISTRY_LOGIN }}
+  DEFAULT_EDITION: ${{ vars.DEFAULT_EDITION }}
   MODULES_REGISTRY_PASSWORD: ${{ secrets.DEV_MODULES_REGISTRY_PASSWORD }}
   SOURCE_REPO: "${{ secrets.SOURCE_REPO }}"
 
-
-
 on:
-  #pull_request:
+  pull_request:
+    types: [opened, reopened, labeled, unlabeled, synchronize]
+  # call from trivy_image_check.yaml, which in turn call from pull_request
+  # https://stackoverflow.com/a/71489231
+  workflow_call:
   push:
     branches:
       - main
-  # make this job as dependency for trivy_image_check workflow
-  # https://stackoverflow.com/a/71489231
-  workflow_call:
 
+defaults:
+  run:
+    shell: bash
 
 jobs:
+  set_edition:
+    runs-on: [self-hosted, regular, selectel]
+    name: Set edition
+    outputs:
+      module_edition: ${{ steps.set-vars.outputs.MODULE_EDITION }}
+    steps:
+      - name: Get Pull Request Labels
+        id: get-labels
+        uses: actions/github-script@v7
+        with:
+          script: |
+            if (context.eventName === "pull_request" || context.eventName === "pull_request_target" ) {
+              const prNumber = context.payload.pull_request.number;
+              const { data: labels } = await github.rest.issues.listLabelsOnIssue({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: prNumber,
+              });
+              return labels.map(label => label.name);
+            } else {
+              return [];
+            }
+          result-encoding: string
+
+      - name: Set vars
+        id: set-vars
+        run: |
+          MODULE_EDITION=$DEFAULT_EDITION
+          EDITION=$(echo "${{ steps.get-labels.outputs.result }}" | grep -Po "edition/\K\w+" | head -n 1 || true)
+          [[ -n $EDITION ]] && MODULE_EDITION=$EDITION
+          echo "MODULE_EDITION=$MODULE_EDITION" >> "$GITHUB_OUTPUT"
   dev_setup_build:
     runs-on: [self-hosted, regular, selectel]
     name: Build and Push images
+    needs: [set_edition]
+    env:
+      MODULE_EDITION: ${{needs.set_edition.outputs.module_edition}}
     steps:
       - name: Set vars for PR
         if: ${{ github.ref_name != 'main' }}
         run: |
           MODULES_MODULE_TAG="$(echo pr${{ github.ref_name }} | sed 's/\/.*//g')"
           echo "MODULES_MODULE_TAG=$MODULES_MODULE_TAG" >> "$GITHUB_ENV"
-        shell: bash
       - name: Set vars for main
         if: ${{ github.ref_name == 'main' }}
         run: |
           echo "MODULES_MODULE_TAG=${{ github.ref_name }}" >> "$GITHUB_ENV"
-        shell: bash
       - name: Print vars
         run: |
           echo MODULES_REGISTRY=$MODULES_REGISTRY
           echo CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME
           echo MODULES_MODULE_NAME=$MODULES_MODULE_NAME
           echo MODULES_MODULE_SOURCE=$MODULES_MODULE_SOURCE
           echo MODULES_MODULE_TAG=$MODULES_MODULE_TAG
-        shell: bash
+          echo MODULE_EDITION=$MODULE_EDITION
 
       - uses: actions/checkout@v4
       - uses: deckhouse/modules-actions/setup@v1

diff --git a/.github/workflows/build_prod.yml b/.github/workflows/build_prod.yml
@@ -15,6 +15,10 @@ on:
     tags:
       - '**'
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   prod_ce_setup_build:
     runs-on: [self-hosted, regular, selectel]
@@ -23,12 +27,13 @@ jobs:
       - name: SET VAR
         run: |
           echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/ce/modules" >> "$GITHUB_ENV"
+          echo "MODULE_EDITION=ce" >> "$GITHUB_ENV"
       - run: |
           echo $MODULES_REGISTRY
           echo $MODULES_MODULE_NAME
           echo $MODULES_MODULE_SOURCE
           echo $MODULES_MODULE_TAG
-        shell: bash
+          echo $MODULE_EDITION
         name: Show vars
 
       - uses: actions/checkout@v4
@@ -56,12 +61,13 @@ jobs:
       - name: SET VAR
         run: |
           echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/ee/modules" >> "$GITHUB_ENV"
+          echo "MODULE_EDITION=ee" >> "$GITHUB_ENV"
       - run: |
           echo $MODULES_REGISTRY
           echo $MODULES_MODULE_NAME
           echo $MODULES_MODULE_SOURCE
           echo $MODULES_MODULE_TAG
-        shell: bash
+          echo $MODULE_EDITION
         name: Show vars
 
       - uses: actions/checkout@v4
@@ -89,12 +95,13 @@ jobs:
       - name: SET VAR
         run: |
           echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/fe/modules" >> "$GITHUB_ENV"
+          echo "MODULE_EDITION=ee" >> "$GITHUB_ENV"
       - run: |
           echo $MODULES_REGISTRY
           echo $MODULES_MODULE_NAME
           echo $MODULES_MODULE_SOURCE
           echo $MODULES_MODULE_TAG
-        shell: bash
+          echo $MODULE_EDITION
         name: Show vars
 
       - uses: actions/checkout@v4
@@ -122,12 +129,13 @@ jobs:
       - name: SET VAR
         run: |
           echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/se/modules" >> "$GITHUB_ENV"
+          echo "MODULE_EDITION=se" >> "$GITHUB_ENV"
       - run: |
           echo $MODULES_REGISTRY
           echo $MODULES_MODULE_NAME
           echo $MODULES_MODULE_SOURCE
           echo $MODULES_MODULE_TAG
-        shell: bash
+          echo $MODULE_EDITION
         name: Show vars
 
       - uses: actions/checkout@v4
@@ -155,12 +163,13 @@ jobs:
       - name: SET VAR
         run: |
           echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/se-plus/modules" >> "$GITHUB_ENV"
+          echo "MODULE_EDITION=seplus" >> "$GITHUB_ENV"
       - run: |
           echo $MODULES_REGISTRY
           echo $MODULES_MODULE_NAME
           echo $MODULES_MODULE_SOURCE
           echo $MODULES_MODULE_TAG
-        shell: bash
+          echo $MODULE_EDITION
         name: Show vars
 
       - uses: actions/checkout@v4

diff --git a/.github/workflows/go_lint.yaml b/.github/workflows/go_lint.yaml
@@ -1,5 +1,8 @@
 name: Go linter for images
 
+env:
+  GO_BUILD_TAGS: "ce se seplus ee csepro"
+
 on:
   pull_request:
   push:
@@ -18,26 +21,27 @@ jobs:
       - name: Setup Go environment
         uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23.5'
 
       - name: Install golangci-lint
-        run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.59.1
+        run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.61.0
 
       - name: Run Go lint
         run: |
           basedir=$(pwd)
           failed='false'
-          for dir in $(find images -type d); do
-            if ls $dir/go.mod &> /dev/null; then
-              echo "Running linter in $dir"
-              cd $dir
-              golangci-lint run
+          for i in $(find images -type f -name go.mod);do
+            dir=$(echo $i | sed 's/go.mod$//')
+            cd $basedir/$dir
+            # check all editions
+            for edition in $GO_BUILD_TAGS ;do
+              echo "Running linter in $dir (edition: $edition)"
+              golangci-lint run --build-tags $edition
               if [ $? -ne 0 ]; then
-                echo "Linter failed in $dir"
+                echo "Linter failed in $dir (edition: $edition)"
                 failed='true'
               fi
-            cd $basedir
-            fi
+            done
           done
           if [ $failed == 'true' ]; then
             exit 1

diff --git a/.github/workflows/go_modules_check.yaml b/.github/workflows/go_modules_check.yaml
@@ -18,7 +18,7 @@ jobs:
       - name: Setup Go environment
         uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23.5'
 
       - name: Run Go modules version check
         run: |
@@ -44,8 +44,14 @@ jobs:
             if [[ "$line" == *github.com/deckhouse/sds-* || "$line" == *github.com/deckhouse/csi-* || "$line" == *github.com/deckhouse/virtualization ]]; then
               repository=$(echo "$line" | awk '{print $1}' | awk -F'/' '{ print "https://"$1"/"$2"/"$3".git" }')
               pseudo_tag=$(echo "$line" | awk '{print $2}')
+              
+              go_pkg=$(echo "$line" | awk '{print $1}')
+              if grep -q "^replace $go_pkg" $go_mod_file ;then
+                echo "Skipping $go_pkg check because it exists in replacement"
+                continue
+              fi
+              
               echo "Cloning repo $repository into $temp_dir"
-          
               git clone "$repository" "$temp_dir/$repository" >/dev/null 2>&1
           
               if [ -d "$temp_dir/$repository/api" ]; then
@@ -79,4 +85,4 @@ jobs:
           if [ $alert_lines_count != 0 ]; then
             echo "We have non-actual pseudo-tags in repository's go.mod files"
             exit 1
-          fi
+          fi
diff --git a/.github/workflows/go_tests.yaml b/.github/workflows/go_tests.yaml
@@ -1,5 +1,8 @@
 name: Go tests for images
 
+env:
+  GO_BUILD_TAGS: "ce se seplus ee csepro"
+
 on:
   pull_request:
   push:
@@ -18,23 +21,24 @@ jobs:
       - name: Setup Go environment
         uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23.5'
 
       - name: Run Go tests
         run: |
           basedir=$(pwd)
           failed='false'
-          for dir in $(find images -type d); do
-            if ls $dir/*_test.go &> /dev/null; then
-              echo "Running tests in $dir"
-              cd $dir
-              go test -v
+          for i in $(find images -type f -name '*_test.go');do
+            dir=$(echo $i | sed 's/[a-z_A-Z0-9-]*_test.go$//')
+            cd $basedir/$dir
+            # check all editions
+            for edition in $GO_BUILD_TAGS ;do
+              echo "Running tests in $dir (edition: $edition)"
+              go test -v -tags $edition
               if [ $? -ne 0 ]; then
-                echo "Tests failed in $dir"
+                echo "Tests failed in $dir (edition: $edition)"
                 failed='true'
               fi
-            cd $basedir
-            fi
+            done
           done
           if [ $failed == 'true' ]; then
             exit 1

diff --git a/.github/workflows/trivy_check.yaml b/.github/workflows/trivy_check.yaml
@@ -45,12 +45,12 @@ jobs:
 
       - name: Prepare sub repo
         run: |
-          version=v`grep "UTIL_LINUX_VERSION :=" images/agent/werf.inc.yaml | awk -F'"' '{ print $2}'`
+          version=`grep '"UTIL_LINUX"' .werf/consts.yaml | awk -F'"' '{ print $4}'`
           git clone --depth 1 --branch $version ${{ secrets.SOURCE_REPO }}/util-linux/util-linux.git ./util-linux
           git clone ${{ secrets.SOURCE_REPO }}/lvmteam/lvm2.git ./lvm2
-          version=`grep "LVM2_VERSION :=" images/sds-utils-installer/werf.inc.yaml | awk -F'"' '{ print $2}'`
+          version=`grep '"LVM2"' .werf/consts.yaml | awk -F'"' '{ print $4}'`
           cd ./lvm2
-          git checkout $version 
+          git checkout $version
           cd ..
 
       - name: Run Trivy vulnerability scanner in fs mode

diff --git a/.gitignore b/.gitignore
@@ -29,6 +29,8 @@
 .idea/
 venv/
 *.code-workspace
+.vscode
+*.code-workspace
 
 # macOS Finder files
 *.DS_Store

diff --git a/.golangci.yaml b/.golangci.yaml
@@ -17,8 +17,7 @@ linters-settings:
       - prefix(agent)
       - prefix(sds-health-watcher-controller)
       - prefix(sds-utils-installer)
-  errcheck:
-    ignore: fmt:.*,[rR]ead|[wW]rite|[cC]lose,io:Copy
+      - prefix(webhooks)
 
 linters:
   disable-all: true

diff --git a/.werf/consts.yaml b/.werf/consts.yaml
@@ -1,11 +1,20 @@
 # base images
 {{- $_ := set $ "BASE_ALT"         "registry.deckhouse.io/base_images/alt:p10@sha256:f105773c682498700680d7cd61a702a4315c4235aee3622757591fd510fb8b4a" }}
 {{- $_ := set $ "BASE_ALT_P11"     "registry.deckhouse.io/base_images/alt:p11@sha256:e47d84424485d3674240cb2f67d3a1801b37d327e6d1eb8cc8d01be8ed3b34f3" }}
-{{- $_ := set $ "BASE_GOLANG_1_23" "registry.deckhouse.io/base_images/golang:1.23.1-alpine3.20@sha256:716820a183116e643839611ff9eca9bd1c92d2bf8f7a5eda2f9fd16e8acbaa72" }}
+{{- $_ := set $ "BASE_GOLANG_1_23" "registry.deckhouse.io/base_images/golang:1.23.5-alpine3.20@sha256:623ef3f63012bbd648021a2f097de3f411889332ba83bd98f0ac8d1288bdaa06" }}
 {{- $_ := set $ "BASE_SCRATCH"     "registry.deckhouse.io/base_images/scratch@sha256:653ae76965c98c8cd1c8c9ff7725316d2983986f896655b30e0f44d2f8b2dd7e" }}
 {{- $_ := set $ "BASE_ALPINE"      "registry.deckhouse.io/base_images/alpine:3.20.3@sha256:41628df7c9b935d248f64542634e7a843f9bc7f2252d7f878e77f7b79a947466" }}
 
+# Edition module settings, default ce
+{{- $_ := set . "MODULE_EDITION" (env "MODULE_EDITION" "ce") }}
+
 # component versions
 {{- $versions := dict }}
+{{- $_ := set $versions "UTIL_LINUX" "v2.39.3" }}
+{{- $_ := set $versions "LVM2" "d786a8f820d54ce87a919e6af5426c333c173b11" }}
 
 {{- $_ := set $ "VERSIONS" $versions }}
+
+# custom constants
+{{- $_ := set $ "DECKHOUSE_UID_GID" "64535" }}
+{{- $_ := set $ "ALT_CLEANUP_CMD" "rm -rf /var/lib/apt/lists/* /var/cache/apt/* && mkdir -p /var/lib/apt/lists/partial /var/cache/apt/archives/partial" }}
diff --git a/api/go.mod b/api/go.mod
@@ -1,6 +1,6 @@
 module github.com/deckhouse/sds-node-configurator/api
 
-go 1.22.2
+go 1.22.3
 
 require k8s.io/apimachinery v0.31.3
 

diff --git a/api/v1alpha1/const.go b/api/v1alpha1/const.go
@@ -0,0 +1,29 @@
+/*
+Copyright 2025 Flant JSC
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+const (
+	PhaseCreated     = "Created"
+	PhasePending     = "Pending"
+	PhaseResizing    = "Resizing"
+	PhaseFailed      = "Failed"
+	PhaseNotReady    = "NotReady"
+	PhaseReady       = "Ready"
+	PhaseTerminating = "Terminating"
+
+	LLVSNameTag = "storage.deckhouse.io/lvmLogicalVolumeSnapshotName"
+)