ci(stability): merge the develop branch

datacore-bolt-ci · datacore-bolt-ci · commit 1de82aaf4a01 · 2025-08-04T14:14:13.000Z
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -14,6 +14,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: 'recursive'
+          fetch-depth: 0
       - uses: cachix/install-nix-action@v31.3.0
       - name: Pre-populate nix-shell
         run: |
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/clippy.toml b/clippy.toml
@@ -0,0 +1,2 @@
+large-error-threshold = 256
+
diff --git a/dependencies/control-plane b/dependencies/control-plane
@@ -1 +1 @@
-Subproject commit 1efe6b7ec128ea7152ca88dab7e3775e5c2215dc
+Subproject commit 52bde8891fcec9fefd1d3bc2825344868cafe8ef
diff --git a/k8s/supportability/src/collect/logs/mod.rs b/k8s/supportability/src/collect/logs/mod.rs
@@ -133,7 +133,7 @@ impl LogCollection {
             logging_resources.insert(LogResource {
                 container_name: container.name,
                 host_name: hostname.clone(),
-                label_selector: format!("app={}", service_name),
+                label_selector: format!("app={service_name}"),
                 service_type: service_name.clone(),
             });
         }
diff --git a/k8s/supportability/src/collect/system_dump.rs b/k8s/supportability/src/collect/system_dump.rs
@@ -127,7 +127,7 @@ impl SystemDumper {
         {
             Ok(config) => Some(rest_wrapper::RestClient::new_with_config(config)),
             Err(error) => {
-                log(format!("Can't create rest client: {}", error));
+                log(format!("Can't create rest client: {error}"));
                 None
             }
         };
diff --git a/k8s/upgrade/src/common/error.rs b/k8s/upgrade/src/common/error.rs
@@ -400,7 +400,7 @@ pub enum Error {
     ))]
     SerializePromtailInitContainerToJson {
         source: serde_json::Error,
-        object: Container,
+        object: Box<Container>,
     },
 
     /// Error in deserializing a promtail helm chart's deprecated extraClientConfig to a
@@ -433,7 +433,7 @@ pub enum Error {
     #[snafu(display("Failed to serialize .base.initContainers.containers {object:?}: {source}",))]
     SerializeBaseInitContainersToJson {
         source: serde_json::Error,
-        object: Container,
+        object: Box<Container>,
     },
 
     /// Error in serializing base.initCoreContainers.containers.
@@ -442,7 +442,7 @@ pub enum Error {
     ))]
     SerializeBaseInitCoreContainersToJson {
         source: serde_json::Error,
-        object: Container,
+        object: Box<Container>,
     },
 
     /// Error in serializing base.initHaNodeContainers.containers.
@@ -451,7 +451,7 @@ pub enum Error {
     ))]
     SerializeBaseInitHaNodeContainersToJson {
         source: serde_json::Error,
-        object: Container,
+        object: Box<Container>,
     },
 
     /// Error in serializing base.initRestContainer.initContainer.
@@ -460,14 +460,14 @@ pub enum Error {
     ))]
     SerializeBaseInitRestContainerToJson {
         source: serde_json::Error,
-        object: Container,
+        object: Box<Container>,
     },
 
     /// Error in serializing base.jaeger.agent.initContainers.
     #[snafu(display("Failed to serialize .base.jaeger.agent.initContainer {object:?}: {source}"))]
     SerializeJaegerAgentInitContainerToJson {
         source: serde_json::Error,
-        object: Container,
+        object: Box<Container>,
     },
 
     /// Error in serializing base.jaeger.collector.initContainers.
@@ -476,21 +476,21 @@ pub enum Error {
     ))]
     SerializeJaegerCollectorInitContainerToJson {
         source: serde_json::Error,
-        object: Container,
+        object: Box<Container>,
     },
 
     #[snafu(display(
         "Failed to serialize .csi.node.initContainers.containers {object:?}: {source}"
     ))]
     SerializeCsiNodeInitContainersToJson {
         source: serde_json::Error,
-        object: Container,
+        object: Box<Container>,
     },
 
     #[snafu(display("Failed to serialize .loki-stack.loki.initContainers {object:?}: {source}"))]
     SerializeLokiInitContainersToJson {
         source: serde_json::Error,
-        object: Container,
+        object: Box<Container>,
     },
 
     /// Error for when there are too many io-engine Pods in one single node;
diff --git a/k8s/upgrade/src/plugin/error.rs b/k8s/upgrade/src/plugin/error.rs
@@ -268,12 +268,12 @@ impl From<Error> for i32 {
     fn from(err: Error) -> Self {
         match err {
             Error::YamlParseBufferForUnsupportedVersion { .. } => 401,
-            Error::UpgradeEventNotPresent { .. } => 402,
-            Error::NoDeploymentPresent { .. } => 403,
-            Error::MessageInEventNotPresent { .. } => 404,
-            Error::NodesInCordonedState { .. } => 405,
-            Error::SingleReplicaVolumeErr { .. } => 406,
-            Error::VolumeRebuildInProgress { .. } => 407,
+            Error::UpgradeEventNotPresent => 402,
+            Error::NoDeploymentPresent => 403,
+            Error::MessageInEventNotPresent => 404,
+            Error::NodesInCordonedState => 405,
+            Error::SingleReplicaVolumeErr => 406,
+            Error::VolumeRebuildInProgress => 407,
             Error::K8sClient { .. } => 408,
             Error::EventSerdeDeserialization { .. } => 409,
             Error::ServiceAccountCreate { .. } => 410,
@@ -284,13 +284,13 @@ impl From<Error> for i32 {
             Error::ClusterRoleBindingCreate { .. } => 415,
             Error::UpgradeJobCreate { .. } => 416,
             Error::UpgradeJobDelete { .. } => 417,
-            Error::ReferenceDeploymentInvalidImage { .. } => 418,
-            Error::ReferenceDeploymentNoImage { .. } => 419,
-            Error::ReferenceDeploymentNoSpec { .. } => 420,
-            Error::ReferenceDeploymentNoPodTemplateSpec { .. } => 421,
-            Error::ReferenceDeploymentNoContainers { .. } => 422,
+            Error::ReferenceDeploymentInvalidImage => 418,
+            Error::ReferenceDeploymentNoImage => 419,
+            Error::ReferenceDeploymentNoSpec => 420,
+            Error::ReferenceDeploymentNoPodTemplateSpec => 421,
+            Error::ReferenceDeploymentNoContainers => 422,
             Error::NodeSpecNotPresent { .. } => 423,
-            Error::PodNameNotPresent { .. } => 424,
+            Error::PodNameNotPresent => 424,
             Error::UpgradeJobStatusNotPresent { .. } => 425,
             Error::UpgradeJobNotPresent { .. } => 426,
             Error::ListPodsWithLabel { .. } => 427,
@@ -309,16 +309,16 @@ impl From<Error> for i32 {
             Error::OpeningFile { .. } => 440,
             Error::YamlParseFromFile { .. } => 441,
             Error::SemverParse { .. } => 442,
-            Error::SourceTargetVersionSame { .. } => 443,
-            Error::NotAValidSourceForUpgrade { .. } => 444,
-            Error::InvalidUpgradePath { .. } => 445,
+            Error::SourceTargetVersionSame => 443,
+            Error::NotAValidSourceForUpgrade => 444,
+            Error::InvalidUpgradePath => 445,
             Error::DeleteEventsWithFieldSelector { .. } => 446,
             Error::ReadFromFile { .. } => 447,
             Error::GetUpgradeConfigMap { .. } => 448,
             Error::UpgradeConfigMapCreate { .. } => 449,
             Error::UpgradeConfigMapDelete { .. } => 450,
             Error::InvalidSetFileArguments { .. } => 451,
-            Error::SpecifiedKeyNotPresent { .. } => 452,
+            Error::SpecifiedKeyNotPresent => 452,
         }
     }
 }
diff --git a/metrics-exporter/src/bin/io_engine/collector/mod.rs b/metrics-exporter/src/bin/io_engine/collector/mod.rs
@@ -19,7 +19,7 @@ fn init_diskpool_gauge_vec(
         .subsystem("diskpool")
         .variable_labels(vec!["node".to_string(), "name".to_string()]);
     let gauge_vec = GaugeVec::new(opts, &["node", "name"])
-        .unwrap_or_else(|_| panic!("Unable to create gauge metric type for {}", metric_name));
+        .unwrap_or_else(|_| panic!("Unable to create gauge metric type for {metric_name}"));
     descs.extend(gauge_vec.desc().into_iter().cloned());
     gauge_vec
 }
@@ -31,7 +31,7 @@ fn init_volume_gauge_vec(metric_name: &str, metric_desc: &str, descs: &mut Vec<D
         .subsystem("volume")
         .variable_labels(vec!["node".to_string(), "pv_name".to_string()]);
     let gauge_vec = GaugeVec::new(opts, &["node", "pv_name"])
-        .unwrap_or_else(|_| panic!("Unable to create gauge metric type for {}", metric_name));
+        .unwrap_or_else(|_| panic!("Unable to create gauge metric type for {metric_name}"));
     descs.extend(gauge_vec.desc().into_iter().cloned());
     gauge_vec
 }
@@ -47,7 +47,7 @@ fn init_replica_gauge_vec(metric_name: &str, metric_desc: &str, descs: &mut Vec<
             "pv_name".to_string(),
         ]);
     let gauge_vec = GaugeVec::new(opts, &["node", "name", "pv_name"])
-        .unwrap_or_else(|_| panic!("Unable to create gauge metric type for {}", metric_name));
+        .unwrap_or_else(|_| panic!("Unable to create gauge metric type for {metric_name}"));
     descs.extend(gauge_vec.desc().into_iter().cloned());
     gauge_vec
 }
diff --git a/nix/lib/rust.nix b/nix/lib/rust.nix
@@ -6,8 +6,8 @@ in
 rec {
   makeRustTarget = platform: pkgs.rust.toRustTargetSpec platform;
   rust_default = { override ? { } }: rec {
-    nightly_pkg = pkgs.rust-bin.nightly."2024-10-30";
-    stable_pkg = pkgs.rust-bin.stable."1.82.0";
+    nightly_pkg = pkgs.rust-bin.nightly."2025-06-26";
+    stable_pkg = pkgs.rust-bin.stable."1.88.0";
 
     nightly = nightly_pkg.default.override (override);
     stable = stable_pkg.default.override (override);
diff --git a/nix/sources.json b/nix/sources.json
@@ -5,10 +5,10 @@
         "homepage": "",
         "owner": "nix-community",
         "repo": "naersk",
-        "rev": "d9a33d69a9c421d64c8d925428864e93be895dcc",
-        "sha256": "1lhz5haibfnbxwir61mhymxfqfgs2q1nb4rk88va8bpv6j2zlpbv",
+        "rev": "0e72363d0938b0208d6c646d10649164c43f4d64",
+        "sha256": "1isav7yifl520ifhvswkkicnp2ylhxwnpwdvm4xz2yqrb4258mxs",
         "type": "tarball",
-        "url": "https://github.com/nix-community/naersk/archive/d9a33d69a9c421d64c8d925428864e93be895dcc.tar.gz",
+        "url": "https://github.com/nix-community/naersk/archive/0e72363d0938b0208d6c646d10649164c43f4d64.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "niv": {
@@ -17,22 +17,22 @@
         "homepage": "https://github.com/nmattia/niv",
         "owner": "nmattia",
         "repo": "niv",
-        "rev": "914aba08a26cb10538b84d00d6cfb01c9776d80c",
-        "sha256": "0gx316gc7prjay5b0cr13x4zc2pdbiwxkfkpjvrlb2rml80lm4pm",
+        "rev": "dd678782cae74508d6b4824580d2b0935308011e",
+        "sha256": "0dk8dhh9vla2s409anmrfkva6h3r32xmz3cm8ha09wyk8iyf1f87",
         "type": "tarball",
-        "url": "https://github.com/nmattia/niv/archive/914aba08a26cb10538b84d00d6cfb01c9776d80c.tar.gz",
+        "url": "https://github.com/nmattia/niv/archive/dd678782cae74508d6b4824580d2b0935308011e.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
-        "branch": "release-24.05",
-        "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
-        "homepage": "https://github.com/NixOS/nixpkgs",
+        "branch": "nixos-25.05",
+        "description": "Nix Packages collection",
+        "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b06ca0fab3185980a7501d7db273bb9f864580d4",
-        "sha256": "08pvwij6855wyxq6giyjwj3mdbrl118zzvbr7xdynmb7w9r9lv0l",
+        "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a",
+        "sha256": "0ghn99k0nsbs8a83mhz5ylibvlps19yy690jgj5g6v9v3dkh8fgs",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/b06ca0fab3185980a7501d7db273bb9f864580d4.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "rust-overlay": {
@@ -41,10 +41,10 @@
         "homepage": "",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "7509d76ce2b3d22b40bd25368b45c0a9f7f36c89",
-        "sha256": "12gh5a0clc11b219xrvh08f35v959wnnmm089ys1cmqfdxx9v77n",
+        "rev": "01ac47d86311fb030023f1dfc5f6bc368b9c6cee",
+        "sha256": "0cqy0yfmji6b73p7l6mh0vrfj2cg8hgk4h7km83azdvcnrpilh3b",
         "type": "tarball",
-        "url": "https://github.com/oxalica/rust-overlay/archive/7509d76ce2b3d22b40bd25368b45c0a9f7f36c89.tar.gz",
+        "url": "https://github.com/oxalica/rust-overlay/archive/01ac47d86311fb030023f1dfc5f6bc368b9c6cee.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }
diff --git a/pytest.ini b/pytest.ini
@@ -5,4 +5,6 @@ log_cli_format = %(asctime)s [%(levelname)s] %(message)s
 log_cli_date_format = %Y-%m-%d %H:%M:%S
 log_file = pytest.log
 log_file_level = DEBUG
+log_file_format = %(asctime)s [%(levelname)s] %(message)s
+log_file_date_format = %Y-%m-%d %H:%M:%S
 addopts = --log-disable kubernetes.client.rest
diff --git a/scripts/git/check-submodule-branches.sh b/scripts/git/check-submodule-branches.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 
 
 SCRIPT_DIR="$(dirname "$0")"
-ROOT_DIR="$SCRIPT_DIR/.."
+ROOT_DIR="$SCRIPT_DIR/../.."
 
 submodule_check() {
   failed=
diff --git a/shell.nix b/shell.nix
@@ -44,7 +44,6 @@ pkgs.mkShell {
 
   PROTOC = "${pkgs.protobuf}/bin/protoc";
   PROTOC_INCLUDE = "${pkgs.protobuf}/include";
-  NODE_PATH = "${pkgs.nodePackages."@commitlint/config-conventional"}/lib/node_modules";
 
   # using the nix rust toolchain
   USE_NIX_RUST = "${toString (!norust)}";
@@ -55,7 +54,7 @@ pkgs.mkShell {
 
   shellHook = ''
     ./scripts/nix/git-submodule-init.sh
-    if [ -z "$CI" ]; then
+    if [ "$CI" != "1" ] && [ "$IN_NIX_SHELL" == "impure" ]; then
       echo
       pre-commit install
       pre-commit install --hook commit-msg
diff --git a/tests/bdd/requirements.txt b/tests/bdd/requirements.txt
@@ -1,6 +1,7 @@
 kubernetes==31.0.0
-pytest-bdd==7.3.0
-pytest==8.3.3
-requests==2.32.3
-retrying==1.3.4
-semver==3.0.2
+pytest-bdd==8.1.0
+pytest==8.4.1
+requests==2.32.4
+retrying==1.4.1
+semver==3.0.4
+

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ impl LogCollection {`
`133`	`133`	`logging_resources.insert(LogResource {`
`134`	`134`	`container_name: container.name,`
`135`	`135`	`host_name: hostname.clone(),`
`136`		`- label_selector: format!("app={}", service_name),`
	`136`	`+ label_selector: format!("app={service_name}"),`
`137`	`137`	`service_type: service_name.clone(),`
`138`	`138`	`});`
`139`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ impl SystemDumper {`
`127`	`127`	`{`
`128`	`128`	`Ok(config) => Some(rest_wrapper::RestClient::new_with_config(config)),`
`129`	`129`	`Err(error) => {`
`130`		`- log(format!("Can't create rest client: {}", error));`
	`130`	`+ log(format!("Can't create rest client: {error}"));`
`131`	`131`	`None`
`132`	`132`	`}`
`133`	`133`	`};`