@@ -55,7 +55,7 @@ import (
5555 "github.com/fluxcd/pkg/runtime/metrics"
5656 "github.com/fluxcd/pkg/runtime/predicates"
5757 "github.com/fluxcd/pkg/runtime/transform"
58- sourcev1 "github.com/fluxcd/source-controller/api/v1beta1 "
58+ sourcev1 "github.com/fluxcd/source-controller/api/v1beta2 "
5959
6060 v2 "github.com/fluxcd/helm-controller/api/v2beta1"
6161 "github.com/fluxcd/helm-controller/internal/kube"
@@ -78,7 +78,6 @@ type HelmReleaseReconciler struct {
7878 Scheme * runtime.Scheme
7979 requeueDependency time.Duration
8080 EventRecorder kuberecorder.EventRecorder
81- ExternalEventRecorder * events.Recorder
8281 MetricsRecorder * metrics.Recorder
8382 DefaultServiceAccount string
8483 NoCrossNamespaceRef bool
@@ -250,7 +249,7 @@ func (r *HelmReleaseReconciler) reconcile(ctx context.Context, hr v2.HelmRelease
250249 // Exponential backoff would cause execution to be prolonged too much,
251250 // instead we requeue on a fixed interval.
252251 return v2 .HelmReleaseNotReady (hr ,
253- meta .DependencyNotReadyReason , err .Error ()), ctrl.Result {RequeueAfter : r .requeueDependency }, nil
252+ v2 .DependencyNotReadyReason , err .Error ()), ctrl.Result {RequeueAfter : r .requeueDependency }, nil
254253 }
255254 log .Info ("all dependencies are ready, proceeding with release" )
256255 }
@@ -381,7 +380,13 @@ func (r *HelmReleaseReconciler) reconcileRelease(ctx context.Context,
381380 // Propagate any test error if not marked ignored.
382381 if testErr != nil && ! remediation .MustIgnoreTestFailures (hr .Spec .GetTest ().IgnoreFailures ) {
383382 testsPassing := apimeta .FindStatusCondition (hr .Status .Conditions , v2 .TestSuccessCondition )
384- meta .SetResourceCondition (& hr , v2 .ReleasedCondition , metav1 .ConditionFalse , testsPassing .Reason , testsPassing .Message )
383+ newCondition := metav1.Condition {
384+ Type : v2 .ReleasedCondition ,
385+ Status : metav1 .ConditionFalse ,
386+ Reason : testsPassing .Reason ,
387+ Message : testsPassing .Message ,
388+ }
389+ apimeta .SetStatusCondition (hr .GetStatusConditions (), newCondition )
385390 err = testErr
386391 }
387392 }
@@ -425,7 +430,7 @@ func (r *HelmReleaseReconciler) reconcileRelease(ctx context.Context,
425430 hr .Status .LastReleaseRevision = util .ReleaseRevision (rel )
426431
427432 if err != nil {
428- reason := meta .ReconciliationFailedReason
433+ reason := v2 .ReconciliationFailedReason
429434 if condErr := (* ConditionError )(nil ); errors .As (err , & condErr ) {
430435 reason = condErr .Reason
431436 }
@@ -439,7 +444,10 @@ func (r *HelmReleaseReconciler) checkDependencies(hr v2.HelmRelease) error {
439444 if d .Namespace == "" {
440445 d .Namespace = hr .GetNamespace ()
441446 }
442- dName := types .NamespacedName (d )
447+ dName := types.NamespacedName {
448+ Namespace : d .Namespace ,
449+ Name : d .Name ,
450+ }
443451 var dHr v2.HelmRelease
444452 err := r .Get (context .Background (), dName , & dHr )
445453 if err != nil {
@@ -620,7 +628,7 @@ func (r *HelmReleaseReconciler) composeValues(ctx context.Context, hr v2.HelmRel
620628 return transform .MergeMaps (result , hr .GetValues ()), nil
621629}
622630
623- // reconcileDelete deletes the v1beta1 .HelmChart of the v2beta1.HelmRelease,
631+ // reconcileDelete deletes the v1beta2 .HelmChart of the v2beta1.HelmRelease,
624632// and uninstalls the Helm release if the resource has not been suspended.
625633func (r * HelmReleaseReconciler ) reconcileDelete (ctx context.Context , hr v2.HelmRelease ) (ctrl.Result , error ) {
626634 r .recordReadiness (ctx , hr )
@@ -666,12 +674,24 @@ func (r *HelmReleaseReconciler) handleHelmActionResult(ctx context.Context,
666674 if actionErr := (* runner .ActionError )(nil ); errors .As (err , & actionErr ) {
667675 msg = msg + "\n \n Last Helm logs:\n \n " + actionErr .CapturedLogs
668676 }
669- meta .SetResourceCondition (hr , condition , metav1 .ConditionFalse , failedReason , msg )
677+ newCondition := metav1.Condition {
678+ Type : condition ,
679+ Status : metav1 .ConditionFalse ,
680+ Reason : failedReason ,
681+ Message : msg ,
682+ }
683+ apimeta .SetStatusCondition (hr .GetStatusConditions (), newCondition )
670684 r .event (ctx , * hr , revision , events .EventSeverityError , msg )
671685 return & ConditionError {Reason : failedReason , Err : err }
672686 } else {
673687 msg := fmt .Sprintf ("Helm %s succeeded" , action )
674- meta .SetResourceCondition (hr , condition , metav1 .ConditionTrue , succeededReason , msg )
688+ newCondition := metav1.Condition {
689+ Type : condition ,
690+ Status : metav1 .ConditionTrue ,
691+ Reason : succeededReason ,
692+ Message : msg ,
693+ }
694+ apimeta .SetStatusCondition (hr .GetStatusConditions (), newCondition )
675695 r .event (ctx , * hr , revision , events .EventSeverityInfo , msg )
676696 return nil
677697 }
@@ -718,28 +738,15 @@ func (r *HelmReleaseReconciler) requestsForHelmChartChange(o client.Object) []re
718738
719739// event emits a Kubernetes event and forwards the event to notification controller if configured.
720740func (r * HelmReleaseReconciler ) event (ctx context.Context , hr v2.HelmRelease , revision , severity , msg string ) {
721- if r .EventRecorder != nil {
722- r .EventRecorder .Event (& hr , "Normal" , severity , msg )
723- }
724-
725- if r .ExternalEventRecorder == nil {
726- return
727- }
728-
729- objRef , err := reference .GetReference (r .Scheme , & hr )
730- if err != nil {
731- ctrl .LoggerFrom (ctx ).Error (err , "unable to send event" )
732- return
733- }
734-
735741 var meta map [string ]string
736742 if revision != "" {
737743 meta = map [string ]string {"revision" : revision }
738744 }
739- if err := r . ExternalEventRecorder . Eventf ( * objRef , meta , severity , severity , msg ); err != nil {
740- ctrl . LoggerFrom ( ctx ). Error ( err , "unable to send event" )
741- return
745+ eventtype := "Normal"
746+ if severity == events . EventSeverityError {
747+ eventtype = "Warning"
742748 }
749+ r .EventRecorder .AnnotatedEventf (& hr , meta , eventtype , severity , msg )
743750}
744751
745752func (r * HelmReleaseReconciler ) recordSuspension (ctx context.Context , hr v2.HelmRelease ) {
0 commit comments