Skip to content

Commit 03d0b8a

Browse files
committed
chore: Bump stackable-operator to 0.94.0 and update other dependencies
1 parent 5b003e1 commit 03d0b8a

File tree

9 files changed

+1514
-2340
lines changed

9 files changed

+1514
-2340
lines changed

Cargo.lock

Lines changed: 468 additions & 550 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.nix

Lines changed: 1022 additions & 1769 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ edition = "2021"
1010
repository = "https://github.com/stackabletech/listener-operator"
1111

1212
[workspace.dependencies]
13-
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", features = ["telemetry", "versioned"], tag = "stackable-operator-0.93.2" }
13+
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", features = ["telemetry", "versioned"], tag = "stackable-operator-0.94.0" }
1414

1515
anyhow = "1.0"
1616
built = { version = "0.8", features = ["chrono", "git2"] }
@@ -27,7 +27,7 @@ serde_json = "1.0"
2727
serde_yaml = "0.9"
2828
snafu = "0.8"
2929
strum = { version = "0.27", features = ["derive"] }
30-
socket2 = { version = "0.5", features = ["all"] }
30+
socket2 = { version = "0.6", features = ["all"] }
3131
tokio = { version = "1.40", features = ["full"] }
3232
tokio-stream = { version = "0.1", features = ["net"] }
3333
tonic = "0.13"

crate-hashes.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/csi-grpc/src/lib.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
//! Include gRPC definition files that have been generated by `build.rs`
22
3-
// CSI docs don't quite align with Rustdoc conventions
4-
#![allow(clippy::doc_lazy_continuation)]
5-
63
pub static FILE_DESCRIPTOR_SET_BYTES: &[u8] =
74
include_bytes!(concat!(env!("OUT_DIR"), "/file_descriptor_set.bin"));
85

9-
// Trivial warnings that come from prost-generated code
10-
#[allow(clippy::derive_partial_eq_without_eq)]
6+
// The prost-generated code breaks many clippy lints. Just disable them since there's nothing we can do about it.
7+
#[allow(clippy::all)]
118
pub mod v1 {
129
tonic::include_proto!("csi.v1");
1310
}

rust/olm-deployer/src/env/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ fn deployer_env_var(deployment: &Deployment) -> Option<&Vec<EnvVar>> {
5757
.into_iter()
5858
.flatten()
5959
.filter(|c| c.name == "listener-operator-deployer")
60-
.last()
60+
.next_back()
6161
.and_then(|c| c.env.as_ref())
6262
}
6363

rust/olm-deployer/src/resources/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ fn deployment_resources(deployment: &Deployment) -> Option<&ResourceRequirements
3939
.into_iter()
4040
.flatten()
4141
.filter(|c| c.name == "listener-operator-deployer")
42-
.last()
42+
.next_back()
4343
.and_then(|c| c.resources.as_ref())
4444
}
4545

rust/operator-binary/src/csi_server/node.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ impl From<PublishVolumeError> for Status {
138138
PublishVolumeError::ApplyListener { .. } => Status::unavailable(full_msg),
139139
PublishVolumeError::AddListenerLabelToPv { .. } => Status::unavailable(full_msg),
140140
PublishVolumeError::AddListenerLabelToPod { .. } => Status::unavailable(full_msg),
141-
PublishVolumeError::NoAddresses { .. } => Status::unavailable(full_msg),
141+
PublishVolumeError::NoAddresses => Status::unavailable(full_msg),
142142
PublishVolumeError::PreparePodDir { .. } => Status::internal(full_msg),
143143
PublishVolumeError::WritePodListeners { .. } => Status::unavailable(full_msg),
144144
PublishVolumeError::FindPodVolumeForPvc { .. } => Status::failed_precondition(full_msg),

rust/operator-binary/src/main.rs

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// TODO: Look into how to properly resolve `clippy::result_large_err`.
2+
// This will need changes in our and upstream error types.
3+
#![allow(clippy::result_large_err)]
14
use std::{os::unix::prelude::FileTypeExt, path::PathBuf};
25

36
use clap::Parser;
@@ -11,7 +14,10 @@ use csi_server::{
1114
use futures::{FutureExt, TryStreamExt, pin_mut};
1215
use stackable_operator::{
1316
self, YamlSchema,
14-
crd::listener::{Listener, ListenerClass, PodListeners},
17+
crd::listener::{
18+
Listener, ListenerClass, ListenerClassVersion, ListenerVersion, PodListeners,
19+
PodListenersVersion,
20+
},
1521
shared::yaml::SerializeOptions,
1622
telemetry::{Tracing, tracing::TelemetryOptions},
1723
utils::cluster_info::KubernetesClusterInfoOpts,
@@ -71,11 +77,11 @@ async fn main() -> anyhow::Result<()> {
7177
let opts = Opts::parse();
7278
match opts.cmd {
7379
stackable_operator::cli::Command::Crd => {
74-
ListenerClass::merged_crd(ListenerClass::V1Alpha1)?
80+
ListenerClass::merged_crd(ListenerClassVersion::V1Alpha1)?
7581
.print_yaml_schema(built_info::PKG_VERSION, SerializeOptions::default())?;
76-
Listener::merged_crd(Listener::V1Alpha1)?
82+
Listener::merged_crd(ListenerVersion::V1Alpha1)?
7783
.print_yaml_schema(built_info::PKG_VERSION, SerializeOptions::default())?;
78-
PodListeners::merged_crd(PodListeners::V1Alpha1)?
84+
PodListeners::merged_crd(PodListenersVersion::V1Alpha1)?
7985
.print_yaml_schema(built_info::PKG_VERSION, SerializeOptions::default())?;
8086
}
8187
stackable_operator::cli::Command::Run(ListenerOperatorRun {

0 commit comments

Comments
 (0)