Skip to content

Commit

Permalink
bump operator-rs 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 a05b360 commit df2feed
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 15 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"] }
tokio-zookeeper = "0.2"
Expand Down
32 changes: 24 additions & 8 deletions deploy/helm/zookeeper-operator/crds/crds.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -642,20 +642,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 @@ -671,14 +673,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 @@ -692,9 +696,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 @@ -707,10 +712,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 @@ -4138,20 +4146,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 @@ -4167,14 +4177,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 @@ -4188,9 +4200,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 @@ -4203,10 +4216,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/zk_controller.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ use stackable_operator::{
product_image_selection::ResolvedProductImage,
rbac::{build_rbac_resources, service_account_name},
},
duration::Duration,
k8s_openapi::{
api::{
apps::v1::{StatefulSet, StatefulSetSpec},
Expand Down Expand Up @@ -52,6 +51,7 @@ use stackable_operator::{
compute_conditions, operations::ClusterOperationsConditionBuilder,
statefulset::StatefulSetConditionBuilder,
},
time::Duration,
};
use stackable_zookeeper_crd::{
security::ZookeeperSecurity, Container, ZookeeperCluster, ZookeeperClusterStatus,
Expand Down
2 changes: 1 addition & 1 deletion rust/operator-binary/src/znode_controller.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ use snafu::{OptionExt, ResultExt, Snafu};
use stackable_operator::{
cluster_resources::{ClusterResourceApplyStrategy, ClusterResources},
commons::product_image_selection::ResolvedProductImage,
duration::Duration,
k8s_openapi::api::core::v1::{ConfigMap, Service},
kube::{
self,
Expand All @@ -22,6 +21,7 @@ use stackable_operator::{
Resource,
},
logging::controller::ReconcilerError,
time::Duration,
};
use stackable_zookeeper_crd::{
security::ZookeeperSecurity, ZookeeperCluster, ZookeeperZnode, DOCKER_IMAGE_BASE_NAME,
Expand Down

0 comments on commit df2feed

Please sign in to comment.