Skip to content

Commit 1cf815c

Browse files
chore: Update templated files (9001281) (#686)
* chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@9001281 Reference-to: stackabletech/operator-templating@9001281 (Fix pre-commit hook) * chore: Apply formatting --------- Co-authored-by: Techassi <git@techassi.dev>
1 parent 55e2618 commit 1cf815c

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

.github/workflows/pr_pre-commit.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
env:
88
CARGO_TERM_COLOR: always
9-
RUST_TOOLCHAIN_VERSION: "1.82.0"
9+
RUST_TOOLCHAIN_VERSION: "nightly-2025-01-15"
1010
HADOLINT_VERSION: "v2.12.0"
1111
PYTHON_VERSION: "3.12"
1212

.pre-commit-config.yaml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ repos:
1717
- repo: https://github.com/doublify/pre-commit-rust
1818
rev: eeee35a89e69d5772bdee97db1a6a898467b686e # 1.0
1919
hooks:
20-
- id: fmt
21-
# Pinning to a specific rustc version, so that we get consistent formatting
22-
entry: RUSTUP_TOOLCHAIN=nightly-2025-01-15 cargo fmt
23-
args: ["--all", "--", "--check"]
2420
- id: clippy
2521
args: ["--all-targets", "--", "-D", "warnings"]
2622

@@ -78,3 +74,10 @@ repos:
7874
entry: cargo test
7975
stages: [pre-commit, pre-merge-commit, manual]
8076
pass_filenames: false
77+
78+
- id: cargo-rustfmt
79+
name: cargo-rustfmt
80+
language: system
81+
entry: cargo +nightly-2025-01-15 fmt --all -- --check
82+
stages: [pre-commit]
83+
pass_filenames: false

rust/operator-binary/src/discovery.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
use crate::controller::{build_recommended_labels, APP_PORT};
2-
31
use snafu::{OptionExt, ResultExt, Snafu};
42
use stackable_opa_crd::{OpaCluster, OpaRole};
53
use stackable_operator::{
@@ -10,6 +8,8 @@ use stackable_operator::{
108
utils::cluster_info::KubernetesClusterInfo,
119
};
1210

11+
use crate::controller::{build_recommended_labels, APP_PORT};
12+
1313
#[derive(Snafu, Debug)]
1414
pub enum Error {
1515
#[snafu(display("object {} is missing metadata to build owner reference", opa))]

rust/operator-binary/src/product_logging.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
use snafu::{OptionExt, ResultExt, Snafu};
22
use stackable_opa_crd::{Container, OpaCluster};
3-
use stackable_operator::product_logging::spec::LogLevel;
43
use stackable_operator::{
54
builder::configmap::ConfigMapBuilder,
65
client::Client,
76
k8s_openapi::api::core::v1::ConfigMap,
87
kube::ResourceExt,
98
product_logging::{
109
self,
11-
spec::{ContainerLogConfig, ContainerLogConfigChoice, Logging},
10+
spec::{ContainerLogConfig, ContainerLogConfigChoice, LogLevel, Logging},
1211
},
1312
role_utils::RoleGroupRef,
1413
};

0 commit comments

Comments
 (0)