Merge pull request #1871 from k-wall/issue-1859

fabric8io · Nov 20, 2019 · fbb6901 · fbb6901
2 parents fcc59c2 + ed06915
commit fbb6901
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### 4.7-SNAPSHOT
 #### Bugs
 * Fix disabled Integration tests
+* Fix #1859 - Pass caller's propagation-policy/cascade options to the underlying replicaset when deleting a deployment
 
 #### Improvements
 

diff --git a/...ent/src/main/java/io/fabric8/kubernetes/client/dsl/internal/DeploymentOperationsImpl.java b/...ent/src/main/java/io/fabric8/kubernetes/client/dsl/internal/DeploymentOperationsImpl.java
@@ -290,10 +290,18 @@ private void reapMatchingReplicaSets(LabelSelector selector) {
       if (selector == null || (selector.getMatchLabels() == null && selector.getMatchExpressions() == null)) {
         return;
       }
-      ReplicaSetOperationsImpl rsOper = new ReplicaSetOperationsImpl(new RollingOperationContext()
+      RollingOperationContext context = new RollingOperationContext()
         .withOkhttpClient(oper.client)
         .withConfig(oper.config)
-        .withNamespace(oper.getNamespace()));
+        .withNamespace(oper.getNamespace());
+
+      if (oper.getPropagationPolicy() != null) {
+        context = context.withPropagationPolicy(oper.getPropagationPolicy());
+      } else if (oper.isCascading()) {
+        context = context.withCascading(oper.isCascading());
+      }
+
+      ReplicaSetOperationsImpl rsOper = new ReplicaSetOperationsImpl(context);
       rsOper.inNamespace(oper.getNamespace()).withLabelSelector(selector).delete();
     }
   }