File tree Expand file tree Collapse file tree 3 files changed +9
-11
lines changed Expand file tree Collapse file tree 3 files changed +9
-11
lines changed Original file line number Diff line number Diff line change 1
- use std:: collections:: BTreeMap ;
1
+ use std:: collections:: { BTreeMap , BTreeSet } ;
2
2
3
+ use authentication:: {
4
+ AirflowAuthenticationClassResolved , AirflowClientAuthenticationDetailsResolved ,
5
+ } ;
3
6
use git_sync:: GitSync ;
4
7
use product_config:: flask_app_config_writer:: { FlaskAppConfigOptions , PythonType } ;
5
8
use serde:: { Deserialize , Serialize } ;
@@ -322,7 +325,10 @@ impl AirflowRole {
322
325
/// components to have the same image/configuration (e.g. DAG folder location), even if not all
323
326
/// configuration settings are used everywhere. For this reason we ensure that the webserver
324
327
/// config file is in the Airflow home directory on all pods.
325
- pub fn get_commands ( & self ) -> Vec < String > {
328
+ pub fn get_commands (
329
+ & self ,
330
+ auth_config : & AirflowClientAuthenticationDetailsResolved ,
331
+ ) -> Vec < String > {
326
332
let mut command = vec ! [
327
333
format!( "cp -RL {CONFIG_PATH}/{AIRFLOW_CONFIG_FILENAME} {AIRFLOW_HOME}/{AIRFLOW_CONFIG_FILENAME}" ) ,
328
334
// graceful shutdown part
Original file line number Diff line number Diff line change @@ -883,7 +883,7 @@ fn build_server_rolegroup_statefulset(
883
883
. context ( GracefulShutdownSnafu ) ?;
884
884
885
885
let mut airflow_container_args = Vec :: new ( ) ;
886
- airflow_container_args. extend ( airflow_role. get_commands ( ) ) ;
886
+ airflow_container_args. extend ( airflow_role. get_commands ( authentication_config ) ) ;
887
887
888
888
airflow_container
889
889
. image_from_product_image ( resolved_product_image)
Original file line number Diff line number Diff line change @@ -200,14 +200,6 @@ pub fn build_airflow_statefulset_envs(
200
200
AirflowRole :: Webserver => {
201
201
let auth_vars = authentication_env_vars ( auth_config) ;
202
202
env. extend ( auth_vars. into_iter ( ) . map ( |var| ( var. name . to_owned ( ) , var) ) ) ;
203
- env. insert (
204
- "REQUESTS_CA_BUNDLE" . into ( ) ,
205
- EnvVar {
206
- name : "REQUESTS_CA_BUNDLE" . to_string ( ) ,
207
- value : Some ( "/stackable/secrets/tls/ca.crt" . to_string ( ) ) ,
208
- ..Default :: default ( )
209
- } ,
210
- ) ;
211
203
}
212
204
_ => { }
213
205
}
You can’t perform that action at this time.
0 commit comments