add --force flag to alpha update command

This commit adds the --force flag to the alpha update command,
as well as e2e tests for it. The --force flag makes it possible to
run the alpha update command in CI workflows.

Author: vitorfloriano

pkg/cli/alpha/internal/update/update.go

@@ -38,6 +38,8 @@ type Update struct {
 	ToVersion string
 	// FromBranch stores the branch to update from, e.g., "main".
 	FromBranch string
+	// Force commits the update changes even with merge conflicts
+	Force bool
 
 	// UpdateBranches
 	AncestorBranch string
@@ -334,8 +336,12 @@ func (opts *Update) mergeOriginalToUpgrade() error {
 		var exitErr *exec.ExitError
 		// If the merge has an error that is not a conflict, return an error 2
 		if errors.As(err, &exitErr) && exitErr.ExitCode() == 1 {
-			log.Warn("Merge completed with conflicts. Manual resolution required.")
 			hasConflicts = true
+			if !opts.Force {
+				log.Error("Merge conflicts detected. Resolve them manually in the merge branch.")
+				return fmt.Errorf("merge aborted due to conflicts")
+			}
+			log.Warn("Merge completed with conflicts. Conflict markers will be committed.")
 		} else {
 			return fmt.Errorf("merge failed unexpectedly: %w", err)
 		}

pkg/cli/alpha/update.go

@@ -49,9 +49,8 @@ The process uses Git branches:
   - upgrade: scaffold from the target version
   - merge: result of the 3-way merge
 
-If conflicts occur during the merge, resolve them manually in the 'merge' branch. 
-Once resolved, commit and push it as a pull request. This branch will contain the 
-final upgraded project with the latest Kubebuilder layout and your custom code.
+If conflicts occur during the merge, the command will abort and leave the merge branch for manual resolution.
+Use --force to commit conflicts with markers instead. 
 
 Examples:
   # Update from the version specified in the PROJECT file to the latest release
@@ -63,6 +62,9 @@ Examples:
   # Update from a specific version to an specific release
   kubebuilder alpha update --from-version v4.5.0 --to-version v4.7.0	
 
+  # Force update even with merge conflicts (commit conflict markers)
+  kubebuilder alpha update --force
+
 `,
 
 		PreRunE: func(_ *cobra.Command, _ []string) error {
@@ -92,5 +94,9 @@ Examples:
 	updateCmd.Flags().StringVar(&opts.FromBranch, "from-branch", "",
 		"Git branch to use as current state of the project for the update.")
 
+	updateCmd.Flags().BoolVar(&opts.Force, "force", false,
+		"Force the update even if merge conflicts occur. When conflicts are detected "+
+			"the command will commit the merge with conflict markers instead of aborting.")
+
 	return updateCmd
 }

test/e2e/alphaupdate/update_test.go

@@ -24,6 +24,7 @@ import (
 	"os/exec"
 	"path/filepath"
 	"runtime"
+	"strings"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -105,6 +106,51 @@ var _ = Describe("kubebuilder", func() {
 			By("validating custom code preservation")
 			validateCustomCodePreservation(mockProjectDir)
 		})
+
+		It("should abort on merge conflicts when --force is not used", func() {
+			By("creating mock project with kubebuilder v4.5.2")
+			createMockProject(mockProjectDir, binFromVersionPath)
+
+			By("injecting conflicting code that will cause merge conflicts")
+			injectConflictingCode(mockProjectDir)
+
+			By("initializing git repository and committing mock project")
+			initializeGitRepo(mockProjectDir)
+
+			By("running alpha update without --force flag")
+			cmd := exec.Command(kbc.BinaryName, "alpha", "update",
+				"--from-version", fromVersion, "--to-version", toVersion, "--from-branch", "main")
+			cmd.Dir = mockProjectDir
+			output, err := cmd.CombinedOutput()
+
+			By("expecting the command to fail due to merge conflicts")
+			Expect(err).To(HaveOccurred())
+			Expect(string(output)).To(ContainSubstring("Merge conflicts detected"))
+			Expect(string(output)).To(ContainSubstring("merge aborted due to conflicts"))
+		})
+
+		It("should commit with conflict markers when --force is used", func() {
+			By("creating mock project with kubebuilder v4.5.2")
+			createMockProject(mockProjectDir, binFromVersionPath)
+
+			By("injecting conflicting code that will cause merge conflicts")
+			injectConflictingCode(mockProjectDir)
+
+			By("initializing git repository and committing mock project")
+			initializeGitRepo(mockProjectDir)
+
+			By("running alpha update with --force flag")
+			cmd := exec.Command(kbc.BinaryName, "alpha", "update",
+				"--from-version", fromVersion, "--to-version", toVersion, "--from-branch", "main", "--force")
+			cmd.Dir = mockProjectDir
+			output, err := cmd.CombinedOutput()
+
+			By("expecting the command to succeed despite conflicts")
+			Expect(err).NotTo(HaveOccurred(), fmt.Sprintf("Alpha update with --force failed: %s", string(output)))
+
+			By("validating that conflict markers are present in the merged files")
+			validateConflictMarkers(mockProjectDir)
+		})
 	})
 })
 
@@ -283,3 +329,27 @@ func validateCustomCodePreservation(projectDir string) {
 	Expect(string(content)).To(ContainSubstring("log.Info(\"Reconciling TestOperator\")"))
 	Expect(string(content)).To(ContainSubstring("log.Info(\"TestOperator size\", \"size\", testOperator.Spec.Size)"))
 }
+
+func injectConflictingCode(projectDir string) {
+	// Modify Makefile to create conflicts
+	makefilePath := filepath.Join(projectDir, "Makefile")
+	content, err := os.ReadFile(makefilePath)
+	Expect(err).NotTo(HaveOccurred())
+
+	conflictingContent := string(content) + "\n# Conflicting content\nconflict-target:\n\t@echo conflict\n"
+	err = os.WriteFile(makefilePath, []byte(conflictingContent), 0644)
+	Expect(err).NotTo(HaveOccurred())
+}
+
+func validateConflictMarkers(projectDir string) {
+	makefilePath := filepath.Join(projectDir, "Makefile")
+	content, err := os.ReadFile(makefilePath)
+	Expect(err).NotTo(HaveOccurred())
+	
+	contentStr := string(content)
+	hasMarkers := strings.Contains(contentStr, "<<<<<<<") || 
+		strings.Contains(contentStr, "=======") || 
+		strings.Contains(contentStr, ">>>>>>>")
+	
+	Expect(hasMarkers).To(BeTrue(), "Expected conflict markers in merged files")
+}