fix: DNS ingress rules - GitHub runners (#25)

homecentr · Nov 8, 2023 · 4d64420 · 4d64420
1 parent 287b44f
commit 4d64420
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 9 deletions.
diff --git a/apps/common/values.lab.yml b/apps/common/values.lab.yml
@@ -6,6 +6,7 @@ networkPolicy:
     - 10.1.8.23
   servicesSubnetCidr: 10.1.8.0/24
   consumerCidrs:
+    - 10.1.8.9/32 # GitHub runners
     - 10.1.8.0/24
     - 10.1.3.0/24
 

diff --git a/apps/common/values.prod.yml b/apps/common/values.prod.yml
@@ -6,6 +6,7 @@ networkPolicy:
     - 10.1.2.23
   servicesSubnetCidr: 10.1.2.0/24
   consumerCidrs:
+    - 10.1.8.9/32 # GitHub runners
     - 10.1.2.0/24
     - 10.1.3.0/24
 

diff --git a/apps/dns/templates/network-policy.yml b/apps/dns/templates/network-policy.yml
@@ -23,7 +23,7 @@ spec:
         # Accept internal traffic (?)
         - ipBlock:
             cidr: 172.16.0.0/16
-        {{- range $cidr := .Values.networkPolicy.externalIngressIpBlocks }}
+        {{- range $cidr := .Values.networkPolicy.consumerCidrs }}
         - ipBlock:
             cidr: {{ $cidr }}
         {{- end }}

diff --git a/apps/dns/values.lab.yml b/apps/dns/values.lab.yml
@@ -1,7 +1,4 @@
 networkPolicy:
-  externalIngressIpBlocks:
-    - 10.1.8.0/24
-    - 10.1.3.0/24
   forwarders:
     - 1.1.1.1
     - 1.0.0.1

diff --git a/apps/dns/values.prod.yml b/apps/dns/values.prod.yml
@@ -1,7 +1,4 @@
 networkPolicy:
-  externalIngressIpBlocks:
-    - 10.1.8.0/24
-    - 10.1.3.0/24
   forwarders:
     - 1.1.1.1
     - 1.0.0.1

diff --git a/apps/haraka-relay/values.lab.yml b/apps/haraka-relay/values.lab.yml
@@ -2,7 +2,7 @@ hostname: smtp-lab.homecentr.one
 loadBalancerIp: 10.1.8.130
 
 allowedClients:
-  - 10.1.8.224/27 # GitHub runners
+  - 10.1.8.9/32 # GitHub runners
 
 resources:
   limits:

diff --git a/apps/haraka-relay/values.prod.yml b/apps/haraka-relay/values.prod.yml
@@ -2,7 +2,7 @@ hostname: smtp.homecentr.one
 loadBalancerIp: 10.1.2.130
 
 allowedClients:
-  - 10.1.3.250/32 # GitHub runner
+  - 10.1.8.9/32 # GitHub runners
   - 10.1.3.5/32   # Printer
   - 10.1.2.211/32 # iDRAC
   - 10.1.2.212/32 # iDRAC