Skip to content

Commit cd28b2a

Browse files
committed
make webserver_config_py non-optional to bring in line with other operators
1 parent 2dfb36e commit cd28b2a

1 file changed

Lines changed: 11 additions & 12 deletions

File tree

  • rust/operator-binary/src/crd

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

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,8 @@ pub type AirflowWebserverRoleType =
107107
#[derive(Clone, Debug, Default, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
108108
#[serde(rename_all = "camelCase")]
109109
pub struct AirflowConfigOverrides {
110-
#[serde(
111-
default,
112-
rename = "webserver_config.py",
113-
skip_serializing_if = "Option::is_none"
114-
)]
115-
pub webserver_config_py: Option<KeyValueConfigOverrides>,
110+
#[serde(default, rename = "webserver_config.py")]
111+
pub webserver_config_py: KeyValueConfigOverrides,
116112
}
117113

118114
#[derive(Clone, Debug)]
@@ -458,15 +454,18 @@ impl v1alpha2::AirflowCluster {
458454
.config
459455
.config_overrides
460456
.webserver_config_py
461-
.as_ref()
462-
.map(|o| o.overrides.clone())
463-
.unwrap_or_default();
457+
.overrides
458+
.clone();
464459

465460
if let Some(rg) = role_config.role_groups.get(rolegroup_name) {
466461
env_overrides.extend(rg.config.env_overrides.clone());
467-
if let Some(rg_file) = rg.config.config_overrides.webserver_config_py.as_ref() {
468-
file_overrides.extend(rg_file.overrides.clone());
469-
}
462+
file_overrides.extend(
463+
rg.config
464+
.config_overrides
465+
.webserver_config_py
466+
.overrides
467+
.clone(),
468+
);
470469
}
471470

472471
let config_file_overrides = file_overrides

0 commit comments

Comments
 (0)