diff --git a/go.mod b/go.mod index 7a43554b10..4790fec3aa 100644 --- a/go.mod +++ b/go.mod @@ -20,13 +20,13 @@ require ( github.com/fluxcd/notification-controller/api v1.8.4 github.com/fluxcd/pkg/apis/event v0.26.0 github.com/fluxcd/pkg/apis/meta v1.29.0 - github.com/fluxcd/pkg/auth v0.51.0 + github.com/fluxcd/pkg/auth v0.52.0 github.com/fluxcd/pkg/chartutil v1.26.0 github.com/fluxcd/pkg/envsubst v1.7.0 - github.com/fluxcd/pkg/git v0.50.0 - github.com/fluxcd/pkg/kustomize v1.32.0 - github.com/fluxcd/pkg/oci v0.66.0 - github.com/fluxcd/pkg/runtime v0.108.0 + github.com/fluxcd/pkg/git v0.51.0 + github.com/fluxcd/pkg/kustomize v1.33.0 + github.com/fluxcd/pkg/oci v0.67.0 + github.com/fluxcd/pkg/runtime v0.109.0 github.com/fluxcd/pkg/sourceignore v0.18.0 github.com/fluxcd/pkg/ssa v0.75.0 github.com/fluxcd/pkg/ssh v0.25.0 diff --git a/go.sum b/go.sum index e28b928c1c..db1349d941 100644 --- a/go.sum +++ b/go.sum @@ -194,24 +194,24 @@ github.com/fluxcd/pkg/apis/kustomize v1.18.0 h1:FCNjViCLyKYj6lddpnjXybKBTC2eK6eX github.com/fluxcd/pkg/apis/kustomize v1.18.0/go.mod h1:mvtMtM4NNLipdCna6DYPC6Bd42xeaF15N+tNO+F6kxY= github.com/fluxcd/pkg/apis/meta v1.29.0 h1:JRFbAqLQ9YJG5AXBb0urvH9ySYZ/WJqq1dPhfzCRvPs= github.com/fluxcd/pkg/apis/meta v1.29.0/go.mod h1:3DmYMnyH3XdY8/g2gXfsVIGEd/zpcB2PEkuurv2vgHU= -github.com/fluxcd/pkg/auth v0.51.0 h1:yu5laG9dVyKGq2fDPem9gPTBfjdCEVPgKZ4M/oGAQWk= -github.com/fluxcd/pkg/auth v0.51.0/go.mod h1:GWDfC5KhljE1ekKlfXVmod8H0uUm95ISlaAXULq2euk= +github.com/fluxcd/pkg/auth v0.52.0 h1:MsHKQjSOFE13DE8lZu5tDPX3SIct2KfRZwzt5B5I73o= +github.com/fluxcd/pkg/auth v0.52.0/go.mod h1:GWDfC5KhljE1ekKlfXVmod8H0uUm95ISlaAXULq2euk= github.com/fluxcd/pkg/cache v0.14.0 h1:wEwJA8NhYj+nH9P6ifcsglDZARWlcbxbmwngGOzfU4c= github.com/fluxcd/pkg/cache v0.14.0/go.mod h1:KwzU2gyVQ83YOHJsbBeveJ0HsXmLrH0I668zX19d/+s= github.com/fluxcd/pkg/chartutil v1.26.0 h1:bgXwDKl2uGITSDxOXe4N5HTXAL0ilk4YVbPLU3JDTCw= github.com/fluxcd/pkg/chartutil v1.26.0/go.mod h1:sWDcF//xpIwZ/MQupwTmuM/SgGCkfsTd9BVOQJ3cTjM= github.com/fluxcd/pkg/envsubst v1.7.0 h1:PL9Nj/V2fgaMR9KYZR7mEEw+vlYgP80nFZjOQQKAfJs= github.com/fluxcd/pkg/envsubst v1.7.0/go.mod h1:aoWeSIOamhqBZ3bHVj1GDwpdA10DXrI8yYbyjPiFly0= -github.com/fluxcd/pkg/git v0.50.0 h1:gbGmSTjQ6CxqFmT9ZkLfYh8kG7CHqc7gHoPqcygixK8= -github.com/fluxcd/pkg/git v0.50.0/go.mod h1:OgaHoS0iR0GuLl+f778X7NrGy1pDH7xcpF/nsCRgJ9g= +github.com/fluxcd/pkg/git v0.51.0 h1:RNA7exXM6QIXozR654CdWAQjR5LUUw3r3TeE3gAaYSc= +github.com/fluxcd/pkg/git v0.51.0/go.mod h1:OgaHoS0iR0GuLl+f778X7NrGy1pDH7xcpF/nsCRgJ9g= github.com/fluxcd/pkg/gittestserver v0.29.0 h1:2j03zKVL6iVn6oiUuecG/O/3Q1pULWM9JrF/HSjkpnc= github.com/fluxcd/pkg/gittestserver v0.29.0/go.mod h1:O8151jV0ppBZTb9IUXMjxh6hZpkiuLq8JQHDBPOkZFw= -github.com/fluxcd/pkg/kustomize v1.32.0 h1:5lLT2dgR+JrcoJHB7/K50o0AcJikKvXcRd3r7jIYZC8= -github.com/fluxcd/pkg/kustomize v1.32.0/go.mod h1:Xz1QIUIKexXuSolRQY63843wSycPVuIsVhE9C+aJWl8= -github.com/fluxcd/pkg/oci v0.66.0 h1:nlBA3/MvJShjA+VFPKDRoXLUpH+e8THVvCMST+qUTlI= -github.com/fluxcd/pkg/oci v0.66.0/go.mod h1:9Z4Juu/BhLLKHKOkOalfwIkZYsjTViD0YDHzW9w5R9c= -github.com/fluxcd/pkg/runtime v0.108.0 h1:sSXz6FWcRT+tkfddiCmehrYaEKqkVFkcBWDhGMNJtH4= -github.com/fluxcd/pkg/runtime v0.108.0/go.mod h1:TaBSfm7UcRTM4605S6R86DT+XE1kOCC+YIJe8zZ8jno= +github.com/fluxcd/pkg/kustomize v1.33.0 h1:m3i2W3gwlJyrQD8KzeMEjzMsoOzLODW0kt/4P+7sjHE= +github.com/fluxcd/pkg/kustomize v1.33.0/go.mod h1:Xz1QIUIKexXuSolRQY63843wSycPVuIsVhE9C+aJWl8= +github.com/fluxcd/pkg/oci v0.67.0 h1:pGI6F+MCNkTuAF5LJN7Xs1Dyw2WSfuDpMjVZplAEcpE= +github.com/fluxcd/pkg/oci v0.67.0/go.mod h1:9Z4Juu/BhLLKHKOkOalfwIkZYsjTViD0YDHzW9w5R9c= +github.com/fluxcd/pkg/runtime v0.109.0 h1:XkB0urXYC+nFhgtl7AePtXeNinFGpak5Hipx+TZJUuY= +github.com/fluxcd/pkg/runtime v0.109.0/go.mod h1:TaBSfm7UcRTM4605S6R86DT+XE1kOCC+YIJe8zZ8jno= github.com/fluxcd/pkg/sourceignore v0.18.0 h1:WU2tPKasG9AM7/H/LlqdjULyaSknnZBTrpHsDDtOuns= github.com/fluxcd/pkg/sourceignore v0.18.0/go.mod h1:mnH7rFFlEbMTclhz7JZP7tiHssKdXRNpCqnly2JGvaI= github.com/fluxcd/pkg/ssa v0.75.0 h1:u6K/hy4rqVaH5xHWwfFtioh8I+013eFRb612Rz+dnzk= diff --git a/pkg/bootstrap/bootstrap_plain_git.go b/pkg/bootstrap/bootstrap_plain_git.go index f39b08b775..fe89164108 100644 --- a/pkg/bootstrap/bootstrap_plain_git.go +++ b/pkg/bootstrap/bootstrap_plain_git.go @@ -43,6 +43,7 @@ import ( "github.com/fluxcd/pkg/apis/meta" "github.com/fluxcd/pkg/git" "github.com/fluxcd/pkg/git/repository" + gitsignature "github.com/fluxcd/pkg/git/signature" "github.com/fluxcd/pkg/kustomize/filesys" runclient "github.com/fluxcd/pkg/runtime/client" sourcev1 "github.com/fluxcd/source-controller/api/v1" @@ -155,11 +156,11 @@ func (b *PlainGitBootstrapper) ReconcileComponents(ctx context.Context, manifest b.logger.Successf("generated component manifests") // Write generated files and make a commit - var signer *openpgp.Entity + var signer gitsignature.Signer if b.gpgKeyRing != nil { - signer, err = getOpenPgpEntity(b.gpgKeyRing, b.gpgPassphrase, b.gpgKeyID) + signer, err = getOpenPgpSigner(b.gpgKeyRing, b.gpgPassphrase, b.gpgKeyID) if err != nil { - return fmt.Errorf("failed to generate OpenPGP entity: %w", err) + return fmt.Errorf("failed to generate OpenPGP signer: %w", err) } } commitMsg := fmt.Sprintf("Add Flux %s component manifests", options.Version) @@ -330,11 +331,11 @@ func (b *PlainGitBootstrapper) ReconcileSyncConfig(ctx context.Context, options b.logger.Successf("generated sync manifests") // Write generated files and make a commit - var signer *openpgp.Entity + var signer gitsignature.Signer if b.gpgKeyRing != nil { - signer, err = getOpenPgpEntity(b.gpgKeyRing, b.gpgPassphrase, b.gpgKeyID) + signer, err = getOpenPgpSigner(b.gpgKeyRing, b.gpgPassphrase, b.gpgKeyID) if err != nil { - return fmt.Errorf("failed to generate OpenPGP entity: %w", err) + return fmt.Errorf("failed to generate OpenPGP signer: %w", err) } } commitMsg := "Add Flux sync manifests" @@ -511,6 +512,19 @@ func (b *PlainGitBootstrapper) cleanGitRepoDir() error { return errors.Join(errs...) } +func getOpenPgpSigner(keyRing openpgp.EntityList, passphrase, keyID string) (gitsignature.Signer, error) { + entity, err := getOpenPgpEntity(keyRing, passphrase, keyID) + if err != nil { + return nil, err + } + + signer, err := gitsignature.NewOpenPGPSigner(entity) + if err != nil { + return nil, fmt.Errorf("unable to create OpenPGP signer: %w", err) + } + return signer, nil +} + func getOpenPgpEntity(keyRing openpgp.EntityList, passphrase, keyID string) (*openpgp.Entity, error) { if len(keyRing) == 0 { return nil, fmt.Errorf("empty GPG key ring") diff --git a/tests/integration/go.mod b/tests/integration/go.mod index efc8df71e5..6698d216f1 100644 --- a/tests/integration/go.mod +++ b/tests/integration/go.mod @@ -13,8 +13,8 @@ require ( github.com/fluxcd/notification-controller/api v1.8.4 github.com/fluxcd/pkg/apis/event v0.26.0 github.com/fluxcd/pkg/apis/meta v1.29.0 - github.com/fluxcd/pkg/git v0.50.0 - github.com/fluxcd/pkg/runtime v0.108.0 + github.com/fluxcd/pkg/git v0.51.0 + github.com/fluxcd/pkg/runtime v0.109.0 github.com/fluxcd/source-controller/api v1.8.5 github.com/fluxcd/test-infra/tftestenv v0.0.0-20260419142339-c6535d1fff77 github.com/go-git/go-git/v5 v5.19.1 diff --git a/tests/integration/go.sum b/tests/integration/go.sum index b6d6025272..f0f87159fd 100644 --- a/tests/integration/go.sum +++ b/tests/integration/go.sum @@ -111,12 +111,12 @@ github.com/fluxcd/pkg/apis/kustomize v1.18.0 h1:FCNjViCLyKYj6lddpnjXybKBTC2eK6eX github.com/fluxcd/pkg/apis/kustomize v1.18.0/go.mod h1:mvtMtM4NNLipdCna6DYPC6Bd42xeaF15N+tNO+F6kxY= github.com/fluxcd/pkg/apis/meta v1.29.0 h1:JRFbAqLQ9YJG5AXBb0urvH9ySYZ/WJqq1dPhfzCRvPs= github.com/fluxcd/pkg/apis/meta v1.29.0/go.mod h1:3DmYMnyH3XdY8/g2gXfsVIGEd/zpcB2PEkuurv2vgHU= -github.com/fluxcd/pkg/git v0.50.0 h1:gbGmSTjQ6CxqFmT9ZkLfYh8kG7CHqc7gHoPqcygixK8= -github.com/fluxcd/pkg/git v0.50.0/go.mod h1:OgaHoS0iR0GuLl+f778X7NrGy1pDH7xcpF/nsCRgJ9g= +github.com/fluxcd/pkg/git v0.51.0 h1:RNA7exXM6QIXozR654CdWAQjR5LUUw3r3TeE3gAaYSc= +github.com/fluxcd/pkg/git v0.51.0/go.mod h1:OgaHoS0iR0GuLl+f778X7NrGy1pDH7xcpF/nsCRgJ9g= github.com/fluxcd/pkg/gittestserver v0.29.0 h1:2j03zKVL6iVn6oiUuecG/O/3Q1pULWM9JrF/HSjkpnc= github.com/fluxcd/pkg/gittestserver v0.29.0/go.mod h1:O8151jV0ppBZTb9IUXMjxh6hZpkiuLq8JQHDBPOkZFw= -github.com/fluxcd/pkg/runtime v0.108.0 h1:sSXz6FWcRT+tkfddiCmehrYaEKqkVFkcBWDhGMNJtH4= -github.com/fluxcd/pkg/runtime v0.108.0/go.mod h1:TaBSfm7UcRTM4605S6R86DT+XE1kOCC+YIJe8zZ8jno= +github.com/fluxcd/pkg/runtime v0.109.0 h1:XkB0urXYC+nFhgtl7AePtXeNinFGpak5Hipx+TZJUuY= +github.com/fluxcd/pkg/runtime v0.109.0/go.mod h1:TaBSfm7UcRTM4605S6R86DT+XE1kOCC+YIJe8zZ8jno= github.com/fluxcd/pkg/ssh v0.25.0 h1:4Y9WmuNqyKvH759UznU5DGHRcOuoJ/dQM6sbsaDZYYM= github.com/fluxcd/pkg/ssh v0.25.0/go.mod h1:Fli2Ogu4uaIVGbCy+r0vvZlMO0RfuInyNY1q2FVIx0o= github.com/fluxcd/pkg/version v0.15.0 h1:E2Ju4i0vj8ZXLHKz/F4a8JTmDh7Jcg8okB0hK5rEoTM=