Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion rust/crd/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,28 @@ pub struct SupersetConfig {
/// Time period Pods have to gracefully shut down, e.g. `30m`, `1h` or `2d`. Consult the operator documentation for details.
#[fragment_attrs(serde(default))]
pub graceful_shutdown_timeout: Option<Duration>,

#[fragment_attrs(serde(default))]
pub unsafe_python_customizations: PythonCustomizations,
}

#[derive(Clone, Debug, Default, Fragment, JsonSchema, PartialEq)]
#[fragment_attrs(
derive(
Clone,
Debug,
Default,
Deserialize,
Merge,
JsonSchema,
PartialEq,
Serialize
),
serde(rename_all = "camelCase")
)]
pub struct PythonCustomizations {
prefix: Option<String>,
suffix: Option<String>,
}

impl SupersetConfig {
Expand All @@ -369,7 +391,9 @@ impl SupersetConfig {
logging: product_logging::spec::default_logging(),
affinity: get_affinity(cluster_name, role),
graceful_shutdown_timeout: Some(DEFAULT_NODE_GRACEFUL_SHUTDOWN_TIMEOUT),
..Default::default()
row_limit: None,
webserver_timeout: None,
unsafe_python_customizations: Default::default(),
}
}
}
Expand Down
9 changes: 8 additions & 1 deletion rust/operator-binary/src/superset_controller.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
use std::{
borrow::Cow,
collections::{BTreeMap, BTreeSet, HashMap},
io::Write,
sync::Arc,
};

Expand Down Expand Up @@ -523,6 +524,10 @@ fn build_rolegroup_config_map(
);

let mut config_file = Vec::new();

if let Some(prefix) = config_properties.remove("EXPERIMENTAL_FILE_HEADER") {
writeln!(config_file, "{}", prefix).unwrap();
}
flask_app_config_writer::write::<SupersetConfigOptions, _, _>(
&mut config_file,
config_properties.iter(),
Expand All @@ -531,7 +536,9 @@ fn build_rolegroup_config_map(
.with_context(|_| BuildRoleGroupConfigFileSnafu {
rolegroup: rolegroup.clone(),
})?;

if let Some(prefix) = config_properties.remove("EXPERIMENTAL_FOOTER") {
writeln!(config_file, "{}", prefix).unwrap();
}
let mut cm_builder = ConfigMapBuilder::new();

cm_builder
Expand Down
11 changes: 11 additions & 0 deletions tests/templates/kuttl/smoke/30-install-superset.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,17 @@ spec:
config:
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
configOverrides:
superset_config.py:
EXPERIMENTAL_FILE_HEADER: |
COMMON_HEADER_VAR = "role-value"
ROLE_HEADER_VAR = "role-value"
EXPERIMENTAL_FILE_FOOTER: |
ROLE_FOOTER_VAR = "role-value"
roleGroups:
default:
replicas: 1
configOverrides:
superset_config.py:
EXPERIMENTAL_FILE_HEADER: |
COMMON_HEADER_VAR = "group-value"
11 changes: 11 additions & 0 deletions tests/templates/kuttl/smoke/31-assert.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
apiVersion: kuttl.dev/v1beta1
kind: TestAssert
timeout: 600
commands:
#
# Test envOverrides
#
- script: |
kubectl -n $NAMESPACE get cm superset-node-default -o yaml | yq -e '.data."superset_config.py"' | grep "COMMON_HEADER_VAR = "group-value""
kubectl -n $NAMESPACE get cm superset-node-default -o yaml | yq -e '.data."superset_config.py"' | grep "ROLE_FOOTER_VAR = "role-value""