From e9dc0c17868b9411940d21a0933b11db225d89af Mon Sep 17 00:00:00 2001 From: Maxi Wittich Date: Wed, 21 Aug 2024 13:46:36 +0200 Subject: [PATCH 1/6] Introduce pub consts for file_header and file_footerw --- crates/stackable-operator/src/config/fragment.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/crates/stackable-operator/src/config/fragment.rs b/crates/stackable-operator/src/config/fragment.rs index c9e053e17..a94242bef 100644 --- a/crates/stackable-operator/src/config/fragment.rs +++ b/crates/stackable-operator/src/config/fragment.rs @@ -18,6 +18,9 @@ use crate::role_utils::{Role, RoleGroup}; use k8s_openapi::api::core::v1::PodTemplateSpec; use snafu::Snafu; +pub const FILE_HEADER_VARIABLE: &str = "EXPERIMENTAL_FILE_HEADER"; +pub const FILE_FOOTER_VARIABLE: &str = "EXPERIMENTAL_FILE_FOOTER"; + pub use stackable_operator_derive::Fragment; /// Contains context used for generating validation errors From 81d54e199c0cb3745b2c8e73f19bdc400e76c7f8 Mon Sep 17 00:00:00 2001 From: Maxi Wittich Date: Wed, 21 Aug 2024 13:48:04 +0200 Subject: [PATCH 2/6] Rename conts --- crates/stackable-operator/src/config/fragment.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/stackable-operator/src/config/fragment.rs b/crates/stackable-operator/src/config/fragment.rs index a94242bef..20addf089 100644 --- a/crates/stackable-operator/src/config/fragment.rs +++ b/crates/stackable-operator/src/config/fragment.rs @@ -18,8 +18,8 @@ use crate::role_utils::{Role, RoleGroup}; use k8s_openapi::api::core::v1::PodTemplateSpec; use snafu::Snafu; -pub const FILE_HEADER_VARIABLE: &str = "EXPERIMENTAL_FILE_HEADER"; -pub const FILE_FOOTER_VARIABLE: &str = "EXPERIMENTAL_FILE_FOOTER"; +pub const FILE_HEADER_KEY: &str = "EXPERIMENTAL_FILE_HEADER"; +pub const FILE_FOOTER_KEY: &str = "EXPERIMENTAL_FILE_FOOTER"; pub use stackable_operator_derive::Fragment; From bd94a88d1085351802b169b1eff0595ce98984b0 Mon Sep 17 00:00:00 2001 From: Maxi Wittich Date: Wed, 21 Aug 2024 14:58:26 +0200 Subject: [PATCH 3/6] Moving vars to more appropriate place --- crates/stackable-operator/src/config/fragment.rs | 3 --- crates/stackable-operator/src/product_config_utils.rs | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/stackable-operator/src/config/fragment.rs b/crates/stackable-operator/src/config/fragment.rs index 20addf089..c9e053e17 100644 --- a/crates/stackable-operator/src/config/fragment.rs +++ b/crates/stackable-operator/src/config/fragment.rs @@ -18,9 +18,6 @@ use crate::role_utils::{Role, RoleGroup}; use k8s_openapi::api::core::v1::PodTemplateSpec; use snafu::Snafu; -pub const FILE_HEADER_KEY: &str = "EXPERIMENTAL_FILE_HEADER"; -pub const FILE_FOOTER_KEY: &str = "EXPERIMENTAL_FILE_FOOTER"; - pub use stackable_operator_derive::Fragment; /// Contains context used for generating validation errors diff --git a/crates/stackable-operator/src/product_config_utils.rs b/crates/stackable-operator/src/product_config_utils.rs index 70d14f97b..574abf3b5 100644 --- a/crates/stackable-operator/src/product_config_utils.rs +++ b/crates/stackable-operator/src/product_config_utils.rs @@ -8,6 +8,9 @@ use tracing::{debug, error, warn}; use crate::role_utils::{CommonConfiguration, Role}; +pub const FILE_HEADER_KEY: &str = "EXPERIMENTAL_FILE_HEADER"; +pub const FILE_FOOTER_KEY: &str = "EXPERIMENTAL_FILE_FOOTER"; + type Result = std::result::Result; #[derive(Debug, PartialEq, Snafu)] From 665b88b75495479f9f00d1f663de2bdc7199ce17 Mon Sep 17 00:00:00 2001 From: Maxi Wittich Date: Wed, 21 Aug 2024 15:12:58 +0200 Subject: [PATCH 4/6] Better Var names --- crates/stackable-operator/src/product_config_utils.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/stackable-operator/src/product_config_utils.rs b/crates/stackable-operator/src/product_config_utils.rs index 574abf3b5..13878bbd3 100644 --- a/crates/stackable-operator/src/product_config_utils.rs +++ b/crates/stackable-operator/src/product_config_utils.rs @@ -8,8 +8,8 @@ use tracing::{debug, error, warn}; use crate::role_utils::{CommonConfiguration, Role}; -pub const FILE_HEADER_KEY: &str = "EXPERIMENTAL_FILE_HEADER"; -pub const FILE_FOOTER_KEY: &str = "EXPERIMENTAL_FILE_FOOTER"; +pub const CONFIG_OVERRIDE_FILE_HEADER_KEY: &str = "EXPERIMENTAL_FILE_HEADER"; +pub const CONFIG_OVERRIDE_FILE_FOOTER_KEY: &str = "EXPERIMENTAL_FILE_FOOTER"; type Result = std::result::Result; From 612fbb48a5a05e7987ecd36e72fbd0f244c9242d Mon Sep 17 00:00:00 2001 From: Maxi Wittich Date: Thu, 22 Aug 2024 09:02:02 +0200 Subject: [PATCH 5/6] Changelog --- crates/stackable-operator/CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/crates/stackable-operator/CHANGELOG.md b/crates/stackable-operator/CHANGELOG.md index 0b74a15de..8611c1548 100644 --- a/crates/stackable-operator/CHANGELOG.md +++ b/crates/stackable-operator/CHANGELOG.md @@ -5,6 +5,9 @@ All notable changes to this project will be documented in this file. ## [Unreleased] - BREAKING: Replace `lazy_static` with `std::cell::LazyCell` (the original implementation was done in [#827] and reverted in [#835]) ([#840]). +- Add two new constants `CONFIG_OVERRIDE_FILE_HEADER_KEY` and `CONFIG_OVERRIDE_FILE_FOOTER_KEY` ([#843]) + +[#843]: https://github.com/stackabletech/operator-rs/pull/843 ### Added From 6fb844c34afaa95b80bee8a1f5a1f0833f08caa2 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Thu, 22 Aug 2024 09:05:37 +0200 Subject: [PATCH 6/6] changelog --- crates/stackable-operator/CHANGELOG.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/crates/stackable-operator/CHANGELOG.md b/crates/stackable-operator/CHANGELOG.md index 8611c1548..92bc3d31a 100644 --- a/crates/stackable-operator/CHANGELOG.md +++ b/crates/stackable-operator/CHANGELOG.md @@ -4,16 +4,17 @@ All notable changes to this project will be documented in this file. ## [Unreleased] -- BREAKING: Replace `lazy_static` with `std::cell::LazyCell` (the original implementation was done in [#827] and reverted in [#835]) ([#840]). -- Add two new constants `CONFIG_OVERRIDE_FILE_HEADER_KEY` and `CONFIG_OVERRIDE_FILE_FOOTER_KEY` ([#843]) - -[#843]: https://github.com/stackabletech/operator-rs/pull/843 - ### Added - `iter::reverse_if` helper ([#838]). +- Add two new constants `CONFIG_OVERRIDE_FILE_HEADER_KEY` and `CONFIG_OVERRIDE_FILE_FOOTER_KEY` ([#843]). + +### Changed + +- BREAKING: Replace `lazy_static` with `std::cell::LazyCell` (the original implementation was done in [#827] and reverted in [#835]) ([#840]). [#838]: https://github.com/stackabletech/operator-rs/pull/838 +[#843]: https://github.com/stackabletech/operator-rs/pull/843 ## [0.73.0] - 2024-08-09