chore(bors): merge pull request #573

573: Rust stable r=tiagolobocastro a=tiagolobocastro security: address github alert Update python test package Signed-off-by: Tiago Castro <[email protected]> Co-authored-by: Tiago Castro <[email protected]>
openebs · Nov 29, 2024 · ed25e5a · ed25e5a
2 parents ed3cba7 + 145bb1d
commit ed25e5a
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 28 deletions.
diff --git a/.rustfmt.toml b/.rustfmt.toml
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/dependencies/control-plane b/dependencies/control-plane
diff --git a/k8s/upgrade/src/bin/upgrade-job/upgrade/utils.rs b/k8s/upgrade/src/bin/upgrade-job/upgrade/utils.rs
@@ -50,7 +50,7 @@ pub(crate) async fn rebuild_result(
             if volume_over_nodes.contains(node_name) {
                 match replica_rebuild_count(volume) {
                     0 => {
-                        for _i in 0 .. 11 {
+                        for _i in 0..11 {
                             // wait for a minute for any rebuild to start
                             tokio::time::sleep(Duration::from_secs(60_u64)).await;
                             let count = replica_rebuild_count(volume);

diff --git a/k8s/upgrade/src/plugin/upgrade.rs b/k8s/upgrade/src/plugin/upgrade.rs
@@ -162,7 +162,7 @@ impl UpgradeArgs {
         // Create resources for upgrade
         UpgradeResources::create_upgrade_resources(namespace, self).await?;
 
-        for _i in 0 .. MAX_RETRY_ATTEMPTS {
+        for _i in 0..MAX_RETRY_ATTEMPTS {
             // wait for 10 seconds for the upgrade event to be published
             tokio::time::sleep(Duration::from_secs(10)).await;
             match upgrade_event_client

diff --git a/shell.nix b/shell.nix
@@ -1,4 +1,4 @@
-{ norust ? false, devrustup ? true, rust-profile ? "nightly" }:
+{ norust ? false, devrustup ? true, rust-profile ? "stable" }:
 let
   sources = import ./nix/sources.nix;
   pkgs = import sources.nixpkgs {
@@ -46,7 +46,7 @@ mkShell {
     which
     yq-go
     kind
-  ] ++ pkgs.lib.optional (!norust) channel.default_src.nightly
+  ] ++ pkgs.lib.optional (!norust) rust
   ++ pkgs.lib.optional (system == "aarch64-darwin") darwin.apple_sdk.frameworks.Security;
 
   PROTOC = "${protobuf}/bin/protoc";

diff --git a/tests/bdd/requirements.txt b/tests/bdd/requirements.txt
@@ -1,6 +1,6 @@
 kubernetes==31.0.0
 pytest-bdd==7.3.0
 pytest==8.3.3
-requests==2.26.0
+requests==2.32.3
 retrying==1.3.4
 semver==3.0.2
+1 −0		.gitignore
+0 −18		.rustfmt.toml
+55 −55		Cargo.lock
+1 −1		commitlint.config.js
+10 −0		control-plane/agents/src/bin/core/controller/reconciler/pool/mod.rs
+11 −0		control-plane/agents/src/bin/core/controller/registry.rs
+23 −2		control-plane/agents/src/bin/core/controller/resources/operations_helper.rs
+8 −0		control-plane/agents/src/bin/core/main.rs
+68 −5		control-plane/agents/src/bin/core/pool/operations_helper.rs
+6 −10		control-plane/agents/src/bin/core/pool/pool_operations.rs
+3 −1		control-plane/agents/src/bin/core/pool/specs.rs
+6 −5		control-plane/agents/src/bin/core/tests/controller/mod.rs
+1 −0		control-plane/agents/src/bin/core/tests/deserializer.rs
+1 −1		control-plane/agents/src/bin/core/tests/event/mod.rs
+86 −2		control-plane/agents/src/bin/core/tests/pool/mod.rs
+1 −1		control-plane/agents/src/bin/core/tests/snapshot/fs_cons_snapshot.rs
+1 −1		control-plane/agents/src/bin/core/tests/volume/capacity.rs
+1 −1		control-plane/agents/src/bin/core/tests/volume/hotspare.rs
+2 −2		control-plane/agents/src/bin/core/tests/volume/resize.rs
+1 −1		control-plane/agents/src/bin/core/tests/volume/switchover.rs
+1 −1		control-plane/agents/src/bin/core/tests/watch/mod.rs
+1 −1		control-plane/agents/src/bin/core/volume/operations_helper.rs
+1 −1		control-plane/agents/src/bin/ha/cluster/switchover.rs
+2 −2		control-plane/agents/src/bin/ha/node/server.rs
+1 −1		control-plane/agents/src/common/errors.rs
+1 −1		control-plane/csi-driver/src/bin/node/dev.rs
+1 −1		control-plane/csi-driver/src/bin/node/filesystem_ops.rs
+1 −0		control-plane/grpc/proto/v1/misc/common.proto
+1 −1		control-plane/grpc/src/client.rs
+2 −0		control-plane/grpc/src/misc/traits.rs
+1 −1		control-plane/grpc/src/operations/jsongrpc/client.rs
+1 −0		control-plane/grpc/src/operations/pool/traits.rs
+1 −1		control-plane/plugin/src/resources/node.rs
+1 −1		control-plane/plugin/src/resources/pool.rs
+2 −2		control-plane/plugin/src/resources/tests.rs
+1 −1		control-plane/rest/Cargo.toml
+1 −0		control-plane/rest/openapi-specs/v0_api_spec.yaml
+5 −2		control-plane/stor-port/src/transport_api/mod.rs
+4 −0		control-plane/stor-port/src/types/mod.rs
+18 −0		control-plane/stor-port/src/types/v0/store/pool.rs
+3 −3		control-plane/stor-port/src/types/v0/transport/nexus.rs
+2 −2		control-plane/stor-port/src/types/v0/transport/nvme_nqn.rs
+5 −0		control-plane/stor-port/src/types/v0/transport/pool.rs
+6 −6		deployer/src/infra/csi-driver/node.rs
+8 −7		deployer/src/infra/io_engine.rs
+9 −0		deployer/src/lib.rs
+1 −1		k8s/operators/src/pool/main.rs
+1 −1		openapi/Cargo.toml
+21 −3		scripts/rust/deployer-cleanup.sh
+3 −1		shell.nix
+5 −2		terraform/cluster/mod/k8s/repo.sh
+13 −3		tests/bdd/common/deployer.py
+4 −20		tests/bdd/features/capacity/thin/volume/test_create.py
+0 −8		tests/bdd/features/cordon/node/test_cordon_node.py
+5 −16		tests/bdd/features/garbage-collection/replicas/test_feature.py
+3 −19		tests/bdd/features/ha/core-agent/test_target_switchover.py
+4 −19		tests/bdd/features/ha/test_robustness.py
+4 −19		tests/bdd/features/pool/create/test_disks.py
+5 −29		tests/bdd/features/pool/delete/test_feature.py
+5 −30		tests/bdd/features/pool/reconcile/test_feature.py
+4 −21		tests/bdd/features/rebuild/test_log_based_rebuild.py
+4 −19		tests/bdd/features/rebuild/test_rebuild.py
+4 −20		tests/bdd/features/snapshot/create/test_feature.py
+4 −10		tests/bdd/features/snapshot/garbage_collection/test_garbage_collection.py
+4 −10		tests/bdd/features/snapshot/list/test_list.py
+4 −20		tests/bdd/features/volume/create/test_feature.py
+6 −18		tests/bdd/features/volume/nexus/test_feature.py
+4 −19		tests/bdd/features/volume/replicas/test_feature.py
+4 −21		tests/bdd/features/volume/resize/test_resize_offline.py
+4 −21		tests/bdd/features/volume/resize/test_resize_online.py
+3 −3		tests/io-engine/tests/rebuild.rs
+1 −1		tests/io-engine/tests/reservations.rs
+1 −1		tests/io-engine/tests/upgrade.rs
+1 −1		utils/dependencies
+21 −13		utils/deployer-cluster/src/lib.rs
+100 −0		utils/deployer-cluster/src/lvm.rs
+1 −1		utils/pstor-usage/src/etcd.rs
+1 −1		utils/pstor-usage/src/resources.rs
+1 −1		utils/pstor-usage/src/simulation.rs
+1 −1		utils/pstor-usage/src/volumes.rs
+1 −1		utils/weighted-scoring/src/range.rs