Remove grace period from csv deletions

Signed-off-by: perdasilva <[email protected]>

Author: perdasilva

staging/operator-lifecycle-manager/pkg/api/wrappers/deployment_install_client.go

@@ -104,8 +104,8 @@ func (c *InstallStrategyDeploymentClientForNamespace) CreateDeployment(deploymen
 func (c *InstallStrategyDeploymentClientForNamespace) DeleteDeployment(name string) error {
 	foregroundDelete := metav1.DeletePropagationForeground // cascading delete
 	// Note(tflannag): See https://bugzilla.redhat.com/show_bug.cgi?id=1939294.
-	immediate := int64(1)
-	immediateForegroundDelete := &metav1.DeleteOptions{GracePeriodSeconds: &immediate, PropagationPolicy: &foregroundDelete}
+	// immediate := int64(1)
+	immediateForegroundDelete := &metav1.DeleteOptions{GracePeriodSeconds: nil, PropagationPolicy: &foregroundDelete}
 	return c.opClient.DeleteDeployment(c.Namespace, name, immediateForegroundDelete)
 }
 

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

@@ -1154,7 +1154,7 @@ func (a *Operator) removeDanglingChildCSVs(csv *v1alpha1.ClusterServiceVersion)
 
 func (a *Operator) deleteChild(csv *v1alpha1.ClusterServiceVersion, logger *logrus.Entry) error {
 	logger.Debug("gcing csv")
-	return a.client.OperatorsV1alpha1().ClusterServiceVersions(csv.GetNamespace()).Delete(context.TODO(), csv.GetName(), *metav1.NewDeleteOptions(0))
+	return a.client.OperatorsV1alpha1().ClusterServiceVersions(csv.GetNamespace()).Delete(context.TODO(), csv.GetName(), metav1.DeleteOptions{})
 }
 
 // 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
 			syncError = fmt.Errorf("marked as replacement, but no replacement CSV found in cluster")
 		}
 	case v1alpha1.CSVPhaseDeleting:
-		syncError = a.client.OperatorsV1alpha1().ClusterServiceVersions(out.GetNamespace()).Delete(context.TODO(), out.GetName(), *metav1.NewDeleteOptions(0))
+		syncError = a.client.OperatorsV1alpha1().ClusterServiceVersions(out.GetNamespace()).Delete(context.TODO(), out.GetName(), metav1.DeleteOptions{})
 		if syncError != nil {
 			logger.Debugf("unable to get delete csv marked for deletion: %s", syncError.Error())
 		}