fix(deleteOp): Set received GracePeriod value to the operation itself (…

…#5624) * fix(deleteOp): Set received GracePeriod value to the operation itself * chore(deleteOp): Handle GracePeriod parse * fix(deleteOp): Import log dependencies Co-authored-by: Digital On Us <[email protected]>
spinnaker · Feb 8, 2022 · f3b3934 · f3b3934
1 parent cb31a6f
commit f3b3934
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/...tflix/spinnaker/clouddriver/kubernetes/op/manifest/KubernetesDeleteManifestOperation.java b/...tflix/spinnaker/clouddriver/kubernetes/op/manifest/KubernetesDeleteManifestOperation.java
@@ -30,8 +30,12 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class KubernetesDeleteManifestOperation implements AtomicOperation<OperationResult> {
+  private static final Logger log =
+      LoggerFactory.getLogger(KubernetesDeleteManifestOperation.class);
   private final KubernetesDeleteManifestDescription description;
   private final KubernetesCredentials credentials;
   private static final String OP_NAME = "DELETE_KUBERNETES_MANIFEST";
@@ -68,7 +72,13 @@ public OperationResult operate(List<OperationResult> priorOutputs) {
     } else if (options.containsKey("cascading")) {
       deleteOptions.setOrphanDependents(options.get("cascading").equalsIgnoreCase("false"));
     }
-
+    if (options.containsKey("gracePeriodSeconds")) {
+      try {
+        deleteOptions.setGracePeriodSeconds(Long.parseLong(options.get("gracePeriodSeconds")));
+      } catch (NumberFormatException nfe) {
+        log.warn("Unable to parse gracePeriodSeconds; {}", nfe.getMessage());
+      }
+    }
     OperationResult result = new OperationResult();
     coordinates.forEach(
         c -> {