Skip to content

Commit 661db61

Browse files
committed
chore: Bump stackable-operator to 0.94.0 and update other dependencies
1 parent 636f471 commit 661db61

9 files changed

Lines changed: 1209 additions & 1851 deletions

File tree

Cargo.lock

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

Cargo.nix

Lines changed: 779 additions & 1260 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
@@ -11,10 +11,10 @@ repository = "https://github.com/stackabletech/nifi-operator"
1111

1212
[workspace.dependencies]
1313
product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.7.0" }
14-
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", features = ["telemetry", "versioned"], tag = "stackable-operator-0.93.2" }
14+
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", features = ["telemetry", "versioned"], tag = "stackable-operator-0.94.0" }
1515

1616
anyhow = "1.0"
17-
built = { version = "0.7", features = ["chrono", "git2"] }
17+
built = { version = "0.8", features = ["chrono", "git2"] }
1818
clap = "4.5"
1919
const_format = "0.2"
2020
fnv = "1.0"

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.

deploy/helm/nifi-operator/crds/crds.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ spec:
4848
type: string
4949
extraScopes:
5050
default: []
51-
description: An optional list of extra scopes which get merged with the scopes defined in the `AuthenticationClass`.
51+
description: An optional list of extra scopes which get merged with the scopes defined in the AuthenticationClass
5252
items:
5353
type: string
5454
type: array
@@ -1291,11 +1291,6 @@ spec:
12911291
format: date-time
12921292
nullable: true
12931293
type: string
1294-
lastUpdateTime:
1295-
description: The last time this condition was updated.
1296-
format: date-time
1297-
nullable: true
1298-
type: string
12991294
message:
13001295
description: A human readable message indicating details about the transition.
13011296
nullable: true

rust/operator-binary/src/crd/authentication.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ pub enum Error {
4949

5050
type Result<T, E = Error> = std::result::Result<T, E>;
5151

52+
#[allow(clippy::large_enum_variant)]
5253
#[derive(Clone)]
5354
pub enum AuthenticationClassResolved {
5455
Static {
@@ -60,6 +61,8 @@ pub enum AuthenticationClassResolved {
6061
Oidc {
6162
provider: oidc::v1alpha1::AuthenticationProvider,
6263
oidc: oidc::v1alpha1::ClientAuthenticationOptions<()>,
64+
// NOTE (@NickLarsenNZ): This is causing clippy::large_enum_variant
65+
// can we box it?
6366
nifi: v1alpha1::NifiCluster,
6467
},
6568
}

rust/operator-binary/src/crd/mod.rs

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,21 +70,25 @@ pub enum Error {
7070
FragmentValidationFailure { source: ValidationError },
7171
}
7272

73-
#[versioned(version(name = "v1alpha1"))]
73+
#[versioned(
74+
version(name = "v1alpha1"),
75+
crates(
76+
kube_core = "stackable_operator::kube::core",
77+
kube_client = "stackable_operator::kube::client",
78+
k8s_openapi = "stackable_operator::k8s_openapi",
79+
schemars = "stackable_operator::schemars",
80+
versioned = "stackable_operator::versioned"
81+
)
82+
)]
7483
pub mod versioned {
7584
/// A NiFi cluster stacklet. This resource is managed by the Stackable operator for Apache NiFi.
7685
/// Find more information on how to use it and the resources that the operator generates in the
7786
/// [operator documentation](DOCS_BASE_URL_PLACEHOLDER/nifi/).
78-
#[versioned(k8s(
87+
#[versioned(crd(
7988
group = "nifi.stackable.tech",
8089
shortname = "nifi",
8190
status = "NifiStatus",
8291
namespaced,
83-
crates(
84-
kube_core = "stackable_operator::kube::core",
85-
k8s_openapi = "stackable_operator::k8s_openapi",
86-
schemars = "stackable_operator::schemars"
87-
)
8892
))]
8993
#[derive(Clone, CustomResource, Debug, Deserialize, JsonSchema, PartialEq, Serialize)]
9094
#[serde(rename_all = "camelCase")]

rust/operator-binary/src/listener.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ pub fn build_group_listener_pvc(
6969
&ListenerReference::ListenerName(group_listener_name.to_string()),
7070
unversioned_recommended_labels,
7171
)
72-
.context(BuildListenerPersistentVolumeSnafu)?
7372
.build_pvc(LISTENER_VOLUME_NAME.to_string())
7473
.context(BuildListenerPersistentVolumeSnafu)
7574
}

rust/operator-binary/src/main.rs

Lines changed: 5 additions & 2 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::sync::Arc;
25

36
use clap::Parser;
@@ -28,7 +31,7 @@ use stackable_operator::{
2831

2932
use crate::{
3033
controller::NIFI_FULL_CONTROLLER_NAME,
31-
crd::{NifiCluster, v1alpha1},
34+
crd::{NifiCluster, NifiClusterVersion, v1alpha1},
3235
};
3336

3437
mod config;
@@ -58,7 +61,7 @@ struct Opts {
5861
async fn main() -> anyhow::Result<()> {
5962
let opts = Opts::parse();
6063
match opts.cmd {
61-
Command::Crd => NifiCluster::merged_crd(NifiCluster::V1Alpha1)?
64+
Command::Crd => NifiCluster::merged_crd(NifiClusterVersion::V1Alpha1)?
6265
.print_yaml_schema(built_info::PKG_VERSION, SerializeOptions::default())?,
6366
Command::Run(ProductOperatorRun {
6467
product_config,

0 commit comments

Comments
 (0)