Fix pod template envvars (#372)

* convert hashmap to btreemap before iteration and comment * changelog
stackabletech · Jan 15, 2024 · 2602dff · 2602dff
1 parent a2f24a7
commit 2602dff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@
 ### Fixed
 
 - BREAKING: Fixed various issues in the CRD structure. `clusterConfig.credentialsSecret` is now mandatory ([#353]).
+- Fixed ordering of variables written to the kubernetes executor pod template ([#372]).
 
 ### Removed
 
@@ -25,6 +26,7 @@
 [#353]: https://github.com/stackabletech/airflow-operator/pull/353
 [#354]: https://github.com/stackabletech/airflow-operator/pull/354
 [#366]: https://github.com/stackabletech/airflow-operator/pull/366
+[#372]: https://github.com/stackabletech/airflow-operator/pull/372
 
 ## [23.11.0] - 2023-11-24
 

diff --git a/rust/operator-binary/src/airflow_controller.rs b/rust/operator-binary/src/airflow_controller.rs
@@ -1331,7 +1331,8 @@ fn build_template_envs(
         ..Default::default()
     });
 
-    for (k, v) in env_overrides {
+    // iterate over a BTreeMap to ensure the vars are written in a predictable order
+    for (k, v) in env_overrides.iter().collect::<BTreeMap<_, _>>() {
         env.push(EnvVar {
             name: k.to_string(),
             value: Some(v.to_string()),