Skip to content

Commit 3536b01

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

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

pkg/controller/operators/olm/operator.go

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

11501150
func (a *Operator) deleteChild(csv *v1alpha1.ClusterServiceVersion, logger *logrus.Entry) error {
11511151
logger.Debug("gcing csv")
1152-
return a.client.OperatorsV1alpha1().ClusterServiceVersions(csv.GetNamespace()).Delete(context.TODO(), csv.GetName(), *metav1.NewDeleteOptions(0))
1152+
return a.client.OperatorsV1alpha1().ClusterServiceVersions(csv.GetNamespace()).Delete(context.TODO(), csv.GetName(), metav1.DeleteOptions{})
11531153
}
11541154

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

0 commit comments

Comments
 (0)