Merge pull request #589 from sighupio/fix/diff-checker-force-error

fix: diff checker error when force flag is set

Author: kriive

cmd/diff.go

@@ -130,7 +130,7 @@ func NewDiffCmd() *cobra.Command {
 				cmdEvent.AddErrorMessage(err)
 				tracker.Track(cmdEvent)
 
-				return fmt.Errorf("error while creating diff checker: %w", err)
+				return fmt.Errorf("error while creating configuration diff checker: %w", err)
 			}
 
 			phasePath, err := getPhasePath(

internal/apis/kfd/v1alpha2/ekscluster/create/preflight.go

@@ -225,13 +225,13 @@ func (p *PreFlight) Exec(renderedConfig map[string]any) (*Status, error) {
 	if err != nil {
 		if !cluster.IsForceEnabledForFeature(p.force, cluster.ForceFeatureMigrations) {
 			return status, fmt.Errorf(
-				"error creating diff checker: %w; "+
+				"error creating configuration diff checker: %w; "+
 					"if this happened after a failed attempt at creating a cluster, retry using the \"--force migrations\" flag",
 				err,
 			)
 		}
 
-		logrus.Error("error creating diff checker, skipping: %w", err)
+		logrus.WithError(err).Warn("error creating configuration diff checker but force flag was used. Continuing")
 	} else {
 		d, err := diffChecker.GenerateDiff()
 		if err != nil {

internal/apis/kfd/v1alpha2/kfddistribution/create/preflight.go

@@ -147,13 +147,13 @@ func (p *PreFlight) Exec(renderedConfig map[string]any) (*Status, error) {
 	if err != nil {
 		if !cluster.IsForceEnabledForFeature(p.force, cluster.ForceFeatureMigrations) {
 			return status, fmt.Errorf(
-				"error creating diff checker: %w; "+
+				"error creating configuration diff checker: %w; "+
 					"if this happened after a failed attempt at creating a cluster, retry using the \"--force migrations\" flag",
 				err,
 			)
 		}
 
-		logrus.Error("error creating diff checker, skipping: %w", err)
+		logrus.WithError(err).Warn("error creating configuration diff checker but force flag was used. Continuing")
 	} else {
 		d, err := diffChecker.GenerateDiff()
 		if err != nil {

internal/apis/kfd/v1alpha2/onpremises/create/preflight.go

@@ -168,13 +168,13 @@ func (p *PreFlight) Exec(renderedConfig map[string]any) (*Status, error) {
 	if err != nil {
 		if !cluster.IsForceEnabledForFeature(p.force, cluster.ForceFeatureMigrations) {
 			return status, fmt.Errorf(
-				"error creating diff checker: %w; "+
+				"error creating configuration diff checker: %w; "+
 					"if this happened after a failed attempt at creating a cluster, retry using the \"--force migrations\" flag",
 				err,
 			)
 		}
 
-		logrus.Error("error creating diff checker, skipping: %w", err)
+		logrus.WithError(err).Warn("error creating configuration diff checker but force flag was used. Continuing")
 	} else {
 		d, err := diffChecker.GenerateDiff()
 		if err != nil {