@@ -533,20 +533,13 @@ pub async fn ensure_canary_deployment(
533533 deployment. metadata . name = Some ( name. clone ( ) ) ;
534534
535535 if let Some ( spec) = & mut deployment. spec {
536- let mut labels = spec
537- . template
538- . metadata
539- . as_ref ( )
540- . and_then ( |m| m. labels . clone ( ) )
541- . unwrap_or_default ( ) ;
536+ let mut labels = standard_labels ( & canary_node) ;
542537 labels. insert ( "stellar.org/rollout-type" . to_string ( ) , "canary" . to_string ( ) ) ;
543538 spec. template . metadata . as_mut ( ) . unwrap ( ) . labels = Some ( labels. clone ( ) ) ;
544539 spec. selector . match_labels = Some ( labels. clone ( ) ) ;
545540
546541 let meta = & mut deployment. metadata ;
547- let mut meta_labels = meta. labels . clone ( ) . unwrap_or_default ( ) ;
548- meta_labels. insert ( "stellar.org/rollout-type" . to_string ( ) , "canary" . to_string ( ) ) ;
549- meta. labels = Some ( meta_labels) ;
542+ meta. labels = Some ( labels) ;
550543 }
551544
552545 let patch = Patch :: Apply ( & deployment) ;
@@ -774,13 +767,11 @@ pub async fn ensure_canary_service(
774767 service. metadata . name = Some ( name. clone ( ) ) ;
775768
776769 if let Some ( spec) = & mut service. spec {
777- let mut selector = spec . selector . clone ( ) . unwrap_or_default ( ) ;
778- selector . insert ( "stellar.org/rollout-type" . to_string ( ) , "canary" . to_string ( ) ) ;
779- spec. selector = Some ( selector ) ;
770+ let mut labels = standard_labels ( node ) ;
771+ labels . insert ( "stellar.org/rollout-type" . to_string ( ) , "canary" . to_string ( ) ) ;
772+ spec. selector = Some ( labels . clone ( ) ) ;
780773
781774 let meta = & mut service. metadata ;
782- let mut labels = meta. labels . clone ( ) . unwrap_or_default ( ) ;
783- labels. insert ( "stellar.org/rollout-type" . to_string ( ) , "canary" . to_string ( ) ) ;
784775 meta. labels = Some ( labels) ;
785776 }
786777
0 commit comments