minor logic and performance fixes

Author: travisghansen

src/KubernetesPfSenseController/Plugin/DNSResourceTrait.php

@@ -139,27 +139,44 @@ public function doAction()
      */
     public function shouldTriggerFromWatchUpdate($event, $oldItem, $item, $stateKey, $options = [])
     {
-        // will be NULL for ADDED and DELETED
-        if ($oldItem === null) {
-            return true;
-        }
-        $oldResourceHosts = [];
-        $newResourceHosts = [];
+        if ($stateKey == "resources") {
+            // will be NULL for ADDED and DELETED
+            if ($oldItem === null) {
+                $tmpResourceHosts = [];
+                switch ($event['type']) {
+                    case "ADDED":
+                    case "DELETED":
+                        $this->buildResourceHosts($tmpResourceHosts, $item);
+                        if (count($tmpResourceHosts) > 0) {
+                            return true;
+                        }
+                        break;
+                }
 
-        $this->buildResourceHosts($oldResourceHosts, $oldItem);
-        $this->buildResourceHosts($newResourceHosts, $item);
+                return false;
+            }
 
-        foreach ($oldResourceHosts as $host => $value) {
-            $oldResourceHosts[$host] = ['ip' => $value['ip']];
-        }
+            $oldResourceHosts = [];
+            $newResourceHosts = [];
 
-        foreach ($newResourceHosts as $host => $value) {
-            $newResourceHosts[$host] = ['ip' => $value['ip']];
-        }
+            $this->buildResourceHosts($oldResourceHosts, $oldItem);
+            $this->buildResourceHosts($newResourceHosts, $item);
 
-        if (md5(json_encode($oldResourceHosts)) != md5(json_encode($newResourceHosts))) {
-            return true;
+            foreach ($oldResourceHosts as $host => $value) {
+                $oldResourceHosts[$host] = ['ip' => $value['ip']];
+            }
+
+            foreach ($newResourceHosts as $host => $value) {
+                $newResourceHosts[$host] = ['ip' => $value['ip']];
+            }
+
+            if (md5(json_encode($oldResourceHosts)) != md5(json_encode($newResourceHosts))) {
+                return true;
+            }
+
+            return false;
         }
+
         return false;
     }
 }

src/KubernetesPfSenseController/Plugin/HAProxyDeclarative.php

@@ -275,28 +275,25 @@ public function shouldTriggerFromWatchUpdate($event, $oldItem, $item, $stateKey,
                     return true;
                 }
 
-                // various triggers from updates
-                if ($oldItem !== null) {
-                    // type changes
-                    if ($oldItem['spec']['type'] !== $item['spec']['type']) {
-                        return true;
-                    }
-
-                    // ip changes for LoadBalancer services
-                    if ($oldItem['spec']['type'] == "LoadBalancer" && $item['spec']['type'] == "LoadBalancer") {
-                        if ($oldItem['status']['loadBalancer']['ingress'][0]['ip'] != $item['status']['loadBalancer']['ingress'][0]['ip']) {
-                            return true;
-                        }
-                    }
+                // type changes
+                if ($oldItem['spec']['type'] !== $item['spec']['type']) {
+                    return true;
+                }
 
-                    // port changes
-                    $oldPortHash = md5(json_encode($oldItem['spec']['ports']));
-                    $newPortHash = md5(json_encode($item['spec']['ports']));
-                    if ($oldPortHash != $newPortHash) {
+                // ip changes for LoadBalancer services
+                if ($oldItem['spec']['type'] == "LoadBalancer" && $item['spec']['type'] == "LoadBalancer") {
+                    if ($oldItem['status']['loadBalancer']['ingress'][0]['ip'] != $item['status']['loadBalancer']['ingress'][0]['ip']) {
                         return true;
                     }
                 }
 
+                // port changes
+                $oldPortHash = md5(json_encode($oldItem['spec']['ports']));
+                $newPortHash = md5(json_encode($item['spec']['ports']));
+                if ($oldPortHash != $newPortHash) {
+                    return true;
+                }
+
                 return false;
                 break;
         }

src/KubernetesPfSenseController/Plugin/MetalLB.php

@@ -174,18 +174,18 @@ private function doActionGeneric()
                         'groupname' => (string) $template['groupname'],
                     ];
                     $template = array_merge($defaults, $template);
-                    $template = array_map(function($v){
+                    $template = array_map(function ($v) {
                         return $v ?: '';
-                    },$template);
+                    }, $template);
                     break;
                 case 'frr':
                     $defaults = [
                         "sendcommunity" => "disabled",
                     ];
                     $template = array_merge($defaults, $template);
-                    $template = array_map(function($v){
+                    $template = array_map(function ($v) {
                         return $v ?: '';
-                    },$template);
+                    }, $template);
                     break;
             }