ci(stability): merge the release/2.7 branch

Author: datacore-bolt-ci

.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

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"'
       }
     }

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-endpoint=$(MY_POD_IP):10199"{{ if .Values.csi.node.nvme.io_timeout }}
         - "--nvme-io-timeout={{ .Values.csi.node.nvme.io_timeout }}"

chart/values.yaml

@@ -386,6 +386,8 @@ csi:
     # Additional arguments when creating filesystems
     mkfs_args:
       xfs: ""
+    restClient:
+      enabled: true
     # -- Set tolerations, overrides global
     tolerations: []
     # -- Set PriorityClass, overrides global

dependencies/control-plane

@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-
 # On a new appTag, update the Chart.yaml which is used to publish the chart to the appropriate
 # version and appVersion.
 # For this first iteration version and appVersion in the Chart.yaml *MUST* point to the stable
@@ -78,9 +77,9 @@ helm_testing_branch_version() {
 
   local latest_version="${release_branch#*release/}"
   if [[ "$latest_version" =~ ^[0-9]+$ ]]; then
-    latest_version=${latest_version}.0.0
+    latest_version=${latest_version}.$(semver get minor ${CHART_VERSION}).$(semver get patch ${CHART_VERSION})
   elif [[ "$latest_version" =~ ^[0-9]+.[0-9]+$ ]]; then
-    latest_version=${latest_version}.0
+      latest_version=${latest_version}.$(semver get patch ${CHART_VERSION})
   elif [[ "$latest_version" =~ ^[0-9]+.[0-9]+.[0-9]+$ ]]; then
     latest_version=${latest_version}
   else

scripts/helm/publish-chart-yaml.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}