Skip to content

Commit 3fee9a5

Browse files
stefanprodanstefanprodan
authored
Merge pull request #952 from fluxcd/event-v1beta1
Use Flux Event API v1beta1
2 parents 6b0c78c + 65e1041 commit 3fee9a5

File tree

10 files changed

+80
-74
lines changed

10 files changed

+80
-74
lines changed

‎api/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/fluxcd/pkg/apis/acl v0.1.0
77
github.com/fluxcd/pkg/apis/meta v0.17.0
88
k8s.io/apimachinery v0.25.3
9-
sigs.k8s.io/controller-runtime v0.13.0
9+
sigs.k8s.io/controller-runtime v0.13.1
1010
)
1111

1212
// Fix CVE-2022-32149

‎api/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ=
9595
k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
9696
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4=
9797
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
98-
sigs.k8s.io/controller-runtime v0.13.0 h1:iqa5RNciy7ADWnIc8QxCbOX5FEKVR3uxVxKHRMc2WIQ=
99-
sigs.k8s.io/controller-runtime v0.13.0/go.mod h1:Zbz+el8Yg31jubvAEyglRZGdLAjplZl+PgtYNI6WNTI=
98+
sigs.k8s.io/controller-runtime v0.13.1 h1:tUsRCSJVM1QQOOeViGeX3GMT3dQF1eePPw6sEE3xSlg=
99+
sigs.k8s.io/controller-runtime v0.13.1/go.mod h1:Zbz+el8Yg31jubvAEyglRZGdLAjplZl+PgtYNI6WNTI=
100100
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
101101
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
102102
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=

‎controllers/bucket_controller.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ import (
4545
"github.com/fluxcd/pkg/apis/meta"
4646
"github.com/fluxcd/pkg/runtime/conditions"
4747
helper "github.com/fluxcd/pkg/runtime/controller"
48-
"github.com/fluxcd/pkg/runtime/events"
4948
"github.com/fluxcd/pkg/runtime/patch"
5049
"github.com/fluxcd/pkg/runtime/predicates"
5150

51+
eventv1 "github.com/fluxcd/pkg/apis/event/v1beta1"
5252
"github.com/fluxcd/pkg/sourceignore"
5353
sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
5454
serror "github.com/fluxcd/source-controller/internal/error"
@@ -578,7 +578,7 @@ func (r *BucketReconciler) reconcileArtifact(ctx context.Context, obj *sourcev1.
578578

579579
// The artifact is up-to-date
580580
if obj.GetArtifact().HasRevision(artifact.Revision) {
581-
r.eventLogf(ctx, obj, events.EventTypeTrace, sourcev1.ArtifactUpToDateReason, "artifact up-to-date with remote revision: '%s'", artifact.Revision)
581+
r.eventLogf(ctx, obj, eventv1.EventTypeTrace, sourcev1.ArtifactUpToDateReason, "artifact up-to-date with remote revision: '%s'", artifact.Revision)
582582
return sreconcile.ResultSuccess, nil
583583
}
584584

@@ -634,7 +634,7 @@ func (r *BucketReconciler) reconcileArtifact(ctx context.Context, obj *sourcev1.
634634
// Update symlink on a "best effort" basis
635635
url, err := r.Storage.Symlink(artifact, "latest.tar.gz")
636636
if err != nil {
637-
r.eventLogf(ctx, obj, events.EventTypeTrace, sourcev1.SymlinkUpdateFailedReason,
637+
r.eventLogf(ctx, obj, eventv1.EventTypeTrace, sourcev1.SymlinkUpdateFailedReason,
638638
"failed to update status URL symlink: %s", err)
639639
}
640640
if url != "" {
@@ -674,7 +674,7 @@ func (r *BucketReconciler) garbageCollect(ctx context.Context, obj *sourcev1.Buc
674674
Reason: "GarbageCollectionFailed",
675675
}
676676
} else if deleted != "" {
677-
r.eventLogf(ctx, obj, events.EventTypeTrace, "GarbageCollectionSucceeded",
677+
r.eventLogf(ctx, obj, eventv1.EventTypeTrace, "GarbageCollectionSucceeded",
678678
"garbage collected artifacts for deleted resource")
679679
}
680680
obj.Status.Artifact = nil
@@ -689,7 +689,7 @@ func (r *BucketReconciler) garbageCollect(ctx context.Context, obj *sourcev1.Buc
689689
}
690690
}
691691
if len(delFiles) > 0 {
692-
r.eventLogf(ctx, obj, events.EventTypeTrace, "GarbageCollectionSucceeded",
692+
r.eventLogf(ctx, obj, eventv1.EventTypeTrace, "GarbageCollectionSucceeded",
693693
fmt.Sprintf("garbage collected %d artifacts", len(delFiles)))
694694
return nil
695695
}

‎controllers/gitrepository_controller.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ import (
4141
"sigs.k8s.io/controller-runtime/pkg/predicate"
4242
"sigs.k8s.io/controller-runtime/pkg/ratelimiter"
4343

44+
eventv1 "github.com/fluxcd/pkg/apis/event/v1beta1"
4445
"github.com/fluxcd/pkg/apis/meta"
4546
"github.com/fluxcd/pkg/git"
4647
"github.com/fluxcd/pkg/git/gogit"
4748
"github.com/fluxcd/pkg/git/libgit2"
4849
"github.com/fluxcd/pkg/runtime/conditions"
4950
helper "github.com/fluxcd/pkg/runtime/controller"
50-
"github.com/fluxcd/pkg/runtime/events"
5151
"github.com/fluxcd/pkg/runtime/patch"
5252
"github.com/fluxcd/pkg/runtime/predicates"
5353

@@ -594,7 +594,7 @@ func (r *GitRepositoryReconciler) reconcileArtifact(ctx context.Context,
594594
if obj.GetArtifact().HasRevision(artifact.Revision) &&
595595
!includes.Diff(obj.Status.IncludedArtifacts) &&
596596
!gitContentConfigChanged(obj, includes) {
597-
r.eventLogf(ctx, obj, events.EventTypeTrace, sourcev1.ArtifactUpToDateReason, "artifact up-to-date with remote revision: '%s'", artifact.Revision)
597+
r.eventLogf(ctx, obj, eventv1.EventTypeTrace, sourcev1.ArtifactUpToDateReason, "artifact up-to-date with remote revision: '%s'", artifact.Revision)
598598
return sreconcile.ResultSuccess, nil
599599
}
600600

@@ -667,7 +667,7 @@ func (r *GitRepositoryReconciler) reconcileArtifact(ctx context.Context,
667667
// Update symlink on a "best effort" basis
668668
url, err := r.Storage.Symlink(artifact, "latest.tar.gz")
669669
if err != nil {
670-
r.eventLogf(ctx, obj, events.EventTypeTrace, sourcev1.SymlinkUpdateFailedReason,
670+
r.eventLogf(ctx, obj, eventv1.EventTypeTrace, sourcev1.SymlinkUpdateFailedReason,
671671
"failed to update status URL symlink: %s", err)
672672
}
673673
if url != "" {
@@ -873,7 +873,7 @@ func (r *GitRepositoryReconciler) verifyCommitSignature(ctx context.Context, obj
873873

874874
conditions.MarkTrue(obj, sourcev1.SourceVerifiedCondition, meta.SucceededReason,
875875
"verified signature of commit '%s'", commit.Hash.String())
876-
r.eventLogf(ctx, obj, events.EventTypeTrace, "VerifiedCommit",
876+
r.eventLogf(ctx, obj, eventv1.EventTypeTrace, "VerifiedCommit",
877877
"verified signature of commit '%s'", commit.Hash.String())
878878
return sreconcile.ResultSuccess, nil
879879
}
@@ -908,7 +908,7 @@ func (r *GitRepositoryReconciler) garbageCollect(ctx context.Context, obj *sourc
908908
"GarbageCollectionFailed",
909909
)
910910
} else if deleted != "" {
911-
r.eventLogf(ctx, obj, events.EventTypeTrace, "GarbageCollectionSucceeded",
911+
r.eventLogf(ctx, obj, eventv1.EventTypeTrace, "GarbageCollectionSucceeded",
912912
"garbage collected artifacts for deleted resource")
913913
}
914914
obj.Status.Artifact = nil
@@ -923,7 +923,7 @@ func (r *GitRepositoryReconciler) garbageCollect(ctx context.Context, obj *sourc
923923
)
924924
}
925925
if len(delFiles) > 0 {
926-
r.eventLogf(ctx, obj, events.EventTypeTrace, "GarbageCollectionSucceeded",
926+
r.eventLogf(ctx, obj, eventv1.EventTypeTrace, "GarbageCollectionSucceeded",
927927
fmt.Sprintf("garbage collected %d artifacts", len(delFiles)))
928928
return nil
929929
}

‎controllers/helmchart_controller.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828
"strings"
2929
"time"
3030

31+
eventv1 "github.com/fluxcd/pkg/apis/event/v1beta1"
3132
soci "github.com/fluxcd/source-controller/internal/oci"
3233
helmgetter "helm.sh/helm/v3/pkg/getter"
3334
helmreg "helm.sh/helm/v3/pkg/registry"
@@ -53,7 +54,6 @@ import (
5354
"github.com/fluxcd/pkg/oci"
5455
"github.com/fluxcd/pkg/runtime/conditions"
5556
helper "github.com/fluxcd/pkg/runtime/controller"
56-
"github.com/fluxcd/pkg/runtime/events"
5757
"github.com/fluxcd/pkg/runtime/patch"
5858
"github.com/fluxcd/pkg/runtime/predicates"
5959
"github.com/fluxcd/pkg/untar"
@@ -404,7 +404,7 @@ func (r *HelmChartReconciler) reconcileSource(ctx context.Context, obj *sourcev1
404404
if helmRepo, ok := s.(*sourcev1.HelmRepository); !ok || helmRepo.Spec.Type != sourcev1.HelmRepositoryTypeOCI {
405405
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, "NoSourceArtifact",
406406
"no artifact available for %s source '%s'", obj.Spec.SourceRef.Kind, obj.Spec.SourceRef.Name)
407-
r.eventLogf(ctx, obj, events.EventTypeTrace, "NoSourceArtifact",
407+
r.eventLogf(ctx, obj, eventv1.EventTypeTrace, "NoSourceArtifact",
408408
"no artifact available for %s source '%s'", obj.Spec.SourceRef.Kind, obj.Spec.SourceRef.Name)
409409
return sreconcile.ResultRequeue, nil
410410
}
@@ -426,7 +426,7 @@ func (r *HelmChartReconciler) reconcileSource(ctx context.Context, obj *sourcev1
426426
// a sudden (partial) disappearance of observed state.
427427
// TODO(hidde): include specific name/version information?
428428
if depNum := build.ResolvedDependencies; build.Complete() && depNum > 0 {
429-
r.Eventf(obj, events.EventTypeTrace, "ResolvedDependencies", "resolved %d chart dependencies", depNum)
429+
r.Eventf(obj, eventv1.EventTypeTrace, "ResolvedDependencies", "resolved %d chart dependencies", depNum)
430430
}
431431

432432
// Handle any build error
@@ -638,7 +638,7 @@ func (r *HelmChartReconciler) buildFromHelmRepository(ctx context.Context, obj *
638638
// Using r.Storage.LocalPath(*repo.GetArtifact() is safe as the path is in the format /<helm-repository-name>/<chart-name>/<filename>.
639639
err := httpChartRepo.CacheIndexInMemory()
640640
if err != nil {
641-
r.eventLogf(ctx, obj, events.EventTypeTrace, sourcev1.CacheOperationFailedReason, "failed to cache index: %s", err)
641+
r.eventLogf(ctx, obj, eventv1.EventTypeTrace, sourcev1.CacheOperationFailedReason, "failed to cache index: %s", err)
642642
}
643643
}
644644

@@ -829,7 +829,7 @@ func (r *HelmChartReconciler) reconcileArtifact(ctx context.Context, obj *source
829829

830830
// Return early if the build path equals the current artifact path
831831
if curArtifact := obj.GetArtifact(); curArtifact != nil && r.Storage.LocalPath(*curArtifact) == b.Path {
832-
r.eventLogf(ctx, obj, events.EventTypeTrace, sourcev1.ArtifactUpToDateReason, "artifact up-to-date with remote revision: '%s'", artifact.Revision)
832+
r.eventLogf(ctx, obj, eventv1.EventTypeTrace, sourcev1.ArtifactUpToDateReason, "artifact up-to-date with remote revision: '%s'", artifact.Revision)
833833
return sreconcile.ResultSuccess, nil
834834
}
835835

@@ -873,7 +873,7 @@ func (r *HelmChartReconciler) reconcileArtifact(ctx context.Context, obj *source
873873
// Update symlink on a "best effort" basis
874874
symURL, err := r.Storage.Symlink(artifact, "latest.tar.gz")
875875
if err != nil {
876-
r.eventLogf(ctx, obj, events.EventTypeTrace, sourcev1.SymlinkUpdateFailedReason,
876+
r.eventLogf(ctx, obj, eventv1.EventTypeTrace, sourcev1.SymlinkUpdateFailedReason,
877877
"failed to update status URL symlink: %s", err)
878878
}
879879
if symURL != "" {
@@ -947,7 +947,7 @@ func (r *HelmChartReconciler) garbageCollect(ctx context.Context, obj *sourcev1.
947947
Reason: "GarbageCollectionFailed",
948948
}
949949
} else if deleted != "" {
950-
r.eventLogf(ctx, obj, events.EventTypeTrace, "GarbageCollectionSucceeded",
950+
r.eventLogf(ctx, obj, eventv1.EventTypeTrace, "GarbageCollectionSucceeded",
951951
"garbage collected artifacts for deleted resource")
952952
}
953953
obj.Status.Artifact = nil
@@ -962,7 +962,7 @@ func (r *HelmChartReconciler) garbageCollect(ctx context.Context, obj *sourcev1.
962962
}
963963
}
964964
if len(delFiles) > 0 {
965-
r.eventLogf(ctx, obj, events.EventTypeTrace, "GarbageCollectionSucceeded",
965+
r.eventLogf(ctx, obj, eventv1.EventTypeTrace, "GarbageCollectionSucceeded",
966966
fmt.Sprintf("garbage collected %d artifacts", len(delFiles)))
967967
return nil
968968
}

‎controllers/helmrepository_controller.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ import (
3737
"sigs.k8s.io/controller-runtime/pkg/predicate"
3838
"sigs.k8s.io/controller-runtime/pkg/ratelimiter"
3939

40+
eventv1 "github.com/fluxcd/pkg/apis/event/v1beta1"
4041
"github.com/fluxcd/pkg/apis/meta"
4142
"github.com/fluxcd/pkg/runtime/conditions"
4243
helper "github.com/fluxcd/pkg/runtime/controller"
43-
"github.com/fluxcd/pkg/runtime/events"
4444
"github.com/fluxcd/pkg/runtime/patch"
4545
"github.com/fluxcd/pkg/runtime/predicates"
4646

@@ -499,7 +499,7 @@ func (r *HelmRepositoryReconciler) reconcileArtifact(ctx context.Context, obj *s
499499
}()
500500

501501
if obj.GetArtifact().HasRevision(artifact.Revision) && obj.GetArtifact().HasChecksum(artifact.Checksum) {
502-
r.eventLogf(ctx, obj, events.EventTypeTrace, sourcev1.ArtifactUpToDateReason, "artifact up-to-date with remote revision: '%s'", artifact.Revision)
502+
r.eventLogf(ctx, obj, eventv1.EventTypeTrace, sourcev1.ArtifactUpToDateReason, "artifact up-to-date with remote revision: '%s'", artifact.Revision)
503503
return sreconcile.ResultSuccess, nil
504504
}
505505

@@ -539,7 +539,7 @@ func (r *HelmRepositoryReconciler) reconcileArtifact(ctx context.Context, obj *s
539539
// Update index symlink.
540540
indexURL, err := r.Storage.Symlink(*artifact, "index.yaml")
541541
if err != nil {
542-
r.eventLogf(ctx, obj, events.EventTypeTrace, sourcev1.SymlinkUpdateFailedReason,
542+
r.eventLogf(ctx, obj, eventv1.EventTypeTrace, sourcev1.SymlinkUpdateFailedReason,
543543
"failed to update status URL symlink: %s", err)
544544
}
545545
if indexURL != "" {
@@ -562,7 +562,7 @@ func (r *HelmRepositoryReconciler) reconcileArtifact(ctx context.Context, obj *s
562562
// Using r.Storage.LocalPath(*repo.GetArtifact() is safe as the path is in the format /<helm-repository-name>/<chart-name>/<filename>.
563563
err := chartRepo.CacheIndexInMemory()
564564
if err != nil {
565-
r.eventLogf(ctx, obj, events.EventTypeTrace, sourcev1.CacheOperationFailedReason, "failed to cache index: %s", err)
565+
r.eventLogf(ctx, obj, eventv1.EventTypeTrace, sourcev1.CacheOperationFailedReason, "failed to cache index: %s", err)
566566
}
567567
}
568568

@@ -602,7 +602,7 @@ func (r *HelmRepositoryReconciler) garbageCollect(ctx context.Context, obj *sour
602602
Reason: "GarbageCollectionFailed",
603603
}
604604
} else if deleted != "" {
605-
r.eventLogf(ctx, obj, events.EventTypeTrace, "GarbageCollectionSucceeded",
605+
r.eventLogf(ctx, obj, eventv1.EventTypeTrace, "GarbageCollectionSucceeded",
606606
"garbage collected artifacts for deleted resource")
607607
}
608608
// Clean status sub-resource
@@ -621,7 +621,7 @@ func (r *HelmRepositoryReconciler) garbageCollect(ctx context.Context, obj *sour
621621
}
622622
}
623623
if len(delFiles) > 0 {
624-
r.eventLogf(ctx, obj, events.EventTypeTrace, "GarbageCollectionSucceeded",
624+
r.eventLogf(ctx, obj, eventv1.EventTypeTrace, "GarbageCollectionSucceeded",
625625
fmt.Sprintf("garbage collected %d artifacts", len(delFiles)))
626626
return nil
627627
}

‎controllers/ocirepository_controller.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import (
3131
"time"
3232

3333
"github.com/Masterminds/semver/v3"
34+
eventv1 "github.com/fluxcd/pkg/apis/event/v1beta1"
3435
soci "github.com/fluxcd/source-controller/internal/oci"
3536
"github.com/google/go-containerregistry/pkg/authn"
3637
"github.com/google/go-containerregistry/pkg/authn/k8schain"
@@ -58,7 +59,6 @@ import (
5859
"github.com/fluxcd/pkg/oci/auth/login"
5960
"github.com/fluxcd/pkg/runtime/conditions"
6061
helper "github.com/fluxcd/pkg/runtime/controller"
61-
"github.com/fluxcd/pkg/runtime/events"
6262
"github.com/fluxcd/pkg/runtime/patch"
6363
"github.com/fluxcd/pkg/runtime/predicates"
6464
"github.com/fluxcd/pkg/sourceignore"
@@ -790,7 +790,7 @@ func (r *OCIRepositoryReconciler) keychain(ctx context.Context, obj *sourcev1.OC
790790
imagePullSecret := corev1.Secret{}
791791
err := r.Get(ctx, types.NamespacedName{Namespace: obj.Namespace, Name: imagePullSecretName}, &imagePullSecret)
792792
if err != nil {
793-
r.eventLogf(ctx, obj, events.EventTypeTrace, sourcev1.AuthenticationFailedReason,
793+
r.eventLogf(ctx, obj, eventv1.EventTypeTrace, sourcev1.AuthenticationFailedReason,
794794
"auth secret '%s' not found", imagePullSecretName)
795795
return nil, err
796796
}
@@ -929,7 +929,7 @@ func (r *OCIRepositoryReconciler) reconcileArtifact(ctx context.Context, obj *so
929929

930930
// The artifact is up-to-date
931931
if obj.GetArtifact().HasRevision(artifact.Revision) && !ociContentConfigChanged(obj) {
932-
r.eventLogf(ctx, obj, events.EventTypeTrace, sourcev1.ArtifactUpToDateReason,
932+
r.eventLogf(ctx, obj, eventv1.EventTypeTrace, sourcev1.ArtifactUpToDateReason,
933933
"artifact up-to-date with remote revision: '%s'", artifact.Revision)
934934
return sreconcile.ResultSuccess, nil
935935
}
@@ -1013,7 +1013,7 @@ func (r *OCIRepositoryReconciler) reconcileArtifact(ctx context.Context, obj *so
10131013
// Update symlink on a "best effort" basis
10141014
url, err := r.Storage.Symlink(artifact, "latest.tar.gz")
10151015
if err != nil {
1016-
r.eventLogf(ctx, obj, events.EventTypeTrace, sourcev1.SymlinkUpdateFailedReason,
1016+
r.eventLogf(ctx, obj, eventv1.EventTypeTrace, sourcev1.SymlinkUpdateFailedReason,
10171017
"failed to update status URL symlink: %s", err)
10181018
}
10191019
if url != "" {
@@ -1053,7 +1053,7 @@ func (r *OCIRepositoryReconciler) garbageCollect(ctx context.Context, obj *sourc
10531053
"GarbageCollectionFailed",
10541054
)
10551055
} else if deleted != "" {
1056-
r.eventLogf(ctx, obj, events.EventTypeTrace, "GarbageCollectionSucceeded",
1056+
r.eventLogf(ctx, obj, eventv1.EventTypeTrace, "GarbageCollectionSucceeded",
10571057
"garbage collected artifacts for deleted resource")
10581058
}
10591059
obj.Status.Artifact = nil
@@ -1068,7 +1068,7 @@ func (r *OCIRepositoryReconciler) garbageCollect(ctx context.Context, obj *sourc
10681068
)
10691069
}
10701070
if len(delFiles) > 0 {
1071-
r.eventLogf(ctx, obj, events.EventTypeTrace, "GarbageCollectionSucceeded",
1071+
r.eventLogf(ctx, obj, eventv1.EventTypeTrace, "GarbageCollectionSucceeded",
10721072
fmt.Sprintf("garbage collected %d artifacts", len(delFiles)))
10731073
return nil
10741074
}

0 commit comments

Comments
 (0)