Skip to content

Commit 5519f87

Browse files
committed
fix: check HelmReleaseReadyCondition when status is up-to-date
Only checking for HelmReleaseReadyCondition may not be enough, especially during cluster upgrades where the values in the HCP have changed.
1 parent 5dc7cbb commit 5519f87

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

pkg/handlers/generic/lifecycle/addons/helmaddon.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,10 @@ func waitToBeReady(
228228
Reader: client,
229229
Target: hcp.DeepCopy(),
230230
Check: func(_ context.Context, obj *caaphv1.HelmChartProxy) (bool, error) {
231-
return conditions.IsTrue(obj, caaphv1.HelmReleaseProxiesReadyCondition), nil
231+
if obj.ObjectMeta.Generation != obj.Status.ObservedGeneration {
232+
return false, nil
233+
}
234+
return conditions.IsTrue(obj, caaphv1.HelmReleaseReadyCondition), nil
232235
},
233236
Interval: 5 * time.Second,
234237
Timeout: 30 * time.Second,

0 commit comments

Comments
 (0)