Merge pull request #14 from slamdev/master

comma-separated list of domains

Author: travisghansen

src/KubernetesPfSenseController/Plugin/DNSServices.php

@@ -93,12 +93,14 @@ public function buildResourceHosts(&$resourceHosts, $service)
         if (!$this->shouldCreateHost($service)) {
             return;
         }
-        $hostName = KubernetesUtils::getServiceHostname($service);
+        $hostNames = KubernetesUtils::getServiceHostname($service);
         $ip = KubernetesUtils::getServiceIp($service);
-        $resourceHosts[$hostName] = [
-            'ip' => $ip,
-            'resource' => $service,
-        ];
+        foreach ($hostNames as $hostName) {
+            $resourceHosts[$hostName] = [
+                'ip' => $ip,
+                'resource' => $service,
+            ];
+        }
     }
 
     /**
@@ -126,11 +128,13 @@ private function shouldCreateHost($service)
         }
 
         $pluginConfig = $this->getConfig();
-        $hostName = KubernetesUtils::getServiceHostname($service);
+        $hostNames = KubernetesUtils::getServiceHostname($service);
         if (!empty($pluginConfig['allowedHostRegex'])) {
-            $allowed = @preg_match($pluginConfig['allowedHostRegex'], $hostName);
-            if ($allowed !== 1) {
-                return false;
+            foreach ($hostNames as $hostName) {
+                $allowed = @preg_match($pluginConfig['allowedHostRegex'], $hostName);
+                if ($allowed !== 1) {
+                    return false;
+                }
             }
         }
 

src/KubernetesPfSenseController/Plugin/KubernetesUtils.php

@@ -228,7 +228,7 @@ public static function getServiceHostname($service)
     {
         foreach ($service['metadata']['annotations'] as $key => $value) {
             if ($key == self::SERVICE_HOSTNAME_ANNOTATION) {
-                return $value;
+                return explode(",", $value);
             }
         }
     }