@@ -21,7 +21,9 @@ use crate::{
2121 AirflowAuthenticationClassResolved , AirflowClientAuthenticationDetailsResolved ,
2222 } ,
2323 authorization:: AirflowAuthorizationResolved ,
24- internal_secret:: { ENV_INTERNAL_SECRET , ENV_JWT_SECRET } ,
24+ internal_secret:: {
25+ FERNET_KEY_SECRET_KEY , INTERNAL_SECRET_SECRET_KEY , JWT_SECRET_SECRET_KEY ,
26+ } ,
2527 v1alpha1,
2628 } ,
2729 util:: { env_var_from_secret, role_service_name} ,
@@ -83,7 +85,7 @@ pub fn build_airflow_statefulset_envs(
8385) -> Result < Vec < EnvVar > , Error > {
8486 let mut env: BTreeMap < String , EnvVar > = BTreeMap :: new ( ) ;
8587 let secret = airflow. spec . cluster_config . credentials_secret . as_str ( ) ;
86- let internal_secret_name = airflow. shared_internal_secret_name ( ) ;
88+ let internal_secret_name = airflow. shared_internal_secret_secret_name ( ) ;
8789
8890 env. extend ( static_envs ( git_sync_resources) ) ;
8991
@@ -100,7 +102,7 @@ pub fn build_airflow_statefulset_envs(
100102 env_var_from_secret (
101103 AIRFLOW_WEBSERVER_SECRET_KEY ,
102104 & internal_secret_name,
103- ENV_INTERNAL_SECRET ,
105+ INTERNAL_SECRET_SECRET_KEY ,
104106 ) ,
105107 ) ;
106108 // Replaces AIRFLOW__WEBSERVER__SECRET_KEY >= 3.0.2.
@@ -109,9 +111,19 @@ pub fn build_airflow_statefulset_envs(
109111 env_var_from_secret (
110112 "AIRFLOW__API__SECRET_KEY" ,
111113 & internal_secret_name,
112- ENV_INTERNAL_SECRET ,
114+ INTERNAL_SECRET_SECRET_KEY ,
113115 ) ,
114116 ) ;
117+
118+ env. insert (
119+ "AIRFLOW__CORE__FERNET_KEY" . into ( ) ,
120+ env_var_from_secret (
121+ "AIRFLOW__CORE__FERNET_KEY" ,
122+ & airflow. shared_fernet_key_secret_name ( ) ,
123+ FERNET_KEY_SECRET_KEY ,
124+ ) ,
125+ ) ;
126+
115127 env. insert (
116128 AIRFLOW_DATABASE_SQL_ALCHEMY_CONN . into ( ) ,
117129 env_var_from_secret (
@@ -485,13 +497,12 @@ fn add_version_specific_env_vars(
485497 // cluster, but should also be cluster-specific.
486498 // It is accessed from a secret to avoid cluster restarts
487499 // being triggered by an operator restart.
488- let jwt_secret_name = airflow. shared_jwt_secret_name ( ) ;
489500 env. insert (
490501 "AIRFLOW__API_AUTH__JWT_SECRET" . into ( ) ,
491502 env_var_from_secret (
492503 "AIRFLOW__API_AUTH__JWT_SECRET" ,
493- & jwt_secret_name ,
494- ENV_JWT_SECRET ,
504+ & airflow . shared_jwt_secret_secret_name ( ) ,
505+ JWT_SECRET_SECRET_KEY ,
495506 ) ,
496507 ) ;
497508 if airflow_role == & AirflowRole :: Webserver {
0 commit comments