Skip to content

Commit e236de3

Browse files
committed
Remove Stackrox specific workaround
1 parent 1c07dc0 commit e236de3

File tree

2 files changed

+1
-13
lines changed

2 files changed

+1
-13
lines changed

pkg/reconciler/internal/updater/updater.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,6 @@ func EnsureConditionUnknown(t status.ConditionType) UpdateStatusFunc {
146146
}
147147
}
148148

149-
func EnsureConditionAbsent(t status.ConditionType) UpdateStatusFunc {
150-
return func(status *helmAppStatus) bool {
151-
return status.Conditions.RemoveCondition(t)
152-
}
153-
}
154-
155149
func EnsureDeployedRelease(rel *release.Release) UpdateStatusFunc {
156150
return func(status *helmAppStatus) bool {
157151
newRel := helmAppReleaseFor(rel)

pkg/reconciler/reconciler.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -621,13 +621,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Re
621621
}
622622
}
623623

624-
u.UpdateStatus(
625-
// TODO(ROX-12637): change to updater.EnsureCondition(conditions.Paused(corev1.ConditionFalse, "", "")))
626-
// once stackrox operator with pause support is released.
627-
// At that time also add `Paused` to the list of conditions expected in stackrox operator e2e tests.
628-
// Otherwise, the number of conditions in the `status.conditions` list will vary depending on the version
629-
// of used operator, which is cumbersome due to https://github.com/kudobuilder/kuttl/issues/76
630-
updater.EnsureConditionAbsent(conditions.TypePaused))
624+
u.UpdateStatus(updater.EnsureCondition(conditions.Paused(corev1.ConditionFalse, "", "")))
631625

632626
actionClient, err := r.actionClientGetter.ActionClientFor(ctx, obj)
633627
if err != nil {

0 commit comments

Comments
 (0)