Merge pull request #4961 from camilamacedo86/patch-release

🌱 Prepare: Patch release 4.7.1

Author: k8s-ci-robot

docs/book/src/cronjob-tutorial/testdata/project/test/utils/utils.go

@@ -111,6 +111,19 @@ func UninstallCertManager() {
 	if _, err := Run(cmd); err != nil {
 		warnError(err)
 	}
+
+	// Delete leftover leases in kube-system (not cleaned by default)
+	kubeSystemLeases := []string{
+		"cert-manager-cainjector-leader-election",
+		"cert-manager-controller",
+	}
+	for _, lease := range kubeSystemLeases {
+		cmd = exec.Command("kubectl", "delete", "lease", lease,
+			"-n", "kube-system", "--ignore-not-found", "--force", "--grace-period=0")
+		if _, err := Run(cmd); err != nil {
+			warnError(err)
+		}
+	}
 }
 
 // InstallCertManager installs the cert manager bundle.

docs/book/src/getting-started/testdata/project/test/utils/utils.go

@@ -111,6 +111,19 @@ func UninstallCertManager() {
 	if _, err := Run(cmd); err != nil {
 		warnError(err)
 	}
+
+	// Delete leftover leases in kube-system (not cleaned by default)
+	kubeSystemLeases := []string{
+		"cert-manager-cainjector-leader-election",
+		"cert-manager-controller",
+	}
+	for _, lease := range kubeSystemLeases {
+		cmd = exec.Command("kubectl", "delete", "lease", lease,
+			"-n", "kube-system", "--ignore-not-found", "--force", "--grace-period=0")
+		if _, err := Run(cmd); err != nil {
+			warnError(err)
+		}
+	}
 }
 
 // InstallCertManager installs the cert manager bundle.

docs/book/src/multiversion-tutorial/testdata/project/test/utils/utils.go

@@ -111,6 +111,19 @@ func UninstallCertManager() {
 	if _, err := Run(cmd); err != nil {
 		warnError(err)
 	}
+
+	// Delete leftover leases in kube-system (not cleaned by default)
+	kubeSystemLeases := []string{
+		"cert-manager-cainjector-leader-election",
+		"cert-manager-controller",
+	}
+	for _, lease := range kubeSystemLeases {
+		cmd = exec.Command("kubectl", "delete", "lease", lease,
+			"-n", "kube-system", "--ignore-not-found", "--force", "--grace-period=0")
+		if _, err := Run(cmd); err != nil {
+			warnError(err)
+		}
+	}
 }
 
 // InstallCertManager installs the cert manager bundle.

docs/book/src/reference/commands/alpha_update.md

@@ -61,6 +61,12 @@ kubebuilder alpha update \
   --from-branch=main
 ```
 
+Force update even with merge conflicts:
+
+```sh
+kubebuilder alpha update --force
+```
+
 <aside class="note warning">
 <h1>You might need to upgrade your project first</h1>
 
@@ -81,17 +87,58 @@ Once updated, you can use `kubebuilder alpha update` for future upgrades.
 | `--from-version`    | **Required for projects initialized with versions earlier than v4.6.0.** Kubebuilder version your project was created with. If unset, uses the `PROJECT` file. |
 | `--to-version`      | Version to upgrade to. Defaults to the latest version.                                                                                                         |
 | `--from-branch`     | Git branch that contains your current project code. Defaults to `main`.                                                                                        |
+| `--force`           | Force the update even if conflicts occur. Conflicted files will include conflict markers, and a commit will be created automatically. Ideal for automation (e.g., cronjobs, CI).                                                                       |
 | `-h, --help`        | Show help for this command.                                                                                                                                    |
-
-<aside class="note warning">
-<h1>Projects generated with </h1>
-
+<aside class="note">
 Projects generated with **Kubebuilder v4.6.0** or later include the `cliVersion` field in the `PROJECT` file.
 This field is used by `kubebuilder alpha update` to determine the correct CLI
 version for upgrading your project.
+</aside>
+
+## Merge Conflicts with `--force`
+
+When you use the `--force` flag with `kubebuilder alpha update`, Git will complete the merge even if there are conflicts. The resulting commit will include conflict markers like:
+```
+<<<<<<< HEAD
+Your changes
+=======
+Incoming changes
+>>>>>>> branch-name
+```
+These conflicts will be committed in the
+`tmp-kb-update-merge` branch.
 
+<aside class="note warning">
+You must manually resolve these conflicts before merging into your main branch.
+
+```suggestion
+<aside class="note warning">
+<H1>If you face conflicts (using or not the --force flag) </H1>
+If the merge introduces conflicts, you must resolve them and **ensure** you execute the following command to regenerate the manifests and organise the files properly:
+
+```bash
+make manifests generate fmt vet lint-fix
+```
+
+Alternatively, you may want to run:
+
+```bash
+make all
+```
 </aside>
 
+
+## When to Use `--force`
+Use `--force` only in scenarios like:
+- Automated environments (e.g., CI pipelines or cron jobs)
+- When you need to create a PR even if conflicts are present
+- When a human will resolve the conflicts later
+`kubebuilder alpha update --force`
+
+This ensures the update proceeds without manual blocking but shifts responsibility for conflict resolution to a follow-up manual step.
+
+This approach is typically used in automation workflows where conflict markers are later addressed by a human, or where preserving the conflicting changes is acceptable for follow-up processing.
+
 ## Requirements
 
 - A valid [PROJECT][project-config] file at the root of your project

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

@@ -75,7 +75,7 @@ func (opts *Update) defineFromVersion(config store.Store) (string, error) {
 
 func (opts *Update) defineToVersion() string {
 	if len(opts.ToVersion) != 0 {
-		if !strings.HasPrefix(opts.FromVersion, "v") {
+		if !strings.HasPrefix(opts.ToVersion, "v") {
 			return "v" + opts.ToVersion
 		}
 		return opts.ToVersion

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,15 @@ 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.Warn("Merge stopped due to conflicts. Manual resolution is required.")
+				log.Warn("After resolving the conflicts, run the following command:")
+				log.Warn("    make manifests generate fmt vet lint-fix")
+				log.Warn("This ensures manifests and generated files are up to date, and the project layout remains consistent.")
+				return fmt.Errorf("merge stopped 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 stop 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 conflicts occur. Conflicted files will include conflict markers, and a "+
+			"commit will be created automatically. Ideal for automation (e.g., cronjobs, CI).")
+
 	return updateCmd
 }

pkg/machinery/scaffold.go

@@ -25,6 +25,7 @@ import (
 	"strings"
 	"text/template"
 
+	log "github.com/sirupsen/logrus"
 	"github.com/spf13/afero"
 	"golang.org/x/tools/imports"
 
@@ -236,7 +237,15 @@ func doTemplate(t Template) ([]byte, error) {
 func (s Scaffold) updateFileModel(i Inserter, models map[string]*File) error {
 	m, err := s.loadPreviousModel(i, models)
 	if err != nil {
-		return fmt.Errorf("failed to load previous model: %w", err)
+		// TODO(kubebuilder/issues/4960): Create Machinery implementation to allow defining IfNotExistsAction
+		// If the file path starts with test/, warn and skip
+		// Workaround to allow projects be backwards compatible with previous versions
+		if strings.HasPrefix(i.GetPath(), "test/") {
+			log.Warnf("Skipping missing test file: %s", i.GetPath())
+			log.Warn("The code fragments will not be inserted.")
+			return nil
+		}
+		return fmt.Errorf("failed to load previous model for %s: %w", i.GetPath(), err)
 	}
 
 	// Get valid code fragments

pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e/test.go

@@ -17,9 +17,13 @@ limitations under the License.
 package e2e
 
 import (
+	"bytes"
 	"fmt"
+	"os"
 	"path/filepath"
 
+	log "github.com/sirupsen/logrus"
+
 	"sigs.k8s.io/kubebuilder/v4/pkg/machinery"
 )
 
@@ -77,41 +81,58 @@ func (f *WebhookTestUpdater) GetMarkers() []machinery.Marker {
 
 // GetCodeFragments implements file.Inserter
 func (f *WebhookTestUpdater) GetCodeFragments() machinery.CodeFragmentsMap {
-	codeFragments := machinery.CodeFragmentsMap{}
 	if !f.WireWebhook {
 		return nil
 	}
-	codeFragments[machinery.NewMarkerFor(f.GetPath(), webhookChecksMarker)] = append(
-		codeFragments[machinery.NewMarkerFor(f.GetPath(), webhookChecksMarker)],
-		webhookChecksFragment,
-	)
-
-	if f.Resource != nil && f.Resource.HasDefaultingWebhook() {
-		mutatingWebhookCode := fmt.Sprintf(mutatingWebhookChecksFragment, f.ProjectName)
-		codeFragments[machinery.NewMarkerFor(f.GetPath(), webhookChecksMarker)] = append(
-			codeFragments[machinery.NewMarkerFor(f.GetPath(), webhookChecksMarker)],
-			mutatingWebhookCode,
-		)
+
+	filePath := f.GetPath()
+
+	content, err := os.ReadFile(filePath)
+	if err != nil {
+		log.Warnf("Unable to read %q: %v", filePath, err)
+		log.Warnf("Webhook test code injection will be skipped for this file.")
+		log.Warnf("This typically occurs when the file was removed and is missing.")
+		log.Warnf("If you intend to scaffold webhook tests, ensure the file and its markers exist.")
+		return nil
 	}
 
-	if f.Resource.HasValidationWebhook() {
-		validatingWebhookCode := fmt.Sprintf(validatingWebhookChecksFragment, f.ProjectName)
-		codeFragments[machinery.NewMarkerFor(f.GetPath(), webhookChecksMarker)] = append(
-			codeFragments[machinery.NewMarkerFor(f.GetPath(), webhookChecksMarker)],
-			validatingWebhookCode,
-		)
+	codeFragments := machinery.CodeFragmentsMap{}
+	markers := f.GetMarkers()
+
+	for _, marker := range markers {
+		if !bytes.Contains(content, []byte(marker.String())) {
+			log.Warnf("Marker %q not found in %s; skipping injection of webhook test code",
+				marker.String(), filePath)
+			continue // skip this marker
+		}
+
+		var fragments []string
+		fragments = append(fragments, webhookChecksFragment)
+
+		if f.Resource != nil && f.Resource.HasDefaultingWebhook() {
+			mutatingWebhookCode := fmt.Sprintf(mutatingWebhookChecksFragment, f.ProjectName)
+			fragments = append(fragments, mutatingWebhookCode)
+		}
+
+		if f.Resource != nil && f.Resource.HasValidationWebhook() {
+			validatingWebhookCode := fmt.Sprintf(validatingWebhookChecksFragment, f.ProjectName)
+			fragments = append(fragments, validatingWebhookCode)
+		}
+
+		if f.Resource != nil && f.Resource.HasConversionWebhook() {
+			conversionWebhookCode := fmt.Sprintf(
+				conversionWebhookChecksFragment,
+				f.Resource.Kind,
+				f.Resource.Plural+"."+f.Resource.Group+"."+f.Resource.Domain,
+			)
+			fragments = append(fragments, conversionWebhookCode)
+		}
+
+		codeFragments[marker] = fragments
 	}
 
-	if f.Resource.HasConversionWebhook() {
-		conversionWebhookCode := fmt.Sprintf(
-			conversionWebhookChecksFragment,
-			f.Resource.Kind,
-			f.Resource.Plural+"."+f.Resource.Group+"."+f.Resource.Domain,
-		)
-		codeFragments[machinery.NewMarkerFor(f.GetPath(), webhookChecksMarker)] = append(
-			codeFragments[machinery.NewMarkerFor(f.GetPath(), webhookChecksMarker)],
-			conversionWebhookCode,
-		)
+	if len(codeFragments) == 0 {
+		return nil
 	}
 
 	return codeFragments

pkg/plugins/golang/v4/scaffolds/internal/templates/test/utils/utils.go

@@ -139,6 +139,19 @@ func UninstallCertManager() {
 	if _, err := Run(cmd); err != nil {
 		warnError(err)
 	}
+
+	// Delete leftover leases in kube-system (not cleaned by default)
+	kubeSystemLeases := []string{
+		"cert-manager-cainjector-leader-election",
+		"cert-manager-controller",
+	}
+	for _, lease := range kubeSystemLeases {
+		cmd = exec.Command("kubectl", "delete", "lease", lease,
+			"-n", "kube-system", "--ignore-not-found", "--force", "--grace-period=0")
+		if _, err := Run(cmd); err != nil {
+			warnError(err)
+		}
+	}
 }
 
 // InstallCertManager installs the cert manager bundle.