@@ -17,7 +17,7 @@ use stackable_operator::{
1717 core:: v1:: { ConfigMap , Service } ,
1818 } ,
1919 kube:: {
20- ResourceExt ,
20+ CustomResourceExt , ResourceExt ,
2121 core:: DeserializeGuard ,
2222 runtime:: {
2323 Controller ,
@@ -29,12 +29,12 @@ use stackable_operator::{
2929 logging:: controller:: report_controller_reconciled,
3030 shared:: yaml:: SerializeOptions ,
3131 telemetry:: Tracing ,
32- utils:: signal:: SignalWatcher ,
32+ utils:: signal:: { self , SignalWatcher } ,
3333} ;
3434
3535use crate :: {
3636 airflow_controller:: AIRFLOW_FULL_CONTROLLER_NAME ,
37- crd:: { AirflowCluster , AirflowClusterVersion , OPERATOR_NAME , v1alpha2} ,
37+ crd:: { AirflowCluster , AirflowClusterVersion , OPERATOR_NAME , v1alpha1 , v1alpha2} ,
3838 webhooks:: conversion:: create_webhook_server,
3939} ;
4040
@@ -192,7 +192,7 @@ async fn main() -> anyhow::Result<()> {
192192 )
193193 . map ( anyhow:: Ok ) ;
194194
195- let ( webhook_server, initial_reconcile_rx ) = create_webhook_server (
195+ let webhook_server = create_webhook_server (
196196 & operator_environment,
197197 maintenance. disable_crd_maintenance ,
198198 client. as_kube_client ( ) ,
@@ -204,7 +204,8 @@ async fn main() -> anyhow::Result<()> {
204204 . map_err ( |err| anyhow ! ( err) . context ( "failed to run webhook server" ) ) ;
205205
206206 let delayed_airflow_controller = async {
207- let _ = initial_reconcile_rx. await ;
207+ signal:: crd_established ( & client, v1alpha1:: AirflowCluster :: crd_name ( ) , None )
208+ . await ?;
208209 airflow_controller. await
209210 } ;
210211
0 commit comments