Skip to content

fix: requeue at dependency interval for missing object refs #1577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Bisman-Singh wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: requeue at dependency interval for missing object refs #1577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb55fa1
Requeue at dependency interval for missing object refs
Bisman-Singh Aug 31, 2026
561c097
Merge branch 'main' into fix/requeue-missing-refs-at-dependency-interval
Bisman-Singh Sep 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions internal/controller/helmrelease_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,13 @@ func (r *HelmReleaseReconciler) reconcileRelease(ctx context.Context,

msg := fmt.Sprintf("could not get Source object: %s", err.Error())
conditions.MarkFalse(obj, meta.ReadyCondition, v2.ArtifactFailedReason, "%s", msg)

if apierrors.IsNotFound(err) {
// Exponential backoff would cause execution to be prolonged too much,
// instead we requeue on a fixed interval.
log.Info(fmt.Sprintf("%s: retrying in %s", msg, r.DependencyRequeueInterval.String()))
return ctrl.Result{RequeueAfter: r.DependencyRequeueInterval}, errWaitForDependency
}
return ctrl.Result{}, err
}
// Remove any stale corresponding Ready=False condition with Unknown.
Expand Down Expand Up @@ -318,6 +325,13 @@ func (r *HelmReleaseReconciler) reconcileRelease(ctx context.Context,
if err != nil {
conditions.MarkFalse(obj, meta.ReadyCondition, "ValuesError", "%s", err)
r.Eventf(obj, corev1.EventTypeWarning, "ValuesError", "%s", err.Error())

if errors.Is(err, chartutil.ErrResourceNotFound) {
// Exponential backoff would cause execution to be prolonged too much,
// instead we requeue on a fixed interval.
log.Info(fmt.Sprintf("%s: retrying in %s", err.Error(), r.DependencyRequeueInterval.String()))
return ctrl.Result{RequeueAfter: r.DependencyRequeueInterval}, errWaitForDependency
}
return ctrl.Result{}, err
}
// Remove any stale corresponding Ready=False condition with Unknown.
Expand Down
127 changes: 122 additions & 5 deletions internal/controller/helmrelease_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,20 @@ func TestHelmReleaseReconciler_reconcileRelease(t *testing.T) {
},
}

mockErr := errors.New("mock get failure")
r := &HelmReleaseReconciler{
Client: fake.NewClientBuilder().
WithScheme(NewTestScheme()).
WithStatusSubresource(&v2.HelmRelease{}).
WithObjects(obj).
WithInterceptorFuncs(interceptor.Funcs{
Get: func(ctx context.Context, client client.WithWatch, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
if _, ok := obj.(*sourcev1.HelmChart); ok {
return mockErr
}
return client.Get(ctx, key, obj, opts...)
},
}).
Build(),
}
r.APIReader = r.Client
Expand All @@ -152,6 +161,39 @@ func TestHelmReleaseReconciler_reconcileRelease(t *testing.T) {
}))
})

t.Run("waits for HelmChart to exist", func(t *testing.T) {
g := NewWithT(t)

obj := &v2.HelmRelease{
ObjectMeta: metav1.ObjectMeta{
Name: "release",
Namespace: "mock",
},
Status: v2.HelmReleaseStatus{
HelmChart: "mock/chart",
},
}

r := &HelmReleaseReconciler{
Client: fake.NewClientBuilder().
WithScheme(NewTestScheme()).
WithStatusSubresource(&v2.HelmRelease{}).
WithObjects(obj).
Build(),
DependencyRequeueInterval: 10 * time.Second,
}
r.APIReader = r.Client

res, err := r.reconcileRelease(context.TODO(), patch.NewSerialPatcher(obj, r.Client), obj, nil)
g.Expect(err).To(Equal(errWaitForDependency))
g.Expect(res.RequeueAfter).To(Equal(r.DependencyRequeueInterval))

g.Expect(obj.Status.Conditions).To(conditions.MatchConditions([]metav1.Condition{
*conditions.TrueCondition(meta.ReconcilingCondition, meta.ProgressingReason, "Fulfilling prerequisites"),
*conditions.FalseCondition(meta.ReadyCondition, v2.ArtifactFailedReason, "could not get Source object"),
}))
})

t.Run("handles ACL error for HelmChart", func(t *testing.T) {
g := NewWithT(t)

Expand Down Expand Up @@ -323,6 +365,16 @@ func TestHelmReleaseReconciler_reconcileRelease(t *testing.T) {
},
}

secret := &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: "values",
Namespace: "mock",
},
Data: map[string][]byte{
"foo": []byte("bar"),
},
}

obj := &v2.HelmRelease{
ObjectMeta: metav1.ObjectMeta{
Name: "release",
Expand All @@ -332,7 +384,7 @@ func TestHelmReleaseReconciler_reconcileRelease(t *testing.T) {
ValuesFrom: []meta.ValuesReference{
{
Kind: "Secret",
Name: "missing",
Name: "values",
},
},
},
Expand All @@ -345,7 +397,7 @@ func TestHelmReleaseReconciler_reconcileRelease(t *testing.T) {
Client: fake.NewClientBuilder().
WithScheme(NewTestScheme()).
WithStatusSubresource(&v2.HelmRelease{}).
WithObjects(chart, obj).
WithObjects(chart, secret, obj).
Build(),
EventRecorder: record.NewFakeRecorder(32),
}
Expand All @@ -354,6 +406,69 @@ func TestHelmReleaseReconciler_reconcileRelease(t *testing.T) {
_, err := r.reconcileRelease(context.TODO(), patch.NewSerialPatcher(obj, r.Client), obj, nil)
g.Expect(err).To(HaveOccurred())

g.Expect(obj.Status.Conditions).To(conditions.MatchConditions([]metav1.Condition{
*conditions.TrueCondition(meta.ReconcilingCondition, meta.ProgressingReason, "Fulfilling prerequisites"),
*conditions.FalseCondition(meta.ReadyCondition, "ValuesError", "could not resolve Secret chart values reference 'mock/values' with key 'values.yaml'"),
}))
})

t.Run("waits for values reference to exist", func(t *testing.T) {
g := NewWithT(t)

chart := &sourcev1.HelmChart{
ObjectMeta: metav1.ObjectMeta{
Name: "chart",
Namespace: "mock",
Generation: 2,
},
Spec: sourcev1.HelmChartSpec{
Interval: metav1.Duration{Duration: 1 * time.Second},
},
Status: sourcev1.HelmChartStatus{
ObservedGeneration: 2,
Artifact: &meta.Artifact{},
Conditions: []metav1.Condition{
{
Type: meta.ReadyCondition,
Status: metav1.ConditionTrue,
},
},
},
}

obj := &v2.HelmRelease{
ObjectMeta: metav1.ObjectMeta{
Name: "release",
Namespace: "mock",
},
Spec: v2.HelmReleaseSpec{
ValuesFrom: []meta.ValuesReference{
{
Kind: "Secret",
Name: "missing",
},
},
},
Status: v2.HelmReleaseStatus{
HelmChart: "mock/chart",
},
}

r := &HelmReleaseReconciler{
Client: fake.NewClientBuilder().
WithScheme(NewTestScheme()).
WithStatusSubresource(&v2.HelmRelease{}).
WithObjects(chart, obj).
Build(),
EventRecorder: record.NewFakeRecorder(32),
DependencyRequeueInterval: 10 * time.Second,
}
r.APIReader = r.Client

res, err := r.reconcileRelease(context.TODO(), patch.NewSerialPatcher(obj, r.Client), obj, nil)
g.Expect(err).To(Equal(errWaitForDependency))
g.Expect(res.RequeueAfter).To(Equal(r.DependencyRequeueInterval))

g.Expect(obj.Status.Conditions).To(conditions.MatchConditions([]metav1.Condition{
*conditions.TrueCondition(meta.ReconcilingCondition, meta.ProgressingReason, "Fulfilling prerequisites"),
*conditions.FalseCondition(meta.ReadyCondition, "ValuesError", "could not resolve Secret chart values reference 'mock/missing' with key 'values.yaml'"),
Expand Down Expand Up @@ -1119,11 +1234,13 @@ func TestHelmReleaseReconciler_reconcileReleaseFromHelmChartSource(t *testing.T)
WithStatusSubresource(&v2.HelmRelease{}).
WithObjects(obj).
Build(),
EventRecorder: record.NewFakeRecorder(32),
EventRecorder: record.NewFakeRecorder(32),
DependencyRequeueInterval: 10 * time.Second,
}

_, err := r.reconcileRelease(context.TODO(), patch.NewSerialPatcher(obj, r.Client), obj, nil)
g.Expect(err).To(HaveOccurred())
res, err := r.reconcileRelease(context.TODO(), patch.NewSerialPatcher(obj, r.Client), obj, nil)
g.Expect(err).To(Equal(errWaitForDependency))
g.Expect(res.RequeueAfter).To(Equal(r.DependencyRequeueInterval))

g.Expect(obj.Status.Conditions).To(conditions.MatchConditions([]metav1.Condition{
*conditions.TrueCondition(meta.ReconcilingCondition, meta.ProgressingReason, "Fulfilling prerequisites"),
Expand Down