From 31c6661b129c3c6e06ea5f6f50078eacdeed77e9 Mon Sep 17 00:00:00 2001 From: Paul Laffitte Date: Thu, 8 Aug 2024 17:46:56 +0200 Subject: [PATCH 1/2] fix: repository LastUpdate status wasn't updated --- internal/controller/kuik/repository_controller.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/internal/controller/kuik/repository_controller.go b/internal/controller/kuik/repository_controller.go index 7b9d3300..cd451ee6 100644 --- a/internal/controller/kuik/repository_controller.go +++ b/internal/controller/kuik/repository_controller.go @@ -167,10 +167,16 @@ func (r *RepositoryReconciler) Reconcile(ctx context.Context, req ctrl.Request) cachedImage.Annotations = map[string]string{} } cachedImage.Annotations[cachedImageAnnotationForceUpdateName] = "true" - r.Patch(ctx, &cachedImage, patch) + err = r.Patch(ctx, &cachedImage, patch) + if err != nil { + return ctrl.Result{}, err + } } repository.Status.LastUpdate = metav1.NewTime(time.Now()) + if err := r.Status().Update(ctx, &repository); err != nil { + return ctrl.Result{}, err + } } } From 6c2ce61d041f1b3b6b6277015a353ee08b020bb3 Mon Sep 17 00:00:00 2001 From: Paul Laffitte Date: Thu, 8 Aug 2024 17:47:47 +0200 Subject: [PATCH 2/2] fix: cachedimages with non-nil expiresAt where not updated --- internal/controller/kuik/cachedimage_controller.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/internal/controller/kuik/cachedimage_controller.go b/internal/controller/kuik/cachedimage_controller.go index 39767040..d3631d01 100644 --- a/internal/controller/kuik/cachedimage_controller.go +++ b/internal/controller/kuik/cachedimage_controller.go @@ -230,8 +230,6 @@ func (r *CachedImageReconciler) Reconcile(ctx context.Context, req ctrl.Request) } r.Recorder.Eventf(&cachedImage, "Normal", "Expired", "Image %s successfully expired", cachedImage.Spec.SourceImage) return ctrl.Result{}, nil - } else { - return ctrl.Result{RequeueAfter: time.Until(expiresAt.Time)}, nil } } @@ -264,6 +262,11 @@ func (r *CachedImageReconciler) Reconcile(ctx context.Context, req ctrl.Request) } log.Info("cachedimage reconciled") + + if !expiresAt.IsZero() { + return ctrl.Result{RequeueAfter: time.Until(expiresAt.Time)}, nil + } + return ctrl.Result{}, nil }