From efe978548b914ff7e614cd728801e5c3842a408a Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 23 Jul 2025 07:28:32 +0200 Subject: [PATCH] fix: Lot of configs missing for middleManagers (#740) * fix: Lot of configs missing for middleManagers * changelog * linter --- CHANGELOG.md | 7 ++ deploy/config-spec/properties.yaml | 64 +++++++++---------- .../druid-operator/configs/properties.yaml | 64 +++++++++---------- .../druid_controller/properties.yaml | 60 ++++++++--------- 4 files changed, 101 insertions(+), 94 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 487a2ef1..4dbc1b99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -46,6 +46,12 @@ All notable changes to this project will be documented in this file. - Use `json` file extension for log files ([#709]). - Fix a bug where changes to ConfigMaps that are referenced in the DruidCluster spec didn't trigger a reconciliation ([#704]). - Allow uppercase characters in domain names ([#735]). +- Fix lot of configuration properties missing on the middleManager roles ([#740]). + This includes properties such as: + - Enable Prometheus metrics + - JVM DNS request cache settings + - Druid indexer logs directory + - Druid processing temp directory ### Removed @@ -68,6 +74,7 @@ All notable changes to this project will be documented in this file. [#731]: https://github.com/stackabletech/druid-operator/pull/731 [#735]: https://github.com/stackabletech/druid-operator/pull/735 [#737]: https://github.com/stackabletech/druid-operator/pull/737 +[#740]: https://github.com/stackabletech/druid-operator/pull/740 ## [25.3.0] - 2025-03-21 diff --git a/deploy/config-spec/properties.yaml b/deploy/config-spec/properties.yaml index a5629850..5b620e02 100644 --- a/deploy/config-spec/properties.yaml +++ b/deploy/config-spec/properties.yaml @@ -94,7 +94,7 @@ properties: - fromVersion: "0.0.0" value: "30" roles: - - name: "middleManager" + - name: "middlemanager" required: true asOfVersion: "0.0.0" comment: "TTL for successfully resolved domain names." @@ -189,7 +189,7 @@ properties: - fromVersion: "0.0.0" value: "0" roles: - - name: "middleManager" + - name: "middlemanager" required: true asOfVersion: "0.0.0" comment: "TTL for host names that cannot be resolved." @@ -233,7 +233,7 @@ properties: required: false - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -257,7 +257,7 @@ properties: required: false - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -281,7 +281,7 @@ properties: required: true - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: true @@ -305,7 +305,7 @@ properties: required: true - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: true @@ -336,7 +336,7 @@ properties: required: true - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: true @@ -363,7 +363,7 @@ properties: required: true - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: true @@ -388,7 +388,7 @@ properties: required: true - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: true @@ -412,7 +412,7 @@ properties: required: true - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: true @@ -437,7 +437,7 @@ properties: required: true - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: true @@ -458,7 +458,7 @@ properties: required: true - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: true @@ -479,7 +479,7 @@ properties: required: true - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: true @@ -503,7 +503,7 @@ properties: required: true - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: true @@ -524,7 +524,7 @@ properties: required: false - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -545,7 +545,7 @@ properties: required: false - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -570,7 +570,7 @@ properties: required: true - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: true @@ -595,7 +595,7 @@ properties: required: false - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -620,7 +620,7 @@ properties: required: false - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: false @@ -645,7 +645,7 @@ properties: required: false - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: false @@ -669,7 +669,7 @@ properties: required: false - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: false @@ -694,7 +694,7 @@ properties: required: false - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: true @@ -718,7 +718,7 @@ properties: required: false - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: true @@ -742,7 +742,7 @@ properties: required: false - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -766,7 +766,7 @@ properties: required: false - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -791,7 +791,7 @@ properties: required: true - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -816,7 +816,7 @@ properties: required: true - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -844,7 +844,7 @@ properties: required: true - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -871,7 +871,7 @@ properties: required: true - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -896,7 +896,7 @@ properties: required: true - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -920,7 +920,7 @@ properties: required: true - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -944,7 +944,7 @@ properties: required: true - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false diff --git a/deploy/helm/druid-operator/configs/properties.yaml b/deploy/helm/druid-operator/configs/properties.yaml index a5629850..5b620e02 100644 --- a/deploy/helm/druid-operator/configs/properties.yaml +++ b/deploy/helm/druid-operator/configs/properties.yaml @@ -94,7 +94,7 @@ properties: - fromVersion: "0.0.0" value: "30" roles: - - name: "middleManager" + - name: "middlemanager" required: true asOfVersion: "0.0.0" comment: "TTL for successfully resolved domain names." @@ -189,7 +189,7 @@ properties: - fromVersion: "0.0.0" value: "0" roles: - - name: "middleManager" + - name: "middlemanager" required: true asOfVersion: "0.0.0" comment: "TTL for host names that cannot be resolved." @@ -233,7 +233,7 @@ properties: required: false - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -257,7 +257,7 @@ properties: required: false - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -281,7 +281,7 @@ properties: required: true - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: true @@ -305,7 +305,7 @@ properties: required: true - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: true @@ -336,7 +336,7 @@ properties: required: true - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: true @@ -363,7 +363,7 @@ properties: required: true - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: true @@ -388,7 +388,7 @@ properties: required: true - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: true @@ -412,7 +412,7 @@ properties: required: true - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: true @@ -437,7 +437,7 @@ properties: required: true - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: true @@ -458,7 +458,7 @@ properties: required: true - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: true @@ -479,7 +479,7 @@ properties: required: true - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: true @@ -503,7 +503,7 @@ properties: required: true - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: true @@ -524,7 +524,7 @@ properties: required: false - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -545,7 +545,7 @@ properties: required: false - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -570,7 +570,7 @@ properties: required: true - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: true @@ -595,7 +595,7 @@ properties: required: false - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -620,7 +620,7 @@ properties: required: false - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: false @@ -645,7 +645,7 @@ properties: required: false - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: false @@ -669,7 +669,7 @@ properties: required: false - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: false @@ -694,7 +694,7 @@ properties: required: false - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: true @@ -718,7 +718,7 @@ properties: required: false - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: true @@ -742,7 +742,7 @@ properties: required: false - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -766,7 +766,7 @@ properties: required: false - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -791,7 +791,7 @@ properties: required: true - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -816,7 +816,7 @@ properties: required: true - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -844,7 +844,7 @@ properties: required: true - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -871,7 +871,7 @@ properties: required: true - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -896,7 +896,7 @@ properties: required: true - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -920,7 +920,7 @@ properties: required: true - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -944,7 +944,7 @@ properties: required: true - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false diff --git a/rust/operator-binary/test/resources/druid_controller/properties.yaml b/rust/operator-binary/test/resources/druid_controller/properties.yaml index da339ef2..2fb07f49 100644 --- a/rust/operator-binary/test/resources/druid_controller/properties.yaml +++ b/rust/operator-binary/test/resources/druid_controller/properties.yaml @@ -44,7 +44,7 @@ properties: required: false - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -68,7 +68,7 @@ properties: required: false - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -92,7 +92,7 @@ properties: required: true - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: true @@ -116,7 +116,7 @@ properties: required: true - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: true @@ -147,7 +147,7 @@ properties: required: true - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: true @@ -174,7 +174,7 @@ properties: required: true - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: true @@ -199,7 +199,7 @@ properties: required: true - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: true @@ -223,7 +223,7 @@ properties: required: true - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: true @@ -248,7 +248,7 @@ properties: required: true - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: true @@ -269,7 +269,7 @@ properties: required: true - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: true @@ -290,7 +290,7 @@ properties: required: true - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: true @@ -314,7 +314,7 @@ properties: required: true - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: true @@ -335,7 +335,7 @@ properties: required: false - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -356,7 +356,7 @@ properties: required: false - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -381,7 +381,7 @@ properties: required: true - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: true @@ -406,7 +406,7 @@ properties: required: false - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -431,7 +431,7 @@ properties: required: false - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: false @@ -456,7 +456,7 @@ properties: required: false - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: false @@ -480,7 +480,7 @@ properties: required: false - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: true - name: "router" required: false @@ -505,7 +505,7 @@ properties: required: false - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: true @@ -529,7 +529,7 @@ properties: required: false - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: true @@ -553,7 +553,7 @@ properties: required: false - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -577,7 +577,7 @@ properties: required: false - name: "historical" required: true - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -602,7 +602,7 @@ properties: required: true - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -627,7 +627,7 @@ properties: required: true - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -655,7 +655,7 @@ properties: required: true - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -682,7 +682,7 @@ properties: required: true - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -707,7 +707,7 @@ properties: required: true - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -731,7 +731,7 @@ properties: required: true - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false @@ -755,7 +755,7 @@ properties: required: true - name: "historical" required: false - - name: "middleManager" + - name: "middlemanager" required: false - name: "router" required: false