diff --git a/acto/checker/impl/health.py b/acto/checker/impl/health.py
index d2e09336a4..fa73d7f398 100644
--- a/acto/checker/impl/health.py
+++ b/acto/checker/impl/health.py
@@ -16,7 +16,8 @@ def check(self, _: int, snapshot: Snapshot, __: Snapshot) -> OracleResult:
             'statefulset': [],
             'deployment': [],
             'pod': [],
-            'cr': []
+            'cr': [],
+            'daemon_set': [],
         }
 
         # check Health of Statefulsets
@@ -53,6 +54,16 @@ def check(self, _: int, snapshot: Snapshot, __: Snapshot) -> OracleResult:
                         (dp['metadata']['name'], condition['type'], condition['status'],
                          condition['message']))
 
+        for daemonset in system_state['daemon_set'].values():
+            if (daemonset['status']['desired_number_scheduled'] != daemonset['status'][
+                'number_ready']
+                    or daemonset['status']['desired_number_scheduled'] != daemonset['status']['number_available']):
+                unhealthy_resources['daemon_set'].append(
+                    '%s desired_number_scheduled [%s] number_ready [%s]' %
+                    (daemonset['metadata']['name'],
+                     daemonset['status']['desired_number_scheduled'],
+                     daemonset['status']['number_ready']))
+
         # check Health of Pods
         for pod in system_state['pod'].values():
             if pod['status']['phase'] in ['Running', 'Completed', 'Succeeded']:
@@ -74,10 +85,10 @@ def check(self, _: int, snapshot: Snapshot, __: Snapshot) -> OracleResult:
 
         # check Health of CRs
         if system_state['custom_resource_status'] is not None and 'conditions' in system_state[
-            'custom_resource_status']:
+                'custom_resource_status']:
             for condition in system_state['custom_resource_status']['conditions']:
                 if condition['type'] == 'Ready' and condition[
-                    'status'] != 'True' and 'is forbidden' in condition['message'].lower():
+                        'status'] != 'True' and 'is forbidden' in condition['message'].lower():
                     unhealthy_resources['cr'].append('%s condition [%s] status [%s] message [%s]' %
                                                      ('CR status unhealthy', condition['type'],
                                                       condition['status'], condition['message']))
diff --git a/acto/checker/impl/tests/crash_system_state_0.json b/acto/checker/impl/tests/crash_system_state_0.json
index b1be4d2506..5cd70ee01e 100644
--- a/acto/checker/impl/tests/crash_system_state_0.json
+++ b/acto/checker/impl/tests/crash_system_state_0.json
@@ -5677,6 +5677,8 @@
       }
     }
   },
+  "daemonset_pods": {},
+  "daemon_set": {},
   "config_map": {
     "kube-root-ca.crt": {
       "api_version": null,
diff --git a/acto/checker/impl/tests/crash_system_state_1.json b/acto/checker/impl/tests/crash_system_state_1.json
index 3500ae33ac..b07293b245 100644
--- a/acto/checker/impl/tests/crash_system_state_1.json
+++ b/acto/checker/impl/tests/crash_system_state_1.json
@@ -7124,6 +7124,8 @@
       }
     }
   },
+  "daemonset_pods": {},
+  "daemon_set": {},
   "config_map": {
     "kube-root-ca.crt": {
       "api_version": null,
diff --git a/acto/checker/impl/tests/health_system_state_0.json b/acto/checker/impl/tests/health_system_state_0.json
index 0614d90789..d064ca8dc3 100644
--- a/acto/checker/impl/tests/health_system_state_0.json
+++ b/acto/checker/impl/tests/health_system_state_0.json
@@ -5890,6 +5890,8 @@
       }
     }
   },
+  "daemonset_pods": {},
+  "daemon_set": {},
   "config_map": {
     "kube-root-ca.crt": {
       "api_version": null,
diff --git a/acto/checker/impl/tests/health_system_state_1.json b/acto/checker/impl/tests/health_system_state_1.json
index 614c06336b..97d114b3db 100644
--- a/acto/checker/impl/tests/health_system_state_1.json
+++ b/acto/checker/impl/tests/health_system_state_1.json
@@ -2235,6 +2235,8 @@
       }
     }
   },
+  "daemonset_pods": {},
+  "daemon_set": {},
   "config_map": {
     "b569adb7.cassandra.datastax.com": {
       "api_version": null,
diff --git a/acto/checker/impl/tests/health_system_state_2.json b/acto/checker/impl/tests/health_system_state_2.json
index c7b05519ed..6b5abc548c 100644
--- a/acto/checker/impl/tests/health_system_state_2.json
+++ b/acto/checker/impl/tests/health_system_state_2.json
@@ -6056,6 +6056,8 @@
       }
     }
   },
+  "daemonset_pods": {},
+  "daemon_set": {},
   "config_map": {
     "kube-root-ca.crt": {
       "api_version": null,
diff --git a/acto/checker/impl/tests/health_system_state_3.json b/acto/checker/impl/tests/health_system_state_3.json
index 4190fe16a3..98e3920f99 100644
--- a/acto/checker/impl/tests/health_system_state_3.json
+++ b/acto/checker/impl/tests/health_system_state_3.json
@@ -6191,6 +6191,8 @@
       }
     }
   },
+  "daemonset_pods": {},
+  "daemon_set": {},
   "config_map": {
     "6cab913b.redis.opstreelabs.in": {
       "api_version": null,
diff --git a/acto/checker/impl/tests/health_system_state_4.json b/acto/checker/impl/tests/health_system_state_4.json
index fb58f771b7..c9d02ea285 100644
--- a/acto/checker/impl/tests/health_system_state_4.json
+++ b/acto/checker/impl/tests/health_system_state_4.json
@@ -7639,6 +7639,8 @@
       }
     }
   },
+  "daemonset_pods": {},
+  "daemon_set": {},
   "config_map": {
     "kube-root-ca.crt": {
       "api_version": null,
diff --git a/acto/checker/impl/tests/health_system_state_5.json b/acto/checker/impl/tests/health_system_state_5.json
index 351f3a7fc4..c41e3c7318 100644
--- a/acto/checker/impl/tests/health_system_state_5.json
+++ b/acto/checker/impl/tests/health_system_state_5.json
@@ -5845,6 +5845,8 @@
       }
     }
   },
+  "daemonset_pods": {},
+  "daemon_set": {},
   "config_map": {
     "kube-root-ca.crt": {
       "api_version": null,
diff --git a/acto/checker/impl/tests/state_system_state_0.json b/acto/checker/impl/tests/state_system_state_0.json
index 2e8281fc11..aff387e92a 100644
--- a/acto/checker/impl/tests/state_system_state_0.json
+++ b/acto/checker/impl/tests/state_system_state_0.json
@@ -5996,6 +5996,8 @@
       }
     }
   },
+  "daemonset_pods": {},
+  "daemon_set": {},
   "config_map": {
     "b569adb7.cassandra.datastax.com": {
       "api_version": null,
diff --git a/acto/checker/impl/tests/state_system_state_0_prev.json b/acto/checker/impl/tests/state_system_state_0_prev.json
index 7986a1ebdc..4ea435dd9d 100644
--- a/acto/checker/impl/tests/state_system_state_0_prev.json
+++ b/acto/checker/impl/tests/state_system_state_0_prev.json
@@ -5996,6 +5996,8 @@
       }
     }
   },
+  "daemonset_pods": {},
+  "daemon_set": {},
   "config_map": {
     "b569adb7.cassandra.datastax.com": {
       "api_version": null,
diff --git a/acto/checker/impl/tests/state_system_state_1.json b/acto/checker/impl/tests/state_system_state_1.json
index 7d8c6efd76..d4888c5985 100644
--- a/acto/checker/impl/tests/state_system_state_1.json
+++ b/acto/checker/impl/tests/state_system_state_1.json
@@ -5996,6 +5996,8 @@
       }
     }
   },
+  "daemonset_pods": {},
+  "daemon_set": {},
   "config_map": {
     "b569adb7.cassandra.datastax.com": {
       "api_version": null,
diff --git a/acto/checker/impl/tests/state_system_state_1_prev.json b/acto/checker/impl/tests/state_system_state_1_prev.json
index 3219db9970..d34fab065b 100644
--- a/acto/checker/impl/tests/state_system_state_1_prev.json
+++ b/acto/checker/impl/tests/state_system_state_1_prev.json
@@ -5996,6 +5996,8 @@
       }
     }
   },
+  "daemonset_pods": {},
+  "daemon_set": {},
   "config_map": {
     "b569adb7.cassandra.datastax.com": {
       "api_version": null,
diff --git a/acto/checker/impl/tests/state_system_state_2.json b/acto/checker/impl/tests/state_system_state_2.json
index 7b759e7516..6289fd2235 100644
--- a/acto/checker/impl/tests/state_system_state_2.json
+++ b/acto/checker/impl/tests/state_system_state_2.json
@@ -5890,6 +5890,8 @@
       }
     }
   },
+  "daemonset_pods": {},
+  "daemon_set": {},
   "config_map": {
     "kube-root-ca.crt": {
       "api_version": null,
diff --git a/acto/checker/impl/tests/state_system_state_2_prev.json b/acto/checker/impl/tests/state_system_state_2_prev.json
index 238cbbc173..189d70123b 100644
--- a/acto/checker/impl/tests/state_system_state_2_prev.json
+++ b/acto/checker/impl/tests/state_system_state_2_prev.json
@@ -5890,6 +5890,8 @@
       }
     }
   },
+  "daemonset_pods": {},
+  "daemon_set": {},
   "config_map": {
     "kube-root-ca.crt": {
       "api_version": null,
diff --git a/acto/checker/impl/tests/state_system_state_3.json b/acto/checker/impl/tests/state_system_state_3.json
index 103f0809dc..e7e80301f8 100644
--- a/acto/checker/impl/tests/state_system_state_3.json
+++ b/acto/checker/impl/tests/state_system_state_3.json
@@ -5294,6 +5294,8 @@
       }
     }
   },
+  "daemonset_pods": {},
+  "daemon_set": {},
   "config_map": {
     "kube-root-ca.crt": {
       "api_version": null,
diff --git a/acto/checker/impl/tests/state_system_state_3_prev.json b/acto/checker/impl/tests/state_system_state_3_prev.json
index e7fde850e9..2057e2fa3a 100644
--- a/acto/checker/impl/tests/state_system_state_3_prev.json
+++ b/acto/checker/impl/tests/state_system_state_3_prev.json
@@ -5294,6 +5294,8 @@
       }
     }
   },
+  "daemonset_pods": {},
+  "daemon_set": {},
   "config_map": {
     "kube-root-ca.crt": {
       "api_version": null,
diff --git a/acto/checker/impl/tests/state_system_state_4.json b/acto/checker/impl/tests/state_system_state_4.json
index 50f2d3bb28..618010d000 100644
--- a/acto/checker/impl/tests/state_system_state_4.json
+++ b/acto/checker/impl/tests/state_system_state_4.json
@@ -5890,6 +5890,8 @@
       }
     }
   },
+  "daemonset_pods": {},
+  "daemon_set": {},
   "config_map": {
     "kube-root-ca.crt": {
       "api_version": null,
diff --git a/acto/checker/impl/tests/state_system_state_4_prev.json b/acto/checker/impl/tests/state_system_state_4_prev.json
index 4edd8822ad..be213c2dc7 100644
--- a/acto/checker/impl/tests/state_system_state_4_prev.json
+++ b/acto/checker/impl/tests/state_system_state_4_prev.json
@@ -5890,6 +5890,8 @@
       }
     }
   },
+  "daemonset_pods": {},
+  "daemon_set": {},
   "config_map": {
     "kube-root-ca.crt": {
       "api_version": null,
diff --git a/acto/checker/impl/tests/state_system_state_5.json b/acto/checker/impl/tests/state_system_state_5.json
index 2c944e59d9..dc880f9d9e 100644
--- a/acto/checker/impl/tests/state_system_state_5.json
+++ b/acto/checker/impl/tests/state_system_state_5.json
@@ -1,4 +1,6 @@
 {
+  "daemonset_pods": {},
+  "daemon_set": {},
   "pod": {
     "test-cluster-server-0": {
       "api_version": null,
diff --git a/acto/checker/impl/tests/state_system_state_5_prev.json b/acto/checker/impl/tests/state_system_state_5_prev.json
index 50f2d3bb28..499fd212fa 100644
--- a/acto/checker/impl/tests/state_system_state_5_prev.json
+++ b/acto/checker/impl/tests/state_system_state_5_prev.json
@@ -1,4 +1,6 @@
 {
+  "daemonset_pods": {},
+  "daemon_set": {},
   "pod": {
     "test-cluster-server-0": {
       "api_version": null,
diff --git a/acto/checker/impl/tests/state_system_state_6.json b/acto/checker/impl/tests/state_system_state_6.json
index 5cdfdc730b..61c88f2816 100644
--- a/acto/checker/impl/tests/state_system_state_6.json
+++ b/acto/checker/impl/tests/state_system_state_6.json
@@ -1,4 +1,6 @@
 {
+  "daemonset_pods": {},
+  "daemon_set": {},
   "pod": {
     "test-cluster-server-0": {
       "api_version": null,
diff --git a/acto/checker/impl/tests/state_system_state_6_prev.json b/acto/checker/impl/tests/state_system_state_6_prev.json
index 5cdfdc730b..61c88f2816 100644
--- a/acto/checker/impl/tests/state_system_state_6_prev.json
+++ b/acto/checker/impl/tests/state_system_state_6_prev.json
@@ -1,4 +1,6 @@
 {
+  "daemonset_pods": {},
+  "daemon_set": {},
   "pod": {
     "test-cluster-server-0": {
       "api_version": null,
diff --git a/acto/checker/impl/tests/state_system_state_7.json b/acto/checker/impl/tests/state_system_state_7.json
index f80e2188db..d8960e5ccc 100644
--- a/acto/checker/impl/tests/state_system_state_7.json
+++ b/acto/checker/impl/tests/state_system_state_7.json
@@ -1,4 +1,6 @@
 {
+  "daemonset_pods": {},
+  "daemon_set": {},
   "pod": {
     "test-cluster-server-0": {
       "api_version": null,
diff --git a/acto/checker/impl/tests/state_system_state_7_prev.json b/acto/checker/impl/tests/state_system_state_7_prev.json
index a8e2cb28c2..1bfc412bb1 100644
--- a/acto/checker/impl/tests/state_system_state_7_prev.json
+++ b/acto/checker/impl/tests/state_system_state_7_prev.json
@@ -1,4 +1,6 @@
 {
+  "daemonset_pods": {},
+  "daemon_set": {},
   "pod": {
     "test-cluster-server-0": {
       "api_version": null,
diff --git a/acto/checker/impl/tests/state_system_state_8.json b/acto/checker/impl/tests/state_system_state_8.json
index 0771285b22..a50a002a73 100644
--- a/acto/checker/impl/tests/state_system_state_8.json
+++ b/acto/checker/impl/tests/state_system_state_8.json
@@ -1,4 +1,6 @@
 {
+  "daemonset_pods": {},
+  "daemon_set": {},
   "pod": {
     "test-cluster-follower-0": {
       "api_version": null,
diff --git a/acto/checker/impl/tests/state_system_state_8_prev.json b/acto/checker/impl/tests/state_system_state_8_prev.json
index 6cb7231969..e9ac4320b7 100644
--- a/acto/checker/impl/tests/state_system_state_8_prev.json
+++ b/acto/checker/impl/tests/state_system_state_8_prev.json
@@ -1,4 +1,6 @@
 {
+  "daemonset_pods": {},
+  "daemon_set": {},
   "pod": {
     "test-cluster-follower-0": {
       "api_version": null,
diff --git a/acto/engine.py b/acto/engine.py
index cb5753f121..13146d4570 100644
--- a/acto/engine.py
+++ b/acto/engine.py
@@ -79,7 +79,9 @@ def apply_testcase(value_with_schema: ValueWithSchema,
     logger.info('JSON patch: %s' % patch)
     return patch
 
-def check_state_equality(snapshot: Snapshot, prev_snapshot: Snapshot) -> OracleResult:
+
+def check_state_equality(snapshot: Snapshot, prev_snapshot: Snapshot,
+                         additional_exclude_paths: List[str] = []) -> OracleResult:
     '''Check whether two system state are semantically equivalent
 
     Args:
@@ -171,6 +173,7 @@ def check_state_equality(snapshot: Snapshot, prev_snapshot: Snapshot) -> OracleR
         r".*\['cluster_ip'\]$",
         r".*\['cluster_i_ps'\].*$",
         r".*\['deployment_pods'\].*\['metadata'\]\['name'\]$",
+        r".*\['daemonset_pods'\].*\['metadata'\]\['name'\]$",
         r"\[\'config_map\'\]\[\'kube\-root\-ca\.crt\'\]\[\'data\'\]\[\'ca\.crt\'\]$",
         r".*\['secret'\].*$",
         r"\['secrets'\]\[.*\]\['name'\]",
@@ -180,6 +183,8 @@ def check_state_equality(snapshot: Snapshot, prev_snapshot: Snapshot) -> OracleR
         r"\['deployment_pods'\].*\['metadata'\]\['owner_references'\]\[.*\]\['name'\]",
     ]
 
+    exclude_paths.extend(additional_exclude_paths)
+
     diff = DeepDiff(prev_system_state,
                     curr_system_state,
                     exclude_regex_paths=exclude_paths,
@@ -194,11 +199,13 @@ def check_state_equality(snapshot: Snapshot, prev_snapshot: Snapshot) -> OracleR
 
 class TrialRunner:
 
-    def __init__(self, context: dict, input_model: InputModel, deploy: Deploy, runner_t: type,
-                 checker_t: type, wait_time: int, custom_on_init: List[callable],
-                 custom_oracle: List[callable], workdir: str, cluster: base.KubernetesEngine,
-                 worker_id: int, sequence_base: int, dryrun: bool, is_reproduce: bool,
-                 apply_testcase_f: FunctionType, acto_namespace: int) -> None:
+    def __init__(
+            self, context: dict, input_model: InputModel, deploy: Deploy, runner_t: type,
+            checker_t: type, wait_time: int, custom_on_init: List[callable],
+            custom_oracle: List[callable],
+            workdir: str, cluster: base.KubernetesEngine, worker_id: int, sequence_base: int,
+            dryrun: bool, is_reproduce: bool, apply_testcase_f: FunctionType, acto_namespace: int,
+            additional_exclude_paths: List[str]=[]) ->None:
         self.context = context
         self.workdir = workdir
         self.base_workdir = workdir
@@ -214,6 +221,7 @@ def __init__(self, context: dict, input_model: InputModel, deploy: Deploy, runne
         self.runner_t = runner_t
         self.checker_t = checker_t
         self.wait_time = wait_time  # seconds of the resettable timer
+        self.additional_exclude_paths = additional_exclude_paths
 
         self.custom_on_init = custom_on_init
         self.custom_oracle = custom_oracle
@@ -574,7 +582,7 @@ def run_recovery(self, runner: Runner, checker: CheckerSet, generation: int) ->
         logger.debug('Running recovery')
         recovery_input = self.snapshots[RECOVERY_SNAPSHOT].input
         snapshot, err = runner.run(recovery_input, generation=-1)
-        result = check_state_equality(snapshot, self.snapshots[RECOVERY_SNAPSHOT])
+        result = check_state_equality(snapshot, self.snapshots[RECOVERY_SNAPSHOT], self.additional_exclude_paths)
 
         return result
 
@@ -852,7 +860,8 @@ def run(self, modes: list = ['normal', 'overspecified', 'copiedover']) -> List[R
                                  self.checker_type, self.operator_config.wait_time,
                                  self.custom_on_init, self.custom_oracle, self.workdir_path,
                                  self.cluster, i, self.sequence_base, self.dryrun,
-                                 self.is_reproduce, self.apply_testcase_f, self.acto_namespace)
+                                 self.is_reproduce, self.apply_testcase_f, self.acto_namespace,
+                                 self.operator_config.diff_ignore_fields)
             runners.append(runner)
 
         if 'normal' in modes:
diff --git a/acto/runner/runner.py b/acto/runner/runner.py
index d35d3f257a..fbd911bb8f 100644
--- a/acto/runner/runner.py
+++ b/acto/runner/runner.py
@@ -51,6 +51,7 @@ def __init__(self,
             'pod': self.coreV1Api.list_namespaced_pod,
             'stateful_set': self.appV1Api.list_namespaced_stateful_set,
             'deployment': self.appV1Api.list_namespaced_deployment,
+            'daemon_set': self.appV1Api.list_namespaced_daemon_set,
             'config_map': self.coreV1Api.list_namespaced_config_map,
             'service': self.coreV1Api.list_namespaced_service,
             'pvc': self.coreV1Api.list_namespaced_persistent_volume_claim,
@@ -205,7 +206,8 @@ def collect_system_state(self) -> dict:
             if resource == 'pod':
                 # put pods managed by deployment / replicasets into an array
                 all_pods = self.__get_all_objects(method)
-                resources['deployment_pods'], resources['pod'] = group_pods(all_pods)
+                resources['deployment_pods'], resources['daemonset_pods'], resources['pod'] = group_pods(
+                    all_pods)
             elif resource == 'secret':
                 resources[resource] = decode_secret_data(resources[resource])
 
@@ -372,6 +374,7 @@ def wait_for_system_converge(self, hard_timeout=480) -> bool:
                 ready = True
                 statefulsets = self.__get_all_objects(self.appV1Api.list_namespaced_stateful_set)
                 deployments = self.__get_all_objects(self.appV1Api.list_namespaced_deployment)
+                daemonsets = self.__get_all_objects(self.appV1Api.list_namespaced_daemon_set)
 
                 for sfs in statefulsets.values():
                     if sfs['status']['ready_replicas'] == None and sfs['status']['replicas'] == 0:
@@ -405,6 +408,21 @@ def wait_for_system_converge(self, hard_timeout=480) -> bool:
                             logger.info("Deployment %s is not ready yet" % dp['metadata']['name'])
                             break
 
+                for ds in daemonsets.values():
+                    if ds['status']['number_ready'] != ds['status']['current_number_scheduled']:
+                        ready = False
+                        logger.info("Daemonset %s is not ready yet" % ds['metadata']['name'])
+                        break
+                    if ds['status']['desired_number_scheduled'] != ds['status']['number_ready']:
+                        ready = False
+                        logger.info("Daemonset %s is not ready yet" % ds['metadata']['name'])
+                        break
+                    if 'updated_number_scheduled' in ds['status'] and ds['status'][
+                            'updated_number_scheduled'] != ds['status']['desired_number_scheduled']:
+                        ready = False
+                        logger.info("Daemonset %s is not ready yet" % ds['metadata']['name'])
+                        break
+
                 if ready:
                     # only stop waiting if all deployments and statefulsets are ready
                     # else, keep waiting until ready or hard timeout
@@ -448,15 +466,16 @@ def decode_secret_data(secrets: dict) -> dict:
     return secrets
 
 
-def group_pods(all_pods: dict) -> Tuple[dict, dict]:
-    '''Groups pods into deployment pods and other pods
+def group_pods(all_pods: dict) -> Tuple[dict, dict, dict]:
+    '''Groups pods into deployment pods, daemonset pods, and other pods
 
     For deployment pods, they are further grouped by their owner reference
 
     Return:
-        Tuple of (deployment_pods, other_pods)
+        Tuple of (deployment_pods, daemonset_pods, other_pods)
     '''
     deployment_pods = {}
+    daemonset_pods = {}
     other_pods = {}
     for name, pod in all_pods.items():
         if 'acto/tag' in pod['metadata']['labels'] and pod['metadata']['labels'][
@@ -474,12 +493,18 @@ def group_pods(all_pods: dict) -> Tuple[dict, dict]:
                     deployment_pods[owner_name] = [pod]
                 else:
                     deployment_pods[owner_name].append(pod)
+            elif owner_reference['kind'] == 'DaemonSet':
+                owner_name = owner_reference['name']
+                if owner_name not in daemonset_pods:
+                    daemonset_pods[owner_name] = [pod]
+                else:
+                    daemonset_pods[owner_name].append(pod)
             else:
                 other_pods[name] = pod
         else:
             other_pods[name] = pod
 
-    return deployment_pods, other_pods
+    return deployment_pods, daemonset_pods, other_pods
 
 
 # standalone runner for acto
diff --git a/test/cassop-315/trial-04-0000/system-state--01.json b/test/cassop-315/trial-04-0000/system-state--01.json
index 1da92761a8..039b23719d 100644
--- a/test/cassop-315/trial-04-0000/system-state--01.json
+++ b/test/cassop-315/trial-04-0000/system-state--01.json
@@ -1,4 +1,6 @@
 {
+      "daemonset_pods": {},
+      "daemon_set": {},
       "pod": {
             "cluster1-test-cluster-default-sts-0": {
                   "api_version": null,
diff --git a/test/cassop-315/trial-04-0000/system-state-000.json b/test/cassop-315/trial-04-0000/system-state-000.json
index 18467248ce..db6628d1c1 100644
--- a/test/cassop-315/trial-04-0000/system-state-000.json
+++ b/test/cassop-315/trial-04-0000/system-state-000.json
@@ -1,4 +1,6 @@
 {
+      "daemonset_pods": {},
+      "daemon_set": {},
       "pod": {
             "cluster1-test-cluster-default-sts-0": {
                   "api_version": null,
diff --git a/test/cassop-315/trial-04-0000/system-state-001.json b/test/cassop-315/trial-04-0000/system-state-001.json
index d057252df8..001ce9b12e 100644
--- a/test/cassop-315/trial-04-0000/system-state-001.json
+++ b/test/cassop-315/trial-04-0000/system-state-001.json
@@ -1,4 +1,6 @@
 {
+      "daemonset_pods": {},
+      "daemon_set": {},
       "pod": {
             "cluster1-test-cluster-default-sts-0": {
                   "api_version": null,
diff --git a/test/cassop-315/trial-04-0000/system-state-002.json b/test/cassop-315/trial-04-0000/system-state-002.json
index b78961470a..e3609cd7f8 100644
--- a/test/cassop-315/trial-04-0000/system-state-002.json
+++ b/test/cassop-315/trial-04-0000/system-state-002.json
@@ -1,4 +1,6 @@
 {
+      "daemonset_pods": {},
+      "daemon_set": {},
       "pod": {
             "cluster1-test-cluster-default-sts-0": {
                   "api_version": null,
diff --git a/test/cassop-315/trial-04-0000/system-state-003.json b/test/cassop-315/trial-04-0000/system-state-003.json
index 2f7d2f0a22..698063261b 100644
--- a/test/cassop-315/trial-04-0000/system-state-003.json
+++ b/test/cassop-315/trial-04-0000/system-state-003.json
@@ -1,4 +1,6 @@
 {
+      "daemonset_pods": {},
+      "daemon_set": {},
       "pod": {
             "cluster1-test-cluster-default-sts-0": {
                   "api_version": null,
diff --git a/test/cassop-315/trial-04-0000/system-state-004.json b/test/cassop-315/trial-04-0000/system-state-004.json
index 1d5c69b2b5..e0728ab762 100644
--- a/test/cassop-315/trial-04-0000/system-state-004.json
+++ b/test/cassop-315/trial-04-0000/system-state-004.json
@@ -1,4 +1,6 @@
 {
+      "daemonset_pods": {},
+      "daemon_set": {},
       "pod": {
             "cluster1-test-cluster-default-sts-0": {
                   "api_version": null,
diff --git a/test/cassop-315/trial-04-0000/system-state-005.json b/test/cassop-315/trial-04-0000/system-state-005.json
index c3844f219c..0eef54d846 100644
--- a/test/cassop-315/trial-04-0000/system-state-005.json
+++ b/test/cassop-315/trial-04-0000/system-state-005.json
@@ -1,4 +1,6 @@
 {
+      "daemonset_pods": {},
+      "daemon_set": {},
       "pod": {
             "cluster1-test-cluster-default-sts-0": {
                   "api_version": null,
diff --git a/test/cassop-330/system-state--01.json b/test/cassop-330/system-state--01.json
index 1a07eec971..dbc072f8a9 100644
--- a/test/cassop-330/system-state--01.json
+++ b/test/cassop-330/system-state--01.json
@@ -1,4 +1,6 @@
 {
+      "daemonset_pods": {},
+      "daemon_set": {},
       "pod": {
             "cluster1-test-cluster-default-sts-0": {
                   "api_version": null,
diff --git a/test/cassop-330/system-state-000.json b/test/cassop-330/system-state-000.json
index e1a4a449fb..16f0bcc2f8 100644
--- a/test/cassop-330/system-state-000.json
+++ b/test/cassop-330/system-state-000.json
@@ -1,4 +1,6 @@
 {
+      "daemonset_pods": {},
+      "daemon_set": {},
       "pod": {
             "cluster1-test-cluster-default-sts-0": {
                   "api_version": null,
diff --git a/test/cassop-330/system-state-001.json b/test/cassop-330/system-state-001.json
index 0f797b7514..84f8f29bc8 100644
--- a/test/cassop-330/system-state-001.json
+++ b/test/cassop-330/system-state-001.json
@@ -1,4 +1,6 @@
 {
+      "daemonset_pods": {},
+      "daemon_set": {},
       "pod": {
             "cluster1-test-cluster-default-sts-0": {
                   "api_version": null,
diff --git a/test/cassop-330/system-state-002.json b/test/cassop-330/system-state-002.json
index 7fc9b13b66..8ac1028848 100644
--- a/test/cassop-330/system-state-002.json
+++ b/test/cassop-330/system-state-002.json
@@ -1,4 +1,6 @@
 {
+      "daemonset_pods": {},
+      "daemon_set": {},
       "pod": {
             "cluster1-test-cluster-default-sts-0": {
                   "api_version": null,
diff --git a/test/crdbop-919/system-state-000.json b/test/crdbop-919/system-state-000.json
index dc310eff9c..38565168da 100644
--- a/test/crdbop-919/system-state-000.json
+++ b/test/crdbop-919/system-state-000.json
@@ -1,4 +1,6 @@
 {
+      "daemonset_pods": {},
+      "daemon_set": {},
       "pod": {
             "test-cluster-0": {
                   "api_version": null,
diff --git a/test/crdbop-919/system-state-001.json b/test/crdbop-919/system-state-001.json
index cbc28b9f20..93fe75d692 100644
--- a/test/crdbop-919/system-state-001.json
+++ b/test/crdbop-919/system-state-001.json
@@ -1,4 +1,6 @@
 {
+      "daemonset_pods": {},
+      "daemon_set": {},
       "pod": {
             "test-cluster-0": {
                   "api_version": null,
diff --git a/test/crdbop-919/system-state-002.json b/test/crdbop-919/system-state-002.json
index f8fb3d606f..f8ed4aa4ca 100644
--- a/test/crdbop-919/system-state-002.json
+++ b/test/crdbop-919/system-state-002.json
@@ -1,4 +1,6 @@
 {
+      "daemonset_pods": {},
+      "daemon_set": {},
       "pod": {
             "test-cluster-0": {
                   "api_version": null,
diff --git a/test/crdbop-920/system-state--01.json b/test/crdbop-920/system-state--01.json
index c1492dd606..ea18f4d66f 100644
--- a/test/crdbop-920/system-state--01.json
+++ b/test/crdbop-920/system-state--01.json
@@ -1,4 +1,6 @@
 {
+      "daemonset_pods": {},
+      "daemon_set": {},
       "pod": {
             "test-cluster-0": {
                   "api_version": null,
diff --git a/test/crdbop-920/system-state-000.json b/test/crdbop-920/system-state-000.json
index bea45e61f9..4ed27a823b 100644
--- a/test/crdbop-920/system-state-000.json
+++ b/test/crdbop-920/system-state-000.json
@@ -1,4 +1,6 @@
 {
+      "daemonset_pods": {},
+      "daemon_set": {},
       "pod": {
             "test-cluster-0": {
                   "api_version": null,
diff --git a/test/crdbop-920/system-state-001.json b/test/crdbop-920/system-state-001.json
index c1492dd606..ea18f4d66f 100644
--- a/test/crdbop-920/system-state-001.json
+++ b/test/crdbop-920/system-state-001.json
@@ -1,4 +1,6 @@
 {
+      "daemonset_pods": {},
+      "daemon_set": {},
       "pod": {
             "test-cluster-0": {
                   "api_version": null,
diff --git a/test/crdbop-920/system-state-002.json b/test/crdbop-920/system-state-002.json
index 7d5279434d..394855e8a9 100644
--- a/test/crdbop-920/system-state-002.json
+++ b/test/crdbop-920/system-state-002.json
@@ -1,4 +1,6 @@
 {
+      "daemonset_pods": {},
+      "daemon_set": {},
       "pod": {
             "test-cluster-0": {
                   "api_version": null,
diff --git a/test/rbop-928/system-state--01.json b/test/rbop-928/system-state--01.json
index 169903aec9..6e0ddd2af8 100644
--- a/test/rbop-928/system-state--01.json
+++ b/test/rbop-928/system-state--01.json
@@ -1,4 +1,6 @@
 {
+      "daemonset_pods": {},
+      "daemon_set": {},
       "pod": {
             "test-cluster-server-0": {
                   "api_version": null,
diff --git a/test/rbop-928/system-state-000.json b/test/rbop-928/system-state-000.json
index fe824671c5..3aacdfbf6b 100644
--- a/test/rbop-928/system-state-000.json
+++ b/test/rbop-928/system-state-000.json
@@ -1,4 +1,6 @@
 {
+      "daemonset_pods": {},
+      "daemon_set": {},
       "pod": {
             "test-cluster-server-0": {
                   "api_version": null,
diff --git a/test/rbop-928/system-state-001.json b/test/rbop-928/system-state-001.json
index ed1e614f1d..16de79f2fd 100644
--- a/test/rbop-928/system-state-001.json
+++ b/test/rbop-928/system-state-001.json
@@ -1,4 +1,6 @@
 {
+      "daemonset_pods": {},
+      "daemon_set": {},
       "pod": {
             "test-cluster-server-0": {
                   "api_version": null,
diff --git a/test/rbop-928/system-state-002.json b/test/rbop-928/system-state-002.json
index e200393fb8..0f9cb1715d 100644
--- a/test/rbop-928/system-state-002.json
+++ b/test/rbop-928/system-state-002.json
@@ -1,4 +1,6 @@
 {
+      "daemonset_pods": {},
+      "daemon_set": {},
       "pod": {
             "test-cluster-server-0": {
                   "api_version": null,