separate sds-configurator deploy scripts

Signed-off-by: Nikita Korolev <nikita.korolev@flant.com>

Author: universal-itengineer

.github/workflows/e2e-reusable-pipeline.yml

@@ -658,6 +658,7 @@ jobs:
 
           d8_queue
 
+          kubectl apply -f ../sds-node-configurator/mc.yaml
           kubectl apply -f mc.yaml
           echo "[INFO] Wait for sds-node-configurator"
           kubectl wait --for=jsonpath='{.status.phase}'=Ready modules sds-node-configurator --timeout=300s
@@ -672,8 +673,8 @@ jobs:
           echo "[INFO] Wait pods and webhooks sds-replicated pods"
           sds_pods_ready
 
-          chmod +x lvg-gen.sh
-          ./lvg-gen.sh
+          chmod +x ../sds-node-configurator/lvg-gen.sh
+          ../sds-node-configurator/lvg-gen.sh
 
           chmod +x rsc-gen.sh
           ./rsc-gen.sh

.github/workflows/e2e-test-releases-reusable-pipeline.yml

@@ -644,20 +644,9 @@ jobs:
             exit 1
           }
 
-          lvg_ready() {
-            echo "[INFO] Wait for generated LVMVolumeGroup resources to be Ready"
-            if ! kubectl wait -f sds-lvg.yaml --for=jsonpath='{.status.phase}'=Ready --timeout=300s; then
-              echo "[ERROR] Generated LVMVolumeGroup resources did not become Ready"
-              kubectl get lvmvolumegroup -o wide || true
-              exit 1
-            fi
-
-            echo "[SUCCESS] Generated LVMVolumeGroup resources are Ready"
-            kubectl get lvmvolumegroup -o wide
-          }
-
           d8_queue
 
+          kubectl apply -f ../sds-node-configurator/mc.yaml
           kubectl apply -f mc.yaml
           echo "[INFO] Wait for sds-node-configurator"
           kubectl wait --for=jsonpath='{.status.phase}'=Ready modules sds-node-configurator --timeout=300s
@@ -672,9 +661,8 @@ jobs:
           echo "[INFO] Wait pods and webhooks sds-replicated pods"
           sds_pods_ready
 
-          chmod +x lvg-gen.sh
-          ./lvg-gen.sh
-          lvg_ready
+          chmod +x ../sds-node-configurator/lvg-gen.sh
+          ../sds-node-configurator/lvg-gen.sh
 
           chmod +x rsc-gen.sh
           ./rsc-gen.sh

test/dvp-static-cluster/storage/sds-local-volume/lsc-gen.sh

@@ -17,7 +17,7 @@
 set -euo pipefail
 
 script_dir=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)
-lvg_generator_script="${script_dir}/../sds-replicated/lvg-gen.sh"
+lvg_generator_script="${script_dir}/../sds-node-configurator/lvg-gen.sh"
 manifest=sds-local-lsc.yaml
 localStorageClassName=nested-local-thin
 targetThinPoolName=thin-data
@@ -44,11 +44,6 @@ if [[ -z "${lvgs}" ]]; then
 
   "${lvg_generator_script}"
 
-  if [[ -f "sds-lvg.yaml" ]]; then
-    echo "[INFO] Wait for generated LVMVolumeGroup resources to become Ready"
-    kubectl wait -f "sds-lvg.yaml" --for=jsonpath='{.status.phase}'=Ready --timeout=300s
-  fi
-
   lvgs=$(discover_lvgs)
 fi
 

…luster/storage/sds-replicated/lvg-gen.sh …storage/sds-node-configurator/lvg-gen.shtest/dvp-static-cluster/storage/sds-replicated/lvg-gen.sh renamed to test/dvp-static-cluster/storage/sds-node-configurator/lvg-gen.sh test/dvp-static-cluster/storage/sds-replicated/lvg-gen.sh renamed to test/dvp-static-cluster/storage/sds-node-configurator/lvg-gen.sh

@@ -14,12 +14,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-manifest=sds-lvg.yaml
+set -euo pipefail
+
+script_dir=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)
+manifest="${script_dir}/sds-lvg.yaml"
 LVMVG_SIZE=45Gi
 
 devs=$(kubectl get blockdevices.storage.deckhouse.io -o json | jq '.items[] | {name: .metadata.name, node: .status.nodeName, dev_path: .status.path}' -rc)
 
-rm -rf "${manifest}"
+rm -f "${manifest}"
 
 echo detected block devices: "$devs"
 
@@ -55,3 +58,9 @@ EOF
 done
 
 kubectl apply -f "${manifest}"
+
+echo "[INFO] Wait for generated LVMVolumeGroup resources to become Ready"
+kubectl wait -f "${manifest}" --for=jsonpath='{.status.phase}'=Ready --timeout=300s
+
+echo "[SUCCESS] Generated LVMVolumeGroup resources are Ready"
+kubectl get lvmvolumegroup -o wide

test/dvp-static-cluster/storage/sds-node-configurator/mc.yaml

@@ -0,0 +1,8 @@
+---
+apiVersion: deckhouse.io/v1alpha1
+kind: ModuleConfig
+metadata:
+  name: sds-node-configurator
+spec:
+  version: 1
+  enabled: true

test/dvp-static-cluster/storage/sds-replicated/mc.yaml

@@ -1,12 +1,3 @@
----
-apiVersion: deckhouse.io/v1alpha1
-kind: ModuleConfig
-metadata:
-  name: sds-node-configurator
-spec:
-  version: 1
-  enabled: true
----
 apiVersion: deckhouse.io/v1alpha1
 kind: ModuleConfig
 metadata: