Skip to content

Commit 8c314b1

Browse files
committed
Remove grace period from csv deletions
Signed-off-by: perdasilva <[email protected]>
1 parent d795a1d commit 8c314b1

File tree

1 file changed

+2
-2
lines changed
  • staging/operator-lifecycle-manager/pkg/controller/operators/olm

1 file changed

+2
-2
lines changed

staging/operator-lifecycle-manager/pkg/controller/operators/olm/operator.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1154,7 +1154,7 @@ func (a *Operator) removeDanglingChildCSVs(csv *v1alpha1.ClusterServiceVersion)
11541154

11551155
func (a *Operator) deleteChild(csv *v1alpha1.ClusterServiceVersion, logger *logrus.Entry) error {
11561156
logger.Debug("gcing csv")
1157-
return a.client.OperatorsV1alpha1().ClusterServiceVersions(csv.GetNamespace()).Delete(context.TODO(), csv.GetName(), *metav1.NewDeleteOptions(0))
1157+
return a.client.OperatorsV1alpha1().ClusterServiceVersions(csv.GetNamespace()).Delete(context.TODO(), csv.GetName(), metav1.DeleteOptions{})
11581158
}
11591159

11601160
// syncClusterServiceVersion is the method that gets called when we see a CSV event in the cluster
@@ -2105,7 +2105,7 @@ func (a *Operator) transitionCSVState(in v1alpha1.ClusterServiceVersion) (out *v
21052105
syncError = fmt.Errorf("marked as replacement, but no replacement CSV found in cluster")
21062106
}
21072107
case v1alpha1.CSVPhaseDeleting:
2108-
syncError = a.client.OperatorsV1alpha1().ClusterServiceVersions(out.GetNamespace()).Delete(context.TODO(), out.GetName(), *metav1.NewDeleteOptions(0))
2108+
syncError = a.client.OperatorsV1alpha1().ClusterServiceVersions(out.GetNamespace()).Delete(context.TODO(), out.GetName(), metav1.DeleteOptions{})
21092109
if syncError != nil {
21102110
logger.Debugf("unable to get delete csv marked for deletion: %s", syncError.Error())
21112111
}

0 commit comments

Comments
 (0)