refactor: change ScheduleManager fields to pointers for consistency and improved memory management

Signed-off-by: Evsyukov Denis <denis.evsyukov@flant.com>

Author: Evsyukov Denis

pkg/hook/controller/hook_controller.go

@@ -66,7 +66,7 @@ func (hc *HookController) InitKubernetesBindings(bindings []htypes.OnKubernetesE
 	hc.logger = logger
 }
 
-func (hc *HookController) InitScheduleBindings(bindings []htypes.ScheduleConfig, scheduleMgr schedulemanager.ScheduleManager) {
+func (hc *HookController) InitScheduleBindings(bindings []htypes.ScheduleConfig, scheduleMgr *schedulemanager.ScheduleManager) {
 	if len(bindings) == 0 {
 		return
 	}

pkg/hook/controller/schedule_bindings_controller.go

@@ -22,7 +22,7 @@ type ScheduleBindingToCrontabLink struct {
 // ScheduleBindingsController is a main implementation of KubernetesHooksController
 type ScheduleBindingsController struct {
 	// dependencies
-	scheduleManager schedulemanager.ScheduleManager
+	scheduleManager *schedulemanager.ScheduleManager
 
 	l sync.RWMutex
 	// All hooks with 'kubernetes' bindings
@@ -43,7 +43,7 @@ func (c *ScheduleBindingsController) WithScheduleBindings(bindings []htypes.Sche
 	c.ScheduleBindings = bindings
 }
 
-func (c *ScheduleBindingsController) WithScheduleManager(scheduleManager schedulemanager.ScheduleManager) {
+func (c *ScheduleBindingsController) WithScheduleManager(scheduleManager *schedulemanager.ScheduleManager) {
 	c.l.Lock()
 	c.scheduleManager = scheduleManager
 	c.l.Unlock()

pkg/hook/hook_manager.go

@@ -30,7 +30,7 @@ type Manager struct {
 	workingDir               string
 	tempDir                  string
 	kubeEventsManager        *kubeeventsmanager.KubeEventsManager
-	scheduleManager          schedulemanager.ScheduleManager
+	scheduleManager          *schedulemanager.ScheduleManager
 	conversionWebhookManager *conversion.WebhookManager
 	admissionWebhookManager  *admission.WebhookManager
 
@@ -53,7 +53,7 @@ type ManagerConfig struct {
 	WorkingDir string
 	TempDir    string
 	Kmgr       *kubeeventsmanager.KubeEventsManager
-	Smgr       schedulemanager.ScheduleManager
+	Smgr       *schedulemanager.ScheduleManager
 	Wmgr       *admission.WebhookManager
 	Cmgr       *conversion.WebhookManager
 

pkg/schedule_manager/schedule_manager.go

@@ -10,20 +10,12 @@ import (
 	smtypes "github.com/flant/shell-operator/pkg/schedule_manager/types"
 )
 
-type ScheduleManager interface {
-	Stop()
-	Start()
-	Add(entry smtypes.ScheduleEntry)
-	Remove(entry smtypes.ScheduleEntry)
-	Ch() chan string
-}
-
 type CronEntry struct {
 	EntryID cron.EntryID
 	Ids     map[string]bool
 }
 
-type scheduleManager struct {
+type ScheduleManager struct {
 	ctx        context.Context
 	cancel     context.CancelFunc
 	cron       *cron.Cron
@@ -33,11 +25,9 @@ type scheduleManager struct {
 	logger *log.Logger
 }
 
-var _ ScheduleManager = &scheduleManager{}
-
-func NewScheduleManager(ctx context.Context, logger *log.Logger) *scheduleManager {
+func NewScheduleManager(ctx context.Context, logger *log.Logger) *ScheduleManager {
 	cctx, cancel := context.WithCancel(ctx)
-	sm := &scheduleManager{
+	sm := &ScheduleManager{
 		ctx:        cctx,
 		cancel:     cancel,
 		ScheduleCh: make(chan string, 1),
@@ -49,7 +39,7 @@ func NewScheduleManager(ctx context.Context, logger *log.Logger) *scheduleManage
 	return sm
 }
 
-func (sm *scheduleManager) Stop() {
+func (sm *ScheduleManager) Stop() {
 	if sm.cancel != nil {
 		sm.cancel()
 	}
@@ -58,7 +48,7 @@ func (sm *scheduleManager) Stop() {
 // Add create entry for crontab and id and start scheduled function.
 // Crontab string should be validated with cron.Parse
 // function before pass to Add.
-func (sm *scheduleManager) Add(newEntry smtypes.ScheduleEntry) {
+func (sm *ScheduleManager) Add(newEntry smtypes.ScheduleEntry) {
 	logEntry := sm.logger.With("operator.component", "scheduleManager")
 
 	cronEntry, hasCronEntry := sm.Entries[newEntry.Crontab]
@@ -89,7 +79,7 @@ func (sm *scheduleManager) Add(newEntry smtypes.ScheduleEntry) {
 	}
 }
 
-func (sm *scheduleManager) Remove(delEntry smtypes.ScheduleEntry) {
+func (sm *ScheduleManager) Remove(delEntry smtypes.ScheduleEntry) {
 	cronEntry, hasCronEntry := sm.Entries[delEntry.Crontab]
 
 	// Nothing to Remove
@@ -115,14 +105,14 @@ func (sm *scheduleManager) Remove(delEntry smtypes.ScheduleEntry) {
 	}
 }
 
-func (sm *scheduleManager) Start() {
+func (sm *ScheduleManager) Start() {
 	sm.cron.Start()
 	go func() {
 		<-sm.ctx.Done()
 		sm.cron.Stop()
 	}()
 }
 
-func (sm *scheduleManager) Ch() chan string {
+func (sm *ScheduleManager) Ch() chan string {
 	return sm.ScheduleCh
 }

pkg/shell-operator/manager_events_handler.go

@@ -16,7 +16,7 @@ import (
 type managerEventsHandlerConfig struct {
 	tqs  *queue.TaskQueueSet
 	mgr  *kubeeventsmanager.KubeEventsManager
-	smgr schedulemanager.ScheduleManager
+	smgr *schedulemanager.ScheduleManager
 
 	logger *log.Logger
 }
@@ -26,7 +26,7 @@ type ManagerEventsHandler struct {
 	cancel context.CancelFunc
 
 	kubeEventsManager *kubeeventsmanager.KubeEventsManager
-	scheduleManager   schedulemanager.ScheduleManager
+	scheduleManager   *schedulemanager.ScheduleManager
 
 	kubeEventCb func(kubeEvent kemtypes.KubeEvent) []task.Task
 	scheduleCb  func(crontab string) []task.Task

pkg/shell-operator/operator.go

@@ -47,7 +47,7 @@ type ShellOperator struct {
 	KubeClient        *klient.Client
 	ObjectPatcher     *objectpatch.ObjectPatcher
 
-	ScheduleManager   schedulemanager.ScheduleManager
+	ScheduleManager   *schedulemanager.ScheduleManager
 	KubeEventsManager *kubeeventsmanager.KubeEventsManager
 
 	TaskQueues *queue.TaskQueueSet

test/hook/context/generator.go

@@ -36,7 +36,7 @@ type BindingContextController struct {
 
 	Controller        *StateController
 	KubeEventsManager *kubeeventsmanager.KubeEventsManager
-	ScheduleManager   schedulemanager.ScheduleManager
+	ScheduleManager   *schedulemanager.ScheduleManager
 
 	fakeCluster *fake.Cluster