chore(bors): merge pull request #585

585: Csi Node Stage URI fix r=tiagolobocastro a=tiagolobocastro fix(csi/node): add rest client to csi node Also adds helm var to configure it (if ever needed). Signed-off-by: Tiago Castro <[email protected]> Co-authored-by: Tiago Castro <[email protected]>
openebs · Dec 11, 2024 · 551771f · 551771f
2 parents b7dd0fb + 9a82872
commit 551771f
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 11 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -13,14 +13,14 @@ repos:
     -   id: rust-lint
         name: Rust lint
         description: Run cargo clippy on files included in the commit.
-        entry: nix-shell --pure --run 'cargo-clippy --all --all-targets -- -D warnings'
+        entry: nix-shell --pure --run './scripts/rust/linter.sh clippy'
         pass_filenames: false
         types: [file, rust]
         language: system
     -   id: rust-style
         name: Rust style
         description: Run cargo fmt on files included in the commit.
-        entry: nix-shell --pure --run 'cargo-fmt --all -- --check'
+        entry: nix-shell --pure --run './scripts/rust/linter.sh fmt'
         pass_filenames: false
         types: [file, rust]
         language: system

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -113,8 +113,7 @@ pipeline {
       steps {
         sh 'printenv'
         sh 'nix-shell --run "./dependencies/control-plane/scripts/rust/generate-openapi-bindings.sh"'
-        sh 'nix-shell --run "cargo fmt --all -- --check"'
-        sh 'nix-shell --run "cargo clippy --all-targets -- -D warnings"'
+        sh 'nix-shell --run "./scripts/rust/linter.sh"'
         sh 'nix-shell --run "./scripts/git/check-submodule-branches.sh"'
       }
     }

diff --git a/chart/templates/mayastor/csi/csi-node-daemonset.yaml b/chart/templates/mayastor/csi/csi-node-daemonset.yaml
@@ -88,7 +88,8 @@ spec:
         args:
         - "--csi-socket={{ default .Values.csi.node.pluginMountPath .Values.csi.node.pluginMounthPath }}/{{ .Values.csi.node.socketPath }}"
         - "--node-name=$(MY_NODE_NAME)"
-        - "--rest-endpoint=http://{{ .Release.Name }}-api-rest:8081"
+        - "--rest-endpoint=http://{{ .Release.Name }}-api-rest:8081"{{ if .Values.csi.node.restClient.enabled }}
+        - "--enable-rest"{{ end }}
         - "--enable-registration"
         - "--grpc-ip=$(MY_POD_IP)"
         - "--grpc-port=10199"{{ if .Values.csi.node.nvme.io_timeout }}

diff --git a/chart/values.yaml b/chart/values.yaml
@@ -388,6 +388,8 @@ csi:
     # Additional arguments when creating filesystems
     mkfs_args:
       xfs: ""
+    restClient:
+      enabled: true
     # -- Set tolerations, overrides global
     tolerations: []
     # -- Set PriorityClass, overrides global

diff --git a/dependencies/control-plane b/dependencies/control-plane
diff --git a/scripts/rust/linter.sh b/scripts/rust/linter.sh
@@ -1,7 +1,31 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
-cargo fmt --version
-cargo fmt --all
+set -e
 
-cargo clippy --version
-cargo clippy --all --all-targets $1 -- -D warnings
+FMT_ERROR=
+
+OP="${1:-}"
+
+case "$OP" in
+  "" | "fmt" | "clippy")
+    ;;
+  *)
+    echo "linter $OP not supported"
+    exit 2
+esac
+
+cargo fmt -- --version
+cargo clippy -- --version
+
+if [ -z "$OP" ] || [  "$OP" = "fmt" ]; then
+  cargo fmt --all --check || FMT_ERROR=$?
+  if [ -n "$FMT_ERROR" ]; then
+    cargo fmt --all
+  fi
+fi
+
+if [ -z "$OP" ] || [  "$OP" = "clippy" ]; then
+  cargo clippy --all --all-targets -- -D warnings
+fi
+
+exit ${FMT_ERROR:-0}
+2 −2		.pre-commit-config.yaml
+1 −2		Jenkinsfile
+1 −2		control-plane/csi-driver/src/bin/controller/server.rs
+68 −13		control-plane/csi-driver/src/bin/node/client.rs
+29 −9		control-plane/csi-driver/src/bin/node/main_.rs
+1 −2		control-plane/csi-driver/src/bin/node/mount.rs
+40 −10		control-plane/csi-driver/src/bin/node/node.rs
+1 −1		control-plane/csi-driver/src/trace.rs
+14 −3		deployer/src/infra/csi-driver/node.rs
+4 −0		deployer/src/lib.rs
+28 −4		scripts/rust/linter.sh
+5 −0		tests/bdd/common/deployer.py
+5 −0		tests/bdd/features/csi/node/node.feature
+45 −1		tests/bdd/features/csi/node/test_node.py