feat(PiHole): Drop on IOT Network

ArthurVardevanyan · Dec 26, 2024 · 94c8633 · 94c8633
1 parent b163f6a
commit 94c8633
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 6 deletions.
diff --git a/kubernetes/homeassistant/base/statefulset.yaml b/kubernetes/homeassistant/base/statefulset.yaml
@@ -27,8 +27,8 @@ spec:
           [{
             "name": "br1-vlan3",
             "namespace": "default",
-            "mac": "10:01:01:00:30:02",
-            "ips": ["10.101.3.2/24"],
+            "mac": "10:01:01:00:30:04",
+            "ips": ["10.101.3.4/24"],
             "default-route": ["10.101.3.1"]
           },
           {

diff --git a/kubernetes/kubevirt/base/vm/vm.yaml b/kubernetes/kubevirt/base/vm/vm.yaml
@@ -73,7 +73,7 @@ spec:
               model: virtio
               name: br1
             - bridge: {}
-              macAddress: "10:01:01:00:30:03"
+              macAddress: "10:01:01:00:30:05"
               model: virtio
               name: br1-vlan3
           networkInterfaceMultiqueue: true

diff --git a/kubernetes/pihole/base/statefulset.yaml b/kubernetes/pihole/base/statefulset.yaml
@@ -20,6 +20,13 @@ spec:
         app: pihole
       annotations:
         enable.version-checker.io/pihole: "true"
+        k8s.v1.cni.cncf.io/networks: |
+          [{
+            "name": "br1-vlan3",
+            "namespace": "default",
+            "mac": "10:01:01:00:30:03",
+            "ips": ["10.101.3.3/24"],
+          }]
     spec:
       hostname: pihole
       securityContext:
@@ -98,7 +105,7 @@ spec:
               cpu: 250m
               memory: 1Gi
             requests:
-              cpu: 10m
+              cpu: 25m
               memory: 512Mi
       automountServiceAccountToken: false
       serviceAccountName: pihole

diff --git a/kubernetes/pihole/overlays/microshift/kustomization.yaml b/kubernetes/pihole/overlays/microshift/kustomization.yaml
@@ -5,3 +5,10 @@ resources:
   - ingress.yaml
   - service.yaml
   - certificate.yaml
+patches:
+  - target:
+      kind: StatefulSet
+      name: pihole
+    patch: |-
+      - op: remove
+        path: /spec/template/metadata/annotations/k8s.v1.cni.cncf.io~1networks
diff --git a/kubernetes/pihole/overlays/okd/kustomization.yaml b/kubernetes/pihole/overlays/okd/kustomization.yaml
@@ -8,8 +8,8 @@ resources:
   - ./egress-firewall.yaml
 patches:
   - target:
-      kind: Statefulset
-      name: PiHole
+      kind: StatefulSet
+      name: pihole
     patch: |-
       - op: remove
         path: /spec/template/spec/containers/0/ports/1/hostPort