@@ -50,10 +50,10 @@ import (
5050 "sigs.k8s.io/controller-runtime/pkg/source"
5151
5252 apiacl "github.com/fluxcd/pkg/apis/acl"
53+ eventv1 "github.com/fluxcd/pkg/apis/event/v1beta1"
5354 "github.com/fluxcd/pkg/apis/meta"
5455 "github.com/fluxcd/pkg/runtime/acl"
5556 fluxClient "github.com/fluxcd/pkg/runtime/client"
56- "github.com/fluxcd/pkg/runtime/events"
5757 "github.com/fluxcd/pkg/runtime/metrics"
5858 "github.com/fluxcd/pkg/runtime/predicates"
5959 "github.com/fluxcd/pkg/runtime/transform"
@@ -226,20 +226,20 @@ func (r *HelmReleaseReconciler) reconcile(ctx context.Context, hr v2.HelmRelease
226226 if reconcileErr != nil {
227227 if acl .IsAccessDenied (reconcileErr ) {
228228 log .Error (reconcileErr , "access denied to cross-namespace source" )
229- r .event (ctx , hr , hr .Status .LastAttemptedRevision , events .EventSeverityError , reconcileErr .Error ())
229+ r .event (ctx , hr , hr .Status .LastAttemptedRevision , eventv1 .EventSeverityError , reconcileErr .Error ())
230230 return v2 .HelmReleaseNotReady (hr , apiacl .AccessDeniedReason , reconcileErr .Error ()),
231231 ctrl.Result {RequeueAfter : hr .Spec .Interval .Duration }, nil
232232 }
233233
234234 msg := fmt .Sprintf ("chart reconciliation failed: %s" , reconcileErr .Error ())
235- r .event (ctx , hr , hr .Status .LastAttemptedRevision , events .EventSeverityError , msg )
235+ r .event (ctx , hr , hr .Status .LastAttemptedRevision , eventv1 .EventSeverityError , msg )
236236 return v2 .HelmReleaseNotReady (hr , v2 .ArtifactFailedReason , msg ), ctrl.Result {Requeue : true }, reconcileErr
237237 }
238238
239239 // Check chart readiness
240240 if hc .Generation != hc .Status .ObservedGeneration || ! apimeta .IsStatusConditionTrue (hc .Status .Conditions , meta .ReadyCondition ) {
241241 msg := fmt .Sprintf ("HelmChart '%s/%s' is not ready" , hc .GetNamespace (), hc .GetName ())
242- r .event (ctx , hr , hr .Status .LastAttemptedRevision , events .EventSeverityInfo , msg )
242+ r .event (ctx , hr , hr .Status .LastAttemptedRevision , eventv1 .EventSeverityInfo , msg )
243243 log .Info (msg )
244244 // Do not requeue immediately, when the artifact is created
245245 // the watcher should trigger a reconciliation.
@@ -251,7 +251,7 @@ func (r *HelmReleaseReconciler) reconcile(ctx context.Context, hr v2.HelmRelease
251251 if err := r .checkDependencies (hr ); err != nil {
252252 msg := fmt .Sprintf ("dependencies do not meet ready condition (%s), retrying in %s" ,
253253 err .Error (), r .requeueDependency .String ())
254- r .event (ctx , hr , hc .GetArtifact ().Revision , events .EventSeverityInfo , msg )
254+ r .event (ctx , hr , hc .GetArtifact ().Revision , eventv1 .EventSeverityInfo , msg )
255255 log .Info (msg )
256256
257257 // Exponential backoff would cause execution to be prolonged too much,
@@ -265,21 +265,21 @@ func (r *HelmReleaseReconciler) reconcile(ctx context.Context, hr v2.HelmRelease
265265 // Compose values
266266 values , err := r .composeValues (ctx , hr )
267267 if err != nil {
268- r .event (ctx , hr , hr .Status .LastAttemptedRevision , events .EventSeverityError , err .Error ())
268+ r .event (ctx , hr , hr .Status .LastAttemptedRevision , eventv1 .EventSeverityError , err .Error ())
269269 return v2 .HelmReleaseNotReady (hr , v2 .InitFailedReason , err .Error ()), ctrl.Result {Requeue : true }, nil
270270 }
271271
272272 // Load chart from artifact
273273 chart , err := r .loadHelmChart (hc )
274274 if err != nil {
275- r .event (ctx , hr , hr .Status .LastAttemptedRevision , events .EventSeverityError , err .Error ())
275+ r .event (ctx , hr , hr .Status .LastAttemptedRevision , eventv1 .EventSeverityError , err .Error ())
276276 return v2 .HelmReleaseNotReady (hr , v2 .ArtifactFailedReason , err .Error ()), ctrl.Result {Requeue : true }, nil
277277 }
278278
279279 // Reconcile Helm release
280280 reconciledHr , reconcileErr := r .reconcileRelease (ctx , * hr .DeepCopy (), chart , values )
281281 if reconcileErr != nil {
282- r .event (ctx , hr , hc .GetArtifact ().Revision , events .EventSeverityError ,
282+ r .event (ctx , hr , hc .GetArtifact ().Revision , eventv1 .EventSeverityError ,
283283 fmt .Sprintf ("reconciliation failed: %s" , reconcileErr .Error ()))
284284 }
285285 return reconciledHr , ctrl.Result {RequeueAfter : hr .Spec .Interval .Duration }, reconcileErr
@@ -361,13 +361,13 @@ func (r *HelmReleaseReconciler) reconcileRelease(ctx context.Context,
361361 // Deploy the release.
362362 var deployAction v2.DeploymentAction
363363 if rel == nil {
364- r .event (ctx , hr , revision , events .EventSeverityInfo , "Helm install has started" )
364+ r .event (ctx , hr , revision , eventv1 .EventSeverityInfo , "Helm install has started" )
365365 deployAction = hr .Spec .GetInstall ()
366366 rel , err = run .Install (hr , chart , values )
367367 err = r .handleHelmActionResult (ctx , & hr , revision , err , deployAction .GetDescription (),
368368 v2 .ReleasedCondition , v2 .InstallSucceededReason , v2 .InstallFailedReason )
369369 } else {
370- r .event (ctx , hr , revision , events .EventSeverityInfo , "Helm upgrade has started" )
370+ r .event (ctx , hr , revision , eventv1 .EventSeverityInfo , "Helm upgrade has started" )
371371 deployAction = hr .Spec .GetUpgrade ()
372372 rel , err = run .Upgrade (hr , chart , values )
373373 err = r .handleHelmActionResult (ctx , & hr , revision , err , deployAction .GetDescription (),
@@ -666,7 +666,7 @@ func (r *HelmReleaseReconciler) handleHelmActionResult(ctx context.Context,
666666 Message : msg ,
667667 }
668668 apimeta .SetStatusCondition (hr .GetStatusConditions (), newCondition )
669- r .event (ctx , * hr , revision , events .EventSeverityError , msg )
669+ r .event (ctx , * hr , revision , eventv1 .EventSeverityError , msg )
670670 return & ConditionError {Reason : failedReason , Err : err }
671671 } else {
672672 msg := fmt .Sprintf ("Helm %s succeeded" , action )
@@ -677,7 +677,7 @@ func (r *HelmReleaseReconciler) handleHelmActionResult(ctx context.Context,
677677 Message : msg ,
678678 }
679679 apimeta .SetStatusCondition (hr .GetStatusConditions (), newCondition )
680- r .event (ctx , * hr , revision , events .EventSeverityInfo , msg )
680+ r .event (ctx , * hr , revision , eventv1 .EventSeverityInfo , msg )
681681 return nil
682682 }
683683}
@@ -728,7 +728,7 @@ func (r *HelmReleaseReconciler) event(_ context.Context, hr v2.HelmRelease, revi
728728 meta = map [string ]string {v2 .GroupVersion .Group + "/revision" : revision }
729729 }
730730 eventtype := "Normal"
731- if severity == events .EventSeverityError {
731+ if severity == eventv1 .EventSeverityError {
732732 eventtype = "Warning"
733733 }
734734 r .EventRecorder .AnnotatedEventf (& hr , meta , eventtype , severity , msg )
0 commit comments