Skip to content

Commit c9f237b

Browse files
committed
chore: Bump stackable-operator to 0.94.0 and update other dependencies
1 parent 31463ed commit c9f237b

File tree

8 files changed

+260
-566
lines changed

8 files changed

+260
-566
lines changed

Cargo.lock

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

Cargo.nix

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

Cargo.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@ repository = "https://github.com/stackabletech/opa-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 = [
15-
"telemetry",
16-
"versioned",
17-
], tag = "stackable-operator-0.93.0" }
14+
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", features = ["telemetry", "versioned"], tag = "stackable-operator-0.94.0" }
1815
krb5 = { git = "https://github.com/stackabletech/krb5-rs.git", tag = "v0.1.0" }
1916

2017

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/opa-operator/crds/crds.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -790,11 +790,6 @@ spec:
790790
format: date-time
791791
nullable: true
792792
type: string
793-
lastUpdateTime:
794-
description: The last time this condition was updated.
795-
format: date-time
796-
nullable: true
797-
type: string
798793
message:
799794
description: A human readable message indicating details about the transition.
800795
nullable: true

rust/bundle-builder/src/main.rs

Lines changed: 3 additions & 0 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::{
25
collections::{BTreeMap, BTreeSet},
36
num::TryFromIntError,

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

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,24 @@ pub enum Error {
5858
FragmentValidationFailure { source: ValidationError },
5959
}
6060

61-
#[versioned(version(name = "v1alpha1"), options(skip(from)))]
61+
#[versioned(
62+
version(name = "v1alpha1"),
63+
crates(
64+
kube_core = "stackable_operator::kube::core",
65+
kube_client = "stackable_operator::kube::client",
66+
k8s_openapi = "stackable_operator::k8s_openapi",
67+
schemars = "stackable_operator::schemars",
68+
versioned = "stackable_operator::versioned"
69+
),
70+
skip(from)
71+
)]
6272
pub mod versioned {
63-
#[versioned(k8s(
73+
#[versioned(crd(
6474
group = "opa.stackable.tech",
6575
kind = "OpaCluster",
6676
status = "OpaClusterStatus",
6777
namespaced,
6878
shortname = "opa",
69-
crates(
70-
kube_core = ::stackable_operator::kube::core,
71-
k8s_openapi = ::stackable_operator::k8s_openapi,
72-
schemars = ::stackable_operator::schemars
73-
)
7479
))]
7580
#[derive(Clone, Debug, Deserialize, CustomResource, JsonSchema, Serialize)]
7681
#[serde(rename_all = "camelCase")]

rust/operator-binary/src/main.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
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;
47
use futures::StreamExt;
58
use product_config::ProductConfigManager;
6-
use stackable_opa_operator::crd::{OPERATOR_NAME, OpaCluster, v1alpha1};
9+
use stackable_opa_operator::crd::{OPERATOR_NAME, OpaCluster, OpaClusterVersion, v1alpha1};
710
use stackable_operator::{
811
YamlSchema,
912
cli::{Command, ProductOperatorRun},
@@ -60,7 +63,7 @@ async fn main() -> anyhow::Result<()> {
6063
let opts = Opts::parse();
6164
match opts.cmd {
6265
Command::Crd => {
63-
OpaCluster::merged_crd(OpaCluster::V1Alpha1)?
66+
OpaCluster::merged_crd(OpaClusterVersion::V1Alpha1)?
6467
.print_yaml_schema(built_info::PKG_VERSION, SerializeOptions::default())?;
6568
}
6669
Command::Run(OpaRun {

0 commit comments

Comments
 (0)