From 584613263cb57a37d6c34af31b33518e061b42e3 Mon Sep 17 00:00:00 2001 From: Tiago Castro Date: Thu, 28 Nov 2024 19:20:44 +0000 Subject: [PATCH 1/2] refactor: use rust-stable only Signed-off-by: Tiago Castro --- .rustfmt.toml | 16 ---------------- Cargo.lock | 12 ++++++------ dependencies/control-plane | 2 +- k8s/upgrade/src/bin/upgrade-job/upgrade/utils.rs | 2 +- k8s/upgrade/src/plugin/upgrade.rs | 2 +- shell.nix | 4 ++-- 6 files changed, 11 insertions(+), 27 deletions(-) delete mode 100644 .rustfmt.toml diff --git a/.rustfmt.toml b/.rustfmt.toml deleted file mode 100644 index 36850d1b2..000000000 --- a/.rustfmt.toml +++ /dev/null @@ -1,16 +0,0 @@ -max_width = 100 -# default is false -wrap_comments = true -comment_width = 100 -struct_lit_single_line = true -imports_layout = "Mixed" -# changed from Preserve (merge_imports = false) -imports_granularity="Crate" -#default false -spaces_around_ranges = true -# was 2015 -edition = "2018" - -ignore = [ - "dependencies/control-plane/openapi" -] diff --git a/Cargo.lock b/Cargo.lock index 30e2cb947..3ef7d11cc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1647,7 +1647,7 @@ dependencies = [ "hyper 1.5.0", "hyper-util", "log", - "rustls 0.23.16", + "rustls 0.23.19", "rustls-native-certs 0.8.0", "rustls-pki-types", "tokio", @@ -2055,7 +2055,7 @@ dependencies = [ "kube-core 0.94.2", "pem", "rand", - "rustls 0.23.16", + "rustls 0.23.19", "rustls-pemfile 2.2.0", "secrecy", "serde", @@ -2513,7 +2513,7 @@ dependencies = [ "opentelemetry-otlp", "opentelemetry_sdk", "pin-project", - "rustls 0.23.16", + "rustls 0.23.19", "rustls-pemfile 2.2.0", "serde", "serde_derive", @@ -3349,9 +3349,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.16" +version = "0.23.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e" +checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1" dependencies = [ "log", "once_cell", @@ -4117,7 +4117,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.16", + "rustls 0.23.19", "rustls-pki-types", "tokio", ] diff --git a/dependencies/control-plane b/dependencies/control-plane index dd21e4e27..00190e91b 160000 --- a/dependencies/control-plane +++ b/dependencies/control-plane @@ -1 +1 @@ -Subproject commit dd21e4e276d2d8701d3935c2299219a234ccd955 +Subproject commit 00190e91b0e41e7f1b3b9229ed45b9b32e5746b8 diff --git a/k8s/upgrade/src/bin/upgrade-job/upgrade/utils.rs b/k8s/upgrade/src/bin/upgrade-job/upgrade/utils.rs index 3b6a94f5a..76ab4abc4 100644 --- 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 index 5108e1cd7..5862987b8 100644 --- 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 index d4aa69795..dafbd1ea3 100644 --- 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"; From 145bb1d48582e808a6a2763bd0954568e22b995d Mon Sep 17 00:00:00 2001 From: Tiago Castro Date: Thu, 28 Nov 2024 19:25:36 +0000 Subject: [PATCH 2/2] security: address github alert Update python test package Signed-off-by: Tiago Castro --- tests/bdd/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/bdd/requirements.txt b/tests/bdd/requirements.txt index f054f2bb6..d5d67a585 100644 --- 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