Skip to content

Commit

Permalink
bump operator-rs to 0.55.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@maltesander
maltesander committed Oct 16, 2023
1 parent 07ca5e5 commit f79e0ca
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 14 deletions.
8 changes: 4 additions & 4 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
serde_yaml = "0.9"
snafu = "0.7"
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.52.1" }
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.55.0" }
strum = { version = "0.25", features = ["derive"] }
tokio = { version = "1.29", features = ["full"] }
tracing = "0.1"
Expand Down
32 changes: 24 additions & 8 deletions deploy/helm/nifi-operator/crds/crds.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1708,20 +1708,22 @@ spec:
default:
enableVectorAgent: null
containers: {}
description: Logging configuration
properties:
containers:
additionalProperties:
anyOf:
- required:
- custom
- {}
description: Fragment derived from `ContainerLogConfigChoice`
description: Log configuration of the container
properties:
console:
description: Configuration for the console appender
nullable: true
properties:
level:
description: Log levels
description: The log level threshold. Log events with a lower log level are discarded.
enum:
- TRACE
- DEBUG
Expand All @@ -1737,14 +1739,16 @@ spec:
description: Custom log configuration provided in a ConfigMap
properties:
configMap:
description: ConfigMap containing the log configuration files
nullable: true
type: string
type: object
file:
description: Configuration for the file appender
nullable: true
properties:
level:
description: Log levels
description: The log level threshold. Log events with a lower log level are discarded.
enum:
- TRACE
- DEBUG
Expand All @@ -1758,9 +1762,10 @@ spec:
type: object
loggers:
additionalProperties:
description: Configuration of a logger
properties:
level:
description: Log levels
description: The log level threshold. Log events with a lower log level are discarded.
enum:
- TRACE
- DEBUG
Expand All @@ -1773,10 +1778,13 @@ spec:
type: string
type: object
default: {}
description: Configuration per logger
type: object
type: object
description: Log configuration per container
type: object
enableVectorAgent:
description: Wether or not to deploy a container with the Vector log agent
nullable: true
type: boolean
type: object
Expand Down Expand Up @@ -5364,20 +5372,22 @@ spec:
default:
enableVectorAgent: null
containers: {}
description: Logging configuration
properties:
containers:
additionalProperties:
anyOf:
- required:
- custom
- {}
description: Fragment derived from `ContainerLogConfigChoice`
description: Log configuration of the container
properties:
console:
description: Configuration for the console appender
nullable: true
properties:
level:
description: Log levels
description: The log level threshold. Log events with a lower log level are discarded.
enum:
- TRACE
- DEBUG
Expand All @@ -5393,14 +5403,16 @@ spec:
description: Custom log configuration provided in a ConfigMap
properties:
configMap:
description: ConfigMap containing the log configuration files
nullable: true
type: string
type: object
file:
description: Configuration for the file appender
nullable: true
properties:
level:
description: Log levels
description: The log level threshold. Log events with a lower log level are discarded.
enum:
- TRACE
- DEBUG
Expand All @@ -5414,9 +5426,10 @@ spec:
type: object
loggers:
additionalProperties:
description: Configuration of a logger
properties:
level:
description: Log levels
description: The log level threshold. Log events with a lower log level are discarded.
enum:
- TRACE
- DEBUG
Expand All @@ -5429,10 +5442,13 @@ spec:
type: string
type: object
default: {}
description: Configuration per logger
type: object
type: object
description: Log configuration per container
type: object
enableVectorAgent:
description: Wether or not to deploy a container with the Vector log agent
nullable: true
type: boolean
type: object
Expand Down
2 changes: 1 addition & 1 deletion rust/operator-binary/src/controller.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ use stackable_operator::{
cluster_resources::{ClusterResourceApplyStrategy, ClusterResources},
commons::{product_image_selection::ResolvedProductImage, rbac::build_rbac_resources},
config::fragment,
duration::Duration,
k8s_openapi::{
api::{
apps::v1::{StatefulSet, StatefulSetSpec, StatefulSetUpdateStrategy},
Expand Down Expand Up @@ -66,6 +65,7 @@ use stackable_operator::{
compute_conditions, operations::ClusterOperationsConditionBuilder,
statefulset::StatefulSetConditionBuilder,
},
time::Duration,
};
use std::{
borrow::Cow,
Expand Down

0 comments on commit f79e0ca

Please sign in to comment.