feat: Support removing properties from catalogs

Author: sbernauer

CHANGELOG.md

@@ -11,6 +11,8 @@ All notable changes to this project will be documented in this file.
 - Run a `containerdebug` process in the background of each Trino container to collect debugging information ([#687]).
 - Support configuring JVM arguments ([#677]).
 - Aggregate emitted Kubernetes events on the CustomResources ([#677]).
+- Support removing properties from catalogs.
+  This is helpful, because Trino fails to start in case you have any unused config properties ([#XXX]).
 
 ## Changed
 

deploy/helm/trino-operator/crds/crds.yaml

@@ -1985,6 +1985,17 @@ spec:
                       description: A [TPC-H](https://docs.stackable.tech/home/nightly/trino/usage-guide/catalogs/tpch) connector.
                       type: object
                   type: object
+                experimentalConfigRemovals:
+                  default: []
+                  description: |-
+                    List of config properties which should be removed.
+
+                    This is helpful, because Trino fails to start in case you have any unused config properties. The removals are executed after the `configOverrides`.
+
+                    This field is experimental, as ideally some general solution for the removal of properties is found and added to configOverrides. This mechanism would replace this field.
+                  items:
+                    type: string
+                  type: array
               required:
                 - connector
               type: object

rust/operator-binary/src/catalog/config.rs

@@ -160,6 +160,16 @@ impl CatalogConfig {
             .properties
             .extend(catalog.spec.config_overrides.clone());
 
+        for removal in &catalog.spec.config_removals {
+            if catalog_config.properties.remove(removal).is_none() {
+                tracing::warn!(
+                    catalog.name = catalog_name,
+                    property = removal,
+                    "You asked to remove a non-existing config property from a catalog"
+                );
+            }
+        }
+
         Ok(catalog_config)
     }
 }

rust/operator-binary/src/crd/catalog/mod.rs

@@ -48,11 +48,22 @@ pub mod versioned {
     pub struct TrinoCatalogSpec {
         /// The `connector` defines which connector is used.
         pub connector: TrinoCatalogConnector,
-        #[serde(default)]
 
         /// The `configOverrides` allow overriding arbitrary Trino settings.
         /// For example, for Hive you could add `hive.metastore.username: trino`.
+        #[serde(default)]
         pub config_overrides: HashMap<String, String>,
+
+        /// List of config properties which should be removed.
+        ///
+        /// This is helpful, because Trino fails to start in case you have any unused config
+        /// properties. The removals are executed after the `configOverrides`.
+        ///
+        /// This field is experimental, as ideally some general solution for the removal of
+        /// properties is found and added to configOverrides. This mechanism would replace this
+        /// field.
+        #[serde(default, rename = "experimentalConfigRemovals")]
+        pub config_removals: Vec<String>,
     }
 }