Returning error from saveUpgradeGraph()

pkg/release-controller/upgrades.go

@@ -273,7 +273,10 @@ func syncGraphToSecret(graph *UpgradeGraph, update bool, secretClient kv1core.Se
 	buf := &bytes.Buffer{}
 	wait.Until(func() {
 		buf.Reset()
-		saveUpgradeGraph(buf, graph, secretClient, ns, name)
+		err := saveUpgradeGraph(buf, graph, secretClient, ns, name)
+		if err != nil {
+			klog.Errorf("Unable to save upgrade graph: %v", err)
+		}
 	}, 5*time.Minute, stopCh)
 }
 
@@ -302,24 +305,23 @@ func loadUpgradeGraph(graph *UpgradeGraph, secretClient kv1core.SecretInterface,
 	}, stopCh)
 }
 
-func saveUpgradeGraph(buf *bytes.Buffer, graph *UpgradeGraph, secretClient kv1core.SecretInterface, ns, name string) {
+func saveUpgradeGraph(buf *bytes.Buffer, graph *UpgradeGraph, secretClient kv1core.SecretInterface, ns, name string) error {
 	if err := graph.Save(buf); err != nil {
-		klog.Errorf("Unable to calculate graph state: %v", err)
-		return
+		return fmt.Errorf("unable to calculate graph state: %v", err)
 	}
 	secret, err := secretClient.Get(context.TODO(), name, metav1.GetOptions{})
 	if err != nil {
-		klog.Errorf("Can't read latest secret %s/%s: %v", ns, name, err)
-		return
+		return fmt.Errorf("can't read latest secret %s/%s: %v", ns, name, err)
 	}
 	if secret.Data == nil {
 		secret.Data = make(map[string][]byte)
 	}
 	secret.Data["latest"] = buf.Bytes()
 	if _, err := secretClient.Update(context.TODO(), secret, metav1.UpdateOptions{}); err != nil {
-		klog.Errorf("Can't save state to secret %s/%s: %v", ns, name, err)
+		return fmt.Errorf("can't save state to secret %s/%s: %v", ns, name, err)
 	}
 	klog.V(2).Infof("Saved upgrade graph state to %s/%s", ns, name)
+	return nil
 }
 
 func (g *UpgradeGraph) orderedRecords() []UpgradeRecord {
@@ -412,7 +414,10 @@ func (c *Controller) pruneGraph(secretClient kv1core.SecretInterface, ns, name s
 
 	if confirm {
 		buf := &bytes.Buffer{}
-		saveUpgradeGraph(buf, c.graph, secretClient, ns, name)
+		err = saveUpgradeGraph(buf, c.graph, secretClient, ns, name)
+		if err != nil {
+			return err
+		}
 	} else {
 		switch printOption {
 		case PruneGraphPrintDebug: