diff --git a/go.mod b/go.mod index 7551d2918..9458d2050 100644 --- a/go.mod +++ b/go.mod @@ -23,11 +23,11 @@ require ( github.com/docker/go-units v0.5.0 github.com/elazarl/goproxy v1.9.2 github.com/fluxcd/cli-utils v1.4.0 - github.com/fluxcd/pkg/apis/crypto v0.5.0 + github.com/fluxcd/pkg/apis/crypto v0.7.0 github.com/fluxcd/pkg/apis/event v0.32.0 github.com/fluxcd/pkg/apis/meta v1.38.0 github.com/fluxcd/pkg/artifact v0.28.0 - github.com/fluxcd/pkg/auth v0.66.0 + github.com/fluxcd/pkg/auth v0.69.0 github.com/fluxcd/pkg/cache v0.19.0 github.com/fluxcd/pkg/git v0.56.0 github.com/fluxcd/pkg/gittestserver v0.33.0 @@ -37,7 +37,7 @@ require ( github.com/fluxcd/pkg/oci v0.73.0 github.com/fluxcd/pkg/runtime v0.122.0 github.com/fluxcd/pkg/sourceignore v0.22.0 - github.com/fluxcd/pkg/spiffe v0.2.0 + github.com/fluxcd/pkg/spiffe v0.4.0 github.com/fluxcd/pkg/ssh v0.29.0 github.com/fluxcd/pkg/tar v1.4.0 github.com/fluxcd/pkg/testserver v0.15.0 diff --git a/go.sum b/go.sum index c54d75d7d..114c07fba 100644 --- a/go.sum +++ b/go.sum @@ -363,16 +363,16 @@ github.com/fluxcd/gitkit v0.6.0 h1:iNg5LTx6ePo+Pl0ZwqHTAkhbUHxGVSY3YCxCdw7VIFg= github.com/fluxcd/gitkit v0.6.0/go.mod h1:svOHuKi0fO9HoawdK4HfHAJJseZDHHjk7I3ihnCIqNo= github.com/fluxcd/pkg/apis/acl v0.12.0 h1:UWpZDqKxpKDW38wdXIMHV8Uv3POPu2vUrra0JH1frH0= github.com/fluxcd/pkg/apis/acl v0.12.0/go.mod h1:PJrGIu5Bw/6/siO95uhS+pi5oKSU+gVJqHqsPHb8Kok= -github.com/fluxcd/pkg/apis/crypto v0.5.0 h1:buy9YCvrD8IpKqOVCSV9k2wlF2iVPaETLOZBqsbyfVs= -github.com/fluxcd/pkg/apis/crypto v0.5.0/go.mod h1:bEwkDgBjLXMVJ2BwmVbbj32PkirmNSicabgl2Jvw7Dk= +github.com/fluxcd/pkg/apis/crypto v0.7.0 h1:0mgFQRW4/+/NbPpzf3X6+r3j2TCL9T86mEaG1XqwkyY= +github.com/fluxcd/pkg/apis/crypto v0.7.0/go.mod h1:bEwkDgBjLXMVJ2BwmVbbj32PkirmNSicabgl2Jvw7Dk= github.com/fluxcd/pkg/apis/event v0.32.0 h1:3zyjdUspwQN+EQJPlUXwCvCMbeqtB+azlNmeenAcbuE= github.com/fluxcd/pkg/apis/event v0.32.0/go.mod h1:ALma8dTqo+NbI+z4BawSzt0pAPjetCSNNUSSS/9p0VU= github.com/fluxcd/pkg/apis/meta v1.38.0 h1:7t6/DuGFAPx2LE4MsRh1jskjnVE6qELKfr/LrfG7KE8= github.com/fluxcd/pkg/apis/meta v1.38.0/go.mod h1:lmdugeiZyt6w+DRm8ypkB+nwrzm+saMbqSfZKGBbTOE= github.com/fluxcd/pkg/artifact v0.28.0 h1:k6/KjWQtHvLJ+KR2kciXJoL87vE6EuBZuZVzpaN4Uak= github.com/fluxcd/pkg/artifact v0.28.0/go.mod h1:h4bURFRXHpl6ASHRgjqyPQJg4mh+8iQVMgM4Nyk1geM= -github.com/fluxcd/pkg/auth v0.66.0 h1:fNS6cf1WOVxVCdEKfCfDgbEgk2t3kzepaI1IKuiXuYo= -github.com/fluxcd/pkg/auth v0.66.0/go.mod h1:eD0iXDzt4BCHVNoBoDkYCsD3+LD39WN/r1qaqsgPJWk= +github.com/fluxcd/pkg/auth v0.69.0 h1:rcu1xc4rhLuEtWdN9qDEWssl82Z24/rEO3KKdLyG1HA= +github.com/fluxcd/pkg/auth v0.69.0/go.mod h1:QgJ83DHxt78tlLYokxqR3KiowikP/+ccWB2uh4oJo3k= github.com/fluxcd/pkg/cache v0.19.0 h1:gcpASwfXLkaHTq8dv9AkXD+IvD54IfskRwGv3SDwC+E= github.com/fluxcd/pkg/cache v0.19.0/go.mod h1:HYfYegfUsGBIttmTDZDFa0xmbeba4wPyND1YKitXm0w= github.com/fluxcd/pkg/git v0.56.0 h1:DYsgOthnW0FtHAeosvJYQGCa/5PTbWwnDZdML7wt4YI= @@ -393,8 +393,8 @@ github.com/fluxcd/pkg/runtime v0.122.0 h1:5nT+3PqbRvnzIMBNW6g/lIqsg6B715zaF12J3K github.com/fluxcd/pkg/runtime v0.122.0/go.mod h1:46y8/GVMFotQkQxzzePecv7cn09DLbQhq6cl2VQ5l9A= github.com/fluxcd/pkg/sourceignore v0.22.0 h1:GFvVgEA8HW4mZL26NFxhry3ZzCA8nR12MQovvZvbXm0= github.com/fluxcd/pkg/sourceignore v0.22.0/go.mod h1:rEEyPqhc5u1t0fDkonqzGTKVuGOvp3v33boxg0Uw5VA= -github.com/fluxcd/pkg/spiffe v0.2.0 h1:UM5USXRkl92nZZov3R5gAfPxnRpudowsCprqPG/GNaA= -github.com/fluxcd/pkg/spiffe v0.2.0/go.mod h1:zLRMyp/vOwQEGWLhe04qKOBorUuTQvwBKBgpmWwkKQE= +github.com/fluxcd/pkg/spiffe v0.4.0 h1:OqYdMkgQ07bDMuzsslghZsWEHDuw2ob/OkhDETE1pyY= +github.com/fluxcd/pkg/spiffe v0.4.0/go.mod h1:FPfK66livdwZL3JFF+GnRfohvUHQZxnkFnaPdIprdj8= github.com/fluxcd/pkg/ssh v0.29.0 h1:sw25lljJsA54Lcr1oiw7sBLU1c3vWroZf9uLy87rltg= github.com/fluxcd/pkg/ssh v0.29.0/go.mod h1:193HoPaYQ/SJ9zsJZSMwVsQA/XL02ouOwAHj7jekHCw= github.com/fluxcd/pkg/tar v1.4.0 h1:E6LKORT7ZBd/1ekX4N/gS9LeKfyLui1lBgne8e5PC8I= diff --git a/internal/controller/bucket_controller.go b/internal/controller/bucket_controller.go index 8406a1c08..9160d5fad 100644 --- a/internal/controller/bucket_controller.go +++ b/internal/controller/bucket_controller.go @@ -57,7 +57,7 @@ import ( rreconcile "github.com/fluxcd/pkg/runtime/reconcile" "github.com/fluxcd/pkg/runtime/secrets" "github.com/fluxcd/pkg/sourceignore" - fluxbroker "github.com/fluxcd/pkg/spiffe/broker" + fluxbroker "github.com/fluxcd/pkg/spiffe/brokerapi" sourcev1 "github.com/fluxcd/source-controller/api/v1" "github.com/fluxcd/source-controller/internal/bucket/azure" @@ -888,7 +888,7 @@ func (r *BucketReconciler) createBucketProvider(ctx context.Context, obj *source authOpts = append(authOpts, auth.WithClient(r.Client), auth.WithObject(sourcev1.GroupVersion.Group, sourcev1.BucketKind, obj), - auth.WithSPIFFEBroker(r.SPIFFEBroker)) + auth.WithSPIFFEBrokerAPI(r.SPIFFEBroker)) if sa != nil { authOpts = append(authOpts, auth.WithServiceAccountName(sa.Name)) } diff --git a/internal/controller/gitrepository_controller.go b/internal/controller/gitrepository_controller.go index bfc44d199..bd45f2fff 100644 --- a/internal/controller/gitrepository_controller.go +++ b/internal/controller/gitrepository_controller.go @@ -34,7 +34,7 @@ import ( "github.com/fluxcd/pkg/runtime/events" "github.com/fluxcd/pkg/runtime/logger" "github.com/fluxcd/pkg/runtime/secrets" - fluxbroker "github.com/fluxcd/pkg/spiffe/broker" + fluxbroker "github.com/fluxcd/pkg/spiffe/brokerapi" "github.com/go-git/go-git/v5/plumbing/transport" "github.com/opencontainers/go-digest" ssh "golang.org/x/crypto/ssh" @@ -773,7 +773,7 @@ func (r *GitRepositoryReconciler) getAuthOpts(ctx context.Context, obj *sourcev1 auth.WithClient(r.Client), auth.WithGitURL(u), auth.WithObject(sourcev1.GroupVersion.Group, sourcev1.GitRepositoryKind, obj), - auth.WithSPIFFEBroker(r.SPIFFEBroker)) + auth.WithSPIFFEBrokerAPI(r.SPIFFEBroker)) if sa != nil { authOpts = append(authOpts, auth.WithServiceAccountName(sa.Name)) } diff --git a/internal/controller/ocirepository_controller.go b/internal/controller/ocirepository_controller.go index 5329432e3..63b430a52 100644 --- a/internal/controller/ocirepository_controller.go +++ b/internal/controller/ocirepository_controller.go @@ -63,7 +63,7 @@ import ( rreconcile "github.com/fluxcd/pkg/runtime/reconcile" "github.com/fluxcd/pkg/runtime/secrets" "github.com/fluxcd/pkg/sourceignore" - fluxbroker "github.com/fluxcd/pkg/spiffe/broker" + fluxbroker "github.com/fluxcd/pkg/spiffe/brokerapi" "github.com/fluxcd/pkg/tar" "github.com/fluxcd/pkg/version" ctrl "sigs.k8s.io/controller-runtime" @@ -439,7 +439,7 @@ func (r *OCIRepositoryReconciler) reconcileSource(ctx context.Context, sp *patch opts = append(opts, auth.WithClient(r.Client), auth.WithObject(sourcev1.GroupVersion.Group, sourcev1.OCIRepositoryKind, obj), - auth.WithSPIFFEBroker(r.SPIFFEBroker)) + auth.WithSPIFFEBrokerAPI(r.SPIFFEBroker)) if sa != nil { opts = append(opts, auth.WithServiceAccountName(sa.Name)) } diff --git a/main.go b/main.go index 7379b1346..c5552bf03 100644 --- a/main.go +++ b/main.go @@ -58,7 +58,7 @@ import ( "github.com/fluxcd/pkg/runtime/pprof" "github.com/fluxcd/pkg/runtime/probes" fluxspiffe "github.com/fluxcd/pkg/spiffe" - fluxbroker "github.com/fluxcd/pkg/spiffe/broker" + fluxbroker "github.com/fluxcd/pkg/spiffe/brokerapi" sourcev1 "github.com/fluxcd/source-controller/api/v1"