Skip to content

Commit e1a750c

Browse files
authored
Use unique names for Fluentbit/Fluentd controllers. (#1736)
* Use unique names for Fluentbit/Fluentd controllers. Signed-off-by: Josh Baird <[email protected]> * Remove binary. Signed-off-by: Josh Baird <[email protected]> --------- Signed-off-by: Josh Baird <[email protected]>
1 parent e6964de commit e1a750c

File tree

4 files changed

+4
-0
lines changed

4 files changed

+4
-0
lines changed

controllers/fluentbit_controller.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,7 @@ func (r *FluentBitReconciler) SetupWithManager(mgr ctrl.Manager) error {
352352
}
353353

354354
return ctrl.NewControllerManagedBy(mgr).
355+
Named("FluentBit").
355356
For(&fluentbitv1alpha2.FluentBit{}).
356357
Owns(&corev1.ServiceAccount{}).
357358
Owns(&appsv1.DaemonSet{}).

controllers/fluentbitconfig_controller.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -438,6 +438,7 @@ func (r *FluentBitConfigReconciler) SetupWithManager(mgr ctrl.Manager) error {
438438
}
439439

440440
return ctrl.NewControllerManagedBy(mgr).
441+
Named("FluentBitConfig").
441442
For(&fluentbitv1alpha2.FluentBit{}).
442443
Owns(&corev1.Secret{}).
443444
Watches(&fluentbitv1alpha2.ClusterFluentBitConfig{}, &handler.EnqueueRequestForObject{}).

controllers/fluentd_controller.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ func (r *FluentdReconciler) SetupWithManager(mgr ctrl.Manager) error {
238238
}
239239

240240
return ctrl.NewControllerManagedBy(mgr).
241+
Named("Fluentd").
241242
For(&fluentdv1alpha1.Fluentd{}).
242243
Owns(&corev1.ServiceAccount{}).
243244
Owns(&appsv1.DaemonSet{}).

controllers/fluentdconfig_controller.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -682,6 +682,7 @@ func (r *FluentdConfigReconciler) SetupWithManager(mgr ctrl.Manager) error {
682682
}
683683

684684
return ctrl.NewControllerManagedBy(mgr).
685+
Named("FluentdConfig").
685686
For(&fluentdv1alpha1.Fluentd{}).
686687
Owns(&corev1.Secret{}).
687688
Watches(&fluentdv1alpha1.ClusterFluentdConfig{}, &handler.EnqueueRequestForObject{}).

0 commit comments

Comments
 (0)