@@ -8,10 +8,13 @@ use stackable_operator::{
88use strum:: IntoEnumIterator ;
99
1010use super :: dereference:: DereferencedObjects ;
11- use crate :: crd:: {
12- AirflowConfig , AirflowExecutor , AirflowRole , MergedOverrides ,
13- authentication:: AirflowClientAuthenticationDetailsResolved ,
14- authorization:: AirflowAuthorizationResolved , v1alpha2,
11+ use crate :: {
12+ airflow_controller:: CONTAINER_IMAGE_BASE_NAME ,
13+ crd:: {
14+ AirflowConfig , AirflowExecutor , AirflowRole , MergedOverrides ,
15+ authentication:: AirflowClientAuthenticationDetailsResolved ,
16+ authorization:: AirflowAuthorizationResolved , v1alpha2,
17+ } ,
1518} ;
1619
1720#[ derive( Snafu , Debug ) ]
@@ -55,15 +58,17 @@ pub struct ValidatedAirflowCluster {
5558
5659pub fn validate_cluster (
5760 airflow : & v1alpha2:: AirflowCluster ,
58- image_base_name : & str ,
5961 image_repository : & str ,
60- pkg_version : & str ,
6162 dereferenced : DereferencedObjects ,
6263) -> Result < ValidatedAirflowCluster , Error > {
6364 let resolved_product_image = airflow
6465 . spec
6566 . image
66- . resolve ( image_base_name, image_repository, pkg_version)
67+ . resolve (
68+ CONTAINER_IMAGE_BASE_NAME ,
69+ image_repository,
70+ crate :: built_info:: PKG_VERSION ,
71+ )
6772 . context ( ResolveProductImageSnafu ) ?;
6873
6974 let mut role_groups = BTreeMap :: new ( ) ;
0 commit comments