Merge branch 'main' into release/v0.41.x

Author: stefanprodan

docs/spec/v1beta2/imageupdateautomations.md

@@ -558,7 +558,13 @@ destination reference. An example of a valid refspec is
 If both `.push.refspec` and `.push.branch` are specified, then the reconciler
 will push to both the destinations. This is particularly useful for working with
 Gerrit servers. For more information about this, please refer to the
-[Gerrit](#gerrit) section. 
+[Gerrit](#gerrit) section. This can also be used to automatically open
+Pull-Requests in Gitea or Forgejo. See the [Gitea](#gitea) section for
+an example.
+
+If only `.push.refspec` is set, without explicitly defining a `.push.branch`, the
+controller falls back to pushing to the branch from `checkoutRef` and *also*
+pushes to `.push.refspec`.
 
 **Note:** If both `.push.refspec` and `.push.branch` are essentially equal to
 each other (for e.g.: `.push.refspec: refs/heads/main:refs/heads/main` and
@@ -958,6 +964,42 @@ image tag to a different one, it leads to a distinct Change-Id for the commit.
 Consequently, this action will trigger the creation of an additional Change,
 even when an existing Change containing outdated modifications remains open.
 
+#### Gitea
+
+[Gitea](https://docs.gitea.com/usage/agit) and [Forgejo](https://forgejo.org/docs/latest/user/agit-support/) each implement the AGit-Workflow.
+This means, the image-automation-controller is able to open a pull-request by
+pushing to a `refspec` like `HEAD:refs/for/main` with the apropriate [push-options](#push-options).
+
+The following example opens a PR on a Gitea or Forgejo-Server:
+
+```yaml
+apiVersion: image.toolkit.fluxcd.io/v1beta2
+kind: ImageUpdateAutomation
+metadata:
+  name: my-automation
+  namespace: flux-system
+spec:
+  git:
+    checkout:
+      ref:
+        branch: main
+    push:
+      branch: flux-updates
+      refspec: refs/heads/flux-updates:refs/for/main
+      options:
+        topic: flux-updates
+        title: Flux Image Update
+        description: |-
+          This PR is automatically opened by the fluxcd *image-automation-controller*
+    commit:
+      author:
+        email: [email protected]
+        name: fluxcd
+      messageTemplate: '{{range .Changed.Changes}}{{print .OldValue}} -> {{println
+        .NewValue}}{{end}}'
+```
+
+
 ## ImageUpdateAutomation Status
 
 ### Observed Policies

internal/controller/imageupdateautomation_controller.go

@@ -396,6 +396,10 @@ func (r *ImageUpdateAutomationReconciler) reconcile(ctx context.Context, sp *pat
 	if r.features[features.GitShallowClone] {
 		checkoutOpts = append(checkoutOpts, source.WithCheckoutOptionShallowClone())
 	}
+	if r.features[features.GitSparseCheckout] && obj.Spec.Update.Path != "" {
+		checkoutOpts = append(checkoutOpts, source.WithCheckoutOptionSparseCheckoutDirectories(obj.Spec.Update.Path))
+	}
+
 	// If full sync is still not needed, configure last observed commit to
 	// perform optimized clone and obtain a non-concrete commit if the remote
 	// has not changed.

internal/features/features.go

@@ -34,6 +34,9 @@ const (
 	// GitAllBranchReferences enables the download of all branch head references
 	// when push branches are configured. When enabled fixes fluxcd/flux2#3384.
 	GitAllBranchReferences = "GitAllBranchReferences"
+	// GitSparseCheckout enables the use of sparse checkout when pulling source from
+	// Git repositories.
+	GitSparseCheckout = "GitSparseCheckout"
 	// CacheSecretsAndConfigMaps controls whether Secrets and ConfigMaps should
 	// be cached.
 	//
@@ -55,6 +58,10 @@ var features = map[string]bool{
 	// opt-out from v0.28
 	GitAllBranchReferences: true,
 
+	// GitSparseCheckout
+	// opt-in from v0.42
+	GitSparseCheckout: false,
+
 	// CacheSecretsAndConfigMaps
 	// opt-in from v0.29
 	CacheSecretsAndConfigMaps: false,

internal/source/source.go

@@ -21,6 +21,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"path/filepath"
 	"strings"
 	"text/template"
 	"time"
@@ -196,6 +197,19 @@ func WithCheckoutOptionShallowClone() CheckoutOption {
 	}
 }
 
+// WithCheckoutOptionSparseCheckoutDirectories is a CheckoutOption option to configure
+// SparseCheckoutDirectories.
+func WithCheckoutOptionSparseCheckoutDirectories(updatePath string) CheckoutOption {
+	return func(cc *repository.CloneConfig) {
+		cleanedPath := filepath.Clean(updatePath)
+		if cleanedPath == "." {
+			// Do not set SparseCheckoutDirectories if repository root is specified
+			return
+		}
+		cc.SparseCheckoutDirectories = []string{cleanedPath}
+	}
+}
+
 // CheckoutSource clones and checks out the source. If a push branch is
 // configured that doesn't match with the checkout branch, a checkout to the
 // push branch is also performed. This ensures any change and push operation

internal/source/source_test.go

@@ -222,13 +222,14 @@ func TestSourceManager_CheckoutSource(t *testing.T) {
 
 func test_sourceManager_CheckoutSource(t *testing.T, proto string) {
 	tests := []struct {
-		name         string
-		autoGitSpec  *imagev1.GitSpec
-		gitRepoRef   *sourcev1.GitRepositoryRef
-		shallowClone bool
-		lastObserved bool
-		wantErr      bool
-		wantRef      string
+		name                    string
+		autoGitSpec             *imagev1.GitSpec
+		gitRepoRef              *sourcev1.GitRepositoryRef
+		shallowClone            bool
+		sparseCheckoutDirectory string
+		lastObserved            bool
+		wantErr                 bool
+		wantRef                 string
 	}{
 		{
 			name: "checkout for single branch",
@@ -275,6 +276,42 @@ func test_sourceManager_CheckoutSource(t *testing.T, proto string) {
 			wantErr:      false,
 			wantRef:      "main",
 		},
+		{
+			name: "with sparse checkout",
+			autoGitSpec: &imagev1.GitSpec{
+				Push: &imagev1.PushSpec{Branch: "main"},
+				Checkout: &imagev1.GitCheckoutSpec{
+					Reference: sourcev1.GitRepositoryRef{Branch: "main"},
+				},
+			},
+			sparseCheckoutDirectory: "testdata/appconfig/deploy.yaml",
+			wantErr:                 false,
+			wantRef:                 "main",
+		},
+		{
+			name: "with sparse checkout for current directory",
+			autoGitSpec: &imagev1.GitSpec{
+				Push: &imagev1.PushSpec{Branch: "main"},
+				Checkout: &imagev1.GitCheckoutSpec{
+					Reference: sourcev1.GitRepositoryRef{Branch: "main"},
+				},
+			},
+			sparseCheckoutDirectory: "./",
+			wantErr:                 false,
+			wantRef:                 "main",
+		},
+		{
+			name: "with sparse checkout for different push branch",
+			autoGitSpec: &imagev1.GitSpec{
+				Push: &imagev1.PushSpec{Branch: "foo"},
+				Checkout: &imagev1.GitCheckoutSpec{
+					Reference: sourcev1.GitRepositoryRef{Branch: "main"},
+				},
+			},
+			sparseCheckoutDirectory: "testdata/appconfig/deploy.yaml",
+			wantErr:                 false,
+			wantRef:                 "foo",
+		},
 		{
 			name: "with last observed commit",
 			autoGitSpec: &imagev1.GitSpec{
@@ -386,6 +423,9 @@ func test_sourceManager_CheckoutSource(t *testing.T, proto string) {
 			if tt.shallowClone {
 				opts = append(opts, WithCheckoutOptionShallowClone())
 			}
+			if tt.sparseCheckoutDirectory != "" {
+				opts = append(opts, WithCheckoutOptionSparseCheckoutDirectories(tt.sparseCheckoutDirectory))
+			}
 			if tt.lastObserved {
 				opts = append(opts, WithCheckoutOptionLastObserved(headRev))
 			}