Merge remote-tracking branch 'origin/main' into k0s-1-29

laverya · laverya · commit 81776609aca2 · 2024-10-23T18:45:40.000-04:00
diff --git a/operator/pkg/upgrade/installation.go b/operator/pkg/upgrade/installation.go
@@ -54,7 +54,7 @@ func setInstallationState(ctx context.Context, cli client.Client, name string, s
 		return nil
 	})
 	if err != nil {
-		return fmt.Errorf("failed to set installation state after 5 attempts %w", err)
+		return fmt.Errorf("persistent conflict error, failed to update installation %s status: %w", name, err)
 	}
 
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ func setInstallationState(ctx context.Context, cli client.Client, name string, s`
`54`	`54`	`return nil`
`55`	`55`	`})`
`56`	`56`	`if err != nil {`
`57`		`- return fmt.Errorf("failed to set installation state after 5 attempts %w", err)`
	`57`	`+ return fmt.Errorf("persistent conflict error, failed to update installation %s status: %w", name, err)`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`return nil`