From 355c76fa0644f6d3e936ae6cc04aa7cc5e51f136 Mon Sep 17 00:00:00 2001 From: Jeff Ortel Date: Tue, 2 Jul 2024 11:49:50 -0700 Subject: [PATCH] :bug: cluster refresh atomic. Signed-off-by: Jeff Ortel --- task/manager.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/task/manager.go b/task/manager.go index a6b98c90b..ac01796d0 100644 --- a/task/manager.go +++ b/task/manager.go @@ -1734,7 +1734,7 @@ func (k *Cluster) getTackle() (err error) { // getAddons func (k *Cluster) getAddons() (err error) { - k.addons = make(map[string]*crd.Addon) + mp := make(map[string]*crd.Addon) options := &k8s.ListOptions{Namespace: Settings.Namespace} list := crd.AddonList{} err = k.List( @@ -1749,12 +1749,13 @@ func (k *Cluster) getAddons() (err error) { r := &list.Items[i] k.addons[r.Name] = r } + k.addons = mp return } // getExtensions func (k *Cluster) getExtensions() (err error) { - k.extensions = make(map[string]*crd.Extension) + mp := make(map[string]*crd.Extension) options := &k8s.ListOptions{Namespace: Settings.Namespace} list := crd.ExtensionList{} err = k.List( @@ -1769,12 +1770,13 @@ func (k *Cluster) getExtensions() (err error) { r := &list.Items[i] k.extensions[r.Name] = r } + k.extensions = mp return } // getTasks kinds. func (k *Cluster) getTasks() (err error) { - k.tasks = make(map[string]*crd.Task) + mp := make(map[string]*crd.Task) options := &k8s.ListOptions{Namespace: Settings.Namespace} list := crd.TaskList{} err = k.List( @@ -1789,12 +1791,13 @@ func (k *Cluster) getTasks() (err error) { r := &list.Items[i] k.tasks[r.Name] = r } + k.tasks = mp return } // getPods func (k *Cluster) getPods() (err error) { - k.pods = make(map[string]*core.Pod) + mp := make(map[string]*core.Pod) selector := labels.NewSelector() req, _ := labels.NewRequirement(TaskLabel, selection.Exists, []string{}) selector = selector.Add(*req) @@ -1815,6 +1818,7 @@ func (k *Cluster) getPods() (err error) { r := &list.Items[i] k.pods[r.Name] = r } + k.pods = mp return }