Fix duplicate resource tracking

nats-io · Jan 14, 2025 · 682073f · 682073f
1 parent 3e24e7c
commit 682073f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/internal/controller/account_controller.go b/internal/controller/account_controller.go
@@ -30,6 +30,7 @@ import (
 	"k8s.io/klog/v2"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 )
@@ -217,6 +218,8 @@ func (r *AccountReconciler) findDependentResources(ctx context.Context, log logr
 func (r *AccountReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&api.Account{}).
-		Owns(&api.Account{}).
+		WithOptions(controller.Options{
+			MaxConcurrentReconciles: 1,
+		}).
 		Complete(r)
 }
diff --git a/internal/controller/consumer_controller.go b/internal/controller/consumer_controller.go
@@ -250,6 +250,8 @@ func (r *ConsumerReconciler) createOrUpdate(ctx context.Context, log klog.Logger
 				}
 				consumer.Annotations[stateAnnotationStream] = string(knownState)
 			}
+
+			return r.Update(ctx, consumer)
 		}
 
 		return nil
@@ -393,7 +395,6 @@ func compareConsumerConfig(actual *jetstream.ConsumerConfig, desired *jetstream.
 func (r *ConsumerReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&api.Consumer{}).
-		Owns(&api.Consumer{}).
 		WithOptions(controller.Options{
 			MaxConcurrentReconciles: 1,
 		}).

diff --git a/internal/controller/keyvalue_controller.go b/internal/controller/keyvalue_controller.go
@@ -303,7 +303,6 @@ func keyValueSpecToConfig(spec *api.KeyValueSpec) (jetstream.KeyValueConfig, err
 func (r *KeyValueReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&api.KeyValue{}).
-		Owns(&api.KeyValue{}).
 		WithOptions(controller.Options{
 			MaxConcurrentReconciles: 1,
 		}).

diff --git a/internal/controller/objectstore_controller.go b/internal/controller/objectstore_controller.go
@@ -274,7 +274,6 @@ func objectStoreSpecToConfig(spec *api.ObjectStoreSpec) (jetstream.ObjectStoreCo
 func (r *ObjectStoreReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&api.ObjectStore{}).
-		Owns(&api.ObjectStore{}).
 		WithOptions(controller.Options{
 			MaxConcurrentReconciles: 1,
 		}).

diff --git a/internal/controller/stream_controller.go b/internal/controller/stream_controller.go
@@ -244,6 +244,8 @@ func (r *StreamReconciler) createOrUpdate(ctx context.Context, log logr.Logger,
 				}
 				stream.Annotations[stateAnnotationStream] = string(knownState)
 			}
+
+			return r.Update(ctx, stream)
 		}
 
 		return nil
@@ -467,7 +469,6 @@ func mapStreamSource(ss *api.StreamSource) (*jetstream.StreamSource, error) {
 func (r *StreamReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&api.Stream{}).
-		Owns(&api.Stream{}).
 		WithOptions(controller.Options{
 			MaxConcurrentReconciles: 1,
 		}).