Skip to content

Commit ff76a91

Browse files
stefanprodanstefanprodan
committed
Update controller to OCIRepository v1 (GA)
Signed-off-by: Stefan Prodan <[email protected]>
1 parent f2db6a2 commit ff76a91

File tree

10 files changed

+22
-27
lines changed

10 files changed

+22
-27
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ the controller performs actions to reconcile the cluster current state with the
4141

4242
* [Get started with Flux](https://fluxcd.io/flux/get-started/)
4343
* [Setup Notifications](https://fluxcd.io/flux/guides/notifications/)
44-
* [Manage Kubernetes secrets with Flux and Mozilla SOPS](https://fluxcd.io/flux/guides/mozilla-sops/)
44+
* [Manage Kubernetes secrets with Flux and SOPS](https://fluxcd.io/flux/guides/mozilla-sops/)
4545
* [How to build, publish and consume OCI Artifacts with Flux](https://fluxcd.io/flux/cheatsheets/oci-artifacts/)
4646
* [Flux and Kustomize FAQ](https://fluxcd.io/flux/faq/#kustomize-questions)
4747

‎api/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ require (
2323
github.com/modern-go/reflect2 v1.0.2 // indirect
2424
github.com/spf13/pflag v1.0.6 // indirect
2525
github.com/x448/float16 v0.8.4 // indirect
26-
golang.org/x/net v0.39.0 // indirect
27-
golang.org/x/text v0.24.0 // indirect
28-
golang.org/x/tools v0.32.0 // indirect
26+
golang.org/x/net v0.40.0 // indirect
27+
golang.org/x/text v0.25.0 // indirect
28+
golang.org/x/tools v0.33.0 // indirect
2929
gopkg.in/inf.v0 v0.9.1 // indirect
3030
k8s.io/klog/v2 v2.130.1 // indirect
3131
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e // indirect

‎api/go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,26 +62,26 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
6262
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
6363
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
6464
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
65-
golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
66-
golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
65+
golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
66+
golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
6767
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
6868
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
6969
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
7070
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
7171
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
7272
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
73-
golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
74-
golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
73+
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
74+
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
7575
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
7676
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
77-
golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
78-
golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
77+
golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
78+
golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
7979
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
8080
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
8181
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
8282
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
83-
golang.org/x/tools v0.32.0 h1:Q7N1vhpkQv7ybVzLFtTjvQya2ewbwNDZzUgfXGqtMWU=
84-
golang.org/x/tools v0.32.0/go.mod h1:ZxrU41P/wAbZD8EDa6dDCa6XfpkhJ7HFMjHJXfBDu8s=
83+
golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc=
84+
golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI=
8585
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
8686
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
8787
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎config/default/kustomization.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
namespace: kustomize-system
44
resources:
5-
- https://github.com/fluxcd/source-controller/releases/download/v1.5.0/source-controller.crds.yaml
6-
- https://github.com/fluxcd/source-controller/releases/download/v1.5.0/source-controller.deployment.yaml
5+
- https://github.com/fluxcd/source-controller/releases/download/v1.6.0/source-controller.crds.yaml
6+
- https://github.com/fluxcd/source-controller/releases/download/v1.6.0/source-controller.deployment.yaml
77
- ../crd
88
- ../rbac
99
- ../manager

‎config/testdata/oci/podinfo.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: source.toolkit.fluxcd.io/v1beta2
1+
apiVersion: source.toolkit.fluxcd.io/v1
22
kind: OCIRepository
33
metadata:
44
name: oci

‎docs/spec/v1/kustomizations.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Artifact containing the YAML manifests. It has two required fields:
115115

116116
- `kind`: The Kind of the referred Source object. Supported Source types:
117117
+ [GitRepository](https://github.com/fluxcd/source-controller/blob/main/docs/spec/v1/gitrepositories.md)
118-
+ [OCIRepository](https://github.com/fluxcd/source-controller/blob/main/docs/spec/v1beta2/ocirepositories.md)
118+
+ [OCIRepository](https://github.com/fluxcd/source-controller/blob/main/docs/spec/v1/ocirepositories.md)
119119
+ [Bucket](https://github.com/fluxcd/source-controller/blob/main/docs/spec/v1/buckets.md)
120120
- `name`: The Name of the referred Source object.
121121

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -535,8 +535,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
535535
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
536536
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
537537
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
538-
golang.org/x/tools v0.32.0 h1:Q7N1vhpkQv7ybVzLFtTjvQya2ewbwNDZzUgfXGqtMWU=
539-
golang.org/x/tools v0.32.0/go.mod h1:ZxrU41P/wAbZD8EDa6dDCa6XfpkhJ7HFMjHJXfBDu8s=
538+
golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc=
539+
golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI=
540540
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
541541
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
542542
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎internal/controller/kustomization_controller.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ import (
7070
ssautil "github.com/fluxcd/pkg/ssa/utils"
7171
"github.com/fluxcd/pkg/tar"
7272
sourcev1 "github.com/fluxcd/source-controller/api/v1"
73-
sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"
7473

7574
kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
7675
intcache "github.com/fluxcd/kustomize-controller/internal/cache"
@@ -129,7 +128,7 @@ func (r *KustomizationReconciler) SetupWithManager(ctx context.Context, mgr ctrl
129128

130129
// Index the Kustomizations by the OCIRepository references they (may) point at.
131130
if err := mgr.GetCache().IndexField(ctx, &kustomizev1.Kustomization{}, ociRepositoryIndexKey,
132-
r.indexBy(sourcev1b2.OCIRepositoryKind)); err != nil {
131+
r.indexBy(sourcev1.OCIRepositoryKind)); err != nil {
133132
return fmt.Errorf("failed setting index fields: %w", err)
134133
}
135134

@@ -154,7 +153,7 @@ func (r *KustomizationReconciler) SetupWithManager(ctx context.Context, mgr ctrl
154153
predicate.Or(predicate.GenerationChangedPredicate{}, predicates.ReconcileRequestedPredicate{}),
155154
)).
156155
Watches(
157-
&sourcev1b2.OCIRepository{},
156+
&sourcev1.OCIRepository{},
158157
handler.EnqueueRequestsFromMapFunc(r.requestsForRevisionChangeOf(ociRepositoryIndexKey)),
159158
builder.WithPredicates(SourceRevisionChangePredicate{}),
160159
).
@@ -597,8 +596,8 @@ func (r *KustomizationReconciler) getSource(ctx context.Context,
597596
}
598597

599598
switch obj.Spec.SourceRef.Kind {
600-
case sourcev1b2.OCIRepositoryKind:
601-
var repository sourcev1b2.OCIRepository
599+
case sourcev1.OCIRepositoryKind:
600+
var repository sourcev1.OCIRepository
602601
err := r.Client.Get(ctx, namespacedName, &repository)
603602
if err != nil {
604603
if apierrors.IsNotFound(err) {

‎internal/controller/suite_test.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ import (
4747
"github.com/fluxcd/pkg/runtime/testenv"
4848
"github.com/fluxcd/pkg/testserver"
4949
sourcev1 "github.com/fluxcd/source-controller/api/v1"
50-
sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"
5150

5251
kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
5352
)
@@ -77,7 +76,6 @@ func runInContext(registerControllers func(*testenv.Environment), run func() int
7776
var err error
7877
utilruntime.Must(kustomizev1.AddToScheme(scheme.Scheme))
7978
utilruntime.Must(sourcev1.AddToScheme(scheme.Scheme))
80-
utilruntime.Must(sourcev1b2.AddToScheme(scheme.Scheme))
8179

8280
if debugMode {
8381
controllerLog.SetLogger(zap.New(zap.WriteTo(os.Stderr), zap.UseDevMode(false)))

‎main.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ import (
5151
"github.com/fluxcd/pkg/runtime/pprof"
5252
"github.com/fluxcd/pkg/runtime/probes"
5353
sourcev1 "github.com/fluxcd/source-controller/api/v1"
54-
sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"
5554

5655
kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
5756
"github.com/fluxcd/kustomize-controller/internal/controller"
@@ -70,7 +69,6 @@ func init() {
7069
_ = clientgoscheme.AddToScheme(scheme)
7170

7271
_ = sourcev1.AddToScheme(scheme)
73-
_ = sourcev1b2.AddToScheme(scheme)
7472
_ = kustomizev1.AddToScheme(scheme)
7573
// +kubebuilder:scaffold:scheme
7674
}

0 commit comments

Comments
 (0)