diff --git a/controllers/soot/controllers/coredns.go b/controllers/soot/controllers/coredns.go index 81b10c3..43a881e 100644 --- a/controllers/soot/controllers/coredns.go +++ b/controllers/soot/controllers/coredns.go @@ -73,6 +73,7 @@ func (c *CoreDNS) Reconcile(ctx context.Context, request reconcile.Request) (rec func (c *CoreDNS) SetupWithManager(mgr manager.Manager) error { c.logger = mgr.GetLogger().WithName("coredns") + c.TriggerChannel = make(chan event.GenericEvent) return controllerruntime.NewControllerManagedBy(mgr). For(&rbacv1.ClusterRoleBinding{}, builder.WithPredicates(predicate.NewPredicateFuncs(func(object client.Object) bool { diff --git a/controllers/soot/controllers/konnectivity.go b/controllers/soot/controllers/konnectivity.go index 746293e..b3ef0d2 100644 --- a/controllers/soot/controllers/konnectivity.go +++ b/controllers/soot/controllers/konnectivity.go @@ -74,6 +74,7 @@ func (k *KonnectivityAgent) Reconcile(ctx context.Context, _ reconcile.Request) func (k *KonnectivityAgent) SetupWithManager(mgr manager.Manager) error { k.logger = mgr.GetLogger().WithName("konnectivity_agent") + k.TriggerChannel = make(chan event.GenericEvent) return controllerruntime.NewControllerManagedBy(mgr). For(&appsv1.DaemonSet{}, builder.WithPredicates(predicate.NewPredicateFuncs(func(object client.Object) bool { diff --git a/controllers/soot/controllers/kubeadm_phase.go b/controllers/soot/controllers/kubeadm_phase.go index c5535a9..fc01ad0 100644 --- a/controllers/soot/controllers/kubeadm_phase.go +++ b/controllers/soot/controllers/kubeadm_phase.go @@ -63,6 +63,7 @@ func (k *KubeadmPhase) Reconcile(ctx context.Context, _ reconcile.Request) (reco func (k *KubeadmPhase) SetupWithManager(mgr manager.Manager) error { k.logger = mgr.GetLogger().WithName(k.Phase.GetName()) + k.TriggerChannel = make(chan event.GenericEvent) return controllerruntime.NewControllerManagedBy(mgr). For(k.Phase.GetWatchedObject(), builder.WithPredicates(predicate.NewPredicateFuncs(k.Phase.GetPredicateFunc()))). diff --git a/controllers/soot/controllers/kubeproxy.go b/controllers/soot/controllers/kubeproxy.go index 5c2b9de..411fdd9 100644 --- a/controllers/soot/controllers/kubeproxy.go +++ b/controllers/soot/controllers/kubeproxy.go @@ -73,6 +73,7 @@ func (k *KubeProxy) Reconcile(ctx context.Context, _ reconcile.Request) (reconci func (k *KubeProxy) SetupWithManager(mgr manager.Manager) error { k.logger = mgr.GetLogger().WithName("kube_proxy") + k.TriggerChannel = make(chan event.GenericEvent) return controllerruntime.NewControllerManagedBy(mgr). For(&rbacv1.ClusterRoleBinding{}, builder.WithPredicates(predicate.NewPredicateFuncs(func(object client.Object) bool { diff --git a/controllers/soot/controllers/migrate.go b/controllers/soot/controllers/migrate.go index 4d00bc1..ed516ea 100644 --- a/controllers/soot/controllers/migrate.go +++ b/controllers/soot/controllers/migrate.go @@ -134,6 +134,7 @@ func (m *Migrate) createOrUpdate(ctx context.Context) error { func (m *Migrate) SetupWithManager(mgr manager.Manager) error { m.client = mgr.GetClient() m.logger = mgr.GetLogger().WithName("migrate") + m.TriggerChannel = make(chan event.GenericEvent) return controllerruntime.NewControllerManagedBy(mgr). For(&admissionregistrationv1.ValidatingWebhookConfiguration{}, builder.WithPredicates(predicate.NewPredicateFuncs(func(object client.Object) bool { diff --git a/controllers/soot/manager.go b/controllers/soot/manager.go index 87986d6..6e43fa0 100644 --- a/controllers/soot/manager.go +++ b/controllers/soot/manager.go @@ -149,7 +149,6 @@ func (m *Manager) Reconcile(ctx context.Context, request reconcile.Request) (res WebhookServiceName: m.MigrateServiceNamespace, WebhookCABundle: m.MigrateCABundle, GetTenantControlPlaneFunc: m.retrieveTenantControlPlane(tcpCtx, request), - TriggerChannel: make(chan event.GenericEvent), } if err = migrate.SetupWithManager(mgr); err != nil { return reconcile.Result{}, err @@ -158,7 +157,6 @@ func (m *Manager) Reconcile(ctx context.Context, request reconcile.Request) (res konnectivityAgent := &controllers.KonnectivityAgent{ AdminClient: m.AdminClient, GetTenantControlPlaneFunc: m.retrieveTenantControlPlane(tcpCtx, request), - TriggerChannel: make(chan event.GenericEvent), } if err = konnectivityAgent.SetupWithManager(mgr); err != nil { return reconcile.Result{}, err @@ -167,7 +165,6 @@ func (m *Manager) Reconcile(ctx context.Context, request reconcile.Request) (res kubeProxy := &controllers.KubeProxy{ AdminClient: m.AdminClient, GetTenantControlPlaneFunc: m.retrieveTenantControlPlane(tcpCtx, request), - TriggerChannel: make(chan event.GenericEvent), } if err = kubeProxy.SetupWithManager(mgr); err != nil { return reconcile.Result{}, err @@ -176,7 +173,6 @@ func (m *Manager) Reconcile(ctx context.Context, request reconcile.Request) (res coreDNS := &controllers.CoreDNS{ AdminClient: m.AdminClient, GetTenantControlPlaneFunc: m.retrieveTenantControlPlane(tcpCtx, request), - TriggerChannel: make(chan event.GenericEvent), } if err = coreDNS.SetupWithManager(mgr); err != nil { return reconcile.Result{}, err @@ -184,7 +180,6 @@ func (m *Manager) Reconcile(ctx context.Context, request reconcile.Request) (res uploadKubeadmConfig := &controllers.KubeadmPhase{ GetTenantControlPlaneFunc: m.retrieveTenantControlPlane(tcpCtx, request), - TriggerChannel: make(chan event.GenericEvent), Phase: &resources.KubeadmPhase{ Client: m.AdminClient, Phase: resources.PhaseUploadConfigKubeadm, @@ -207,7 +202,6 @@ func (m *Manager) Reconcile(ctx context.Context, request reconcile.Request) (res bootstrapToken := &controllers.KubeadmPhase{ GetTenantControlPlaneFunc: m.retrieveTenantControlPlane(tcpCtx, request), - TriggerChannel: make(chan event.GenericEvent), Phase: &resources.KubeadmPhase{ Client: m.AdminClient, Phase: resources.PhaseBootstrapToken,