Skip to content

Commit 783bebf

Browse files
authored
Remove grace period from csv deletions (#2580)
Signed-off-by: perdasilva <[email protected]>
1 parent e4b1532 commit 783bebf

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

pkg/controller/operators/olm/operator.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1246,7 +1246,7 @@ func (a *Operator) removeDanglingChildCSVs(csv *v1alpha1.ClusterServiceVersion)
12461246

12471247
func (a *Operator) deleteChild(csv *v1alpha1.ClusterServiceVersion, logger *logrus.Entry) error {
12481248
logger.Debug("gcing csv")
1249-
return a.client.OperatorsV1alpha1().ClusterServiceVersions(csv.GetNamespace()).Delete(context.TODO(), csv.GetName(), *metav1.NewDeleteOptions(0))
1249+
return a.client.OperatorsV1alpha1().ClusterServiceVersions(csv.GetNamespace()).Delete(context.TODO(), csv.GetName(), metav1.DeleteOptions{})
12501250
}
12511251

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

0 commit comments

Comments
 (0)