@@ -17,18 +17,13 @@ import (
1717 "sigs.k8s.io/controller-runtime/pkg/log"
1818
1919 nephoranv1 "github.com/thc1006/nephoran-intent-operator/api/v1"
20+ "github.com/thc1006/nephoran-intent-operator/pkg/config"
2021 "github.com/thc1006/nephoran-intent-operator/pkg/controllers"
2122)
2223
2324const (
24-
2525 // OptimizedNetworkIntentController holds optimizednetworkintentcontroller value.
26-
2726 OptimizedNetworkIntentController = "optimized-networkintent"
28-
29- // NetworkIntentFinalizer holds networkintentfinalizer value.
30-
31- NetworkIntentFinalizer = "networkintent.nephoran.com/finalizer"
3227)
3328
3429// OptimizedNetworkIntentReconciler implements an optimized version of the NetworkIntent controller.
@@ -54,6 +49,8 @@ type OptimizedNetworkIntentReconciler struct {
5449
5550 deps controllers.Dependencies
5651
52+ constants * config.Constants
53+
5754 // Performance tracking.
5855
5956 activeReconcilers int64
@@ -85,6 +82,8 @@ func NewOptimizedNetworkIntentReconciler(
8582 config controllers.Config ,
8683
8784 deps controllers.Dependencies ,
85+
86+ constants * config.Constants ,
8887) * OptimizedNetworkIntentReconciler {
8988 ctx , cancel := context .WithCancel (context .Background ())
9089
@@ -115,6 +114,8 @@ func NewOptimizedNetworkIntentReconciler(
115114
116115 deps : deps ,
117116
117+ constants : constants ,
118+
118119 apiCallBatcher : apiCallBatcher ,
119120
120121 ctx : ctx ,
@@ -277,7 +278,7 @@ func (r *OptimizedNetworkIntentReconciler) Reconcile(ctx context.Context, req ct
277278
278279 // Ensure finalizer exists (batched operation).
279280
280- if ! r .hasFinalizer (networkIntent , NetworkIntentFinalizer ) {
281+ if ! r .hasFinalizer (networkIntent , r . constants . NetworkIntentFinalizer ) {
281282
282283 if err := r .addFinalizerOptimized (ctx , networkIntent ); err != nil {
283284
@@ -751,7 +752,7 @@ func (r *OptimizedNetworkIntentReconciler) hasFinalizer(networkIntent *nephoranv
751752}
752753
753754func (r * OptimizedNetworkIntentReconciler ) addFinalizerOptimized (ctx context.Context , networkIntent * nephoranv1.NetworkIntent ) error {
754- networkIntent .Finalizers = append (networkIntent .Finalizers , NetworkIntentFinalizer )
755+ networkIntent .Finalizers = append (networkIntent .Finalizers , r . constants . NetworkIntentFinalizer )
755756
756757 timer := r .metrics .NewAPICallTimer (OptimizedNetworkIntentController , "update" , "NetworkIntent" )
757758
@@ -782,7 +783,7 @@ func (r *OptimizedNetworkIntentReconciler) handleDeletionOptimized(ctx context.C
782783 finalizers := make ([]string , 0 )
783784
784785 for _ , f := range networkIntent .Finalizers {
785- if f != NetworkIntentFinalizer {
786+ if f != r . constants . NetworkIntentFinalizer {
786787 finalizers = append (finalizers , f )
787788 }
788789 }
0 commit comments