Merge pull request #101 from carverauto/updates/k8s_frr_calico

🐛 fixed routing bug
carverauto · Dec 22, 2024 · 5313ee9 · 5313ee9
2 parents cd765e0 + e9f8a6c
commit 5313ee9
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 24 deletions.
diff --git a/k8s/calico/00-NEW-installation.yaml b/k8s/calico/00-NEW-installation.yaml
@@ -4,6 +4,7 @@ metadata:
   name: default
 spec:
   calicoNetwork:
+    mtu: 1480
     containerIPForwarding: Enabled
     ipPools:
     - blockSize: 26

diff --git a/k8s/calico/04-route-adv.yaml b/k8s/calico/04-route-adv.yaml
@@ -3,18 +3,8 @@ kind: BGPConfiguration
 metadata:
   name: default
 spec:
-  # We want eBGP with the router, so pick a different ASN (65001) than the router (65000).
   asNumber: 65001
-
-  nodeToNodeMeshEnabled: true
-
-  logSeverityScreen: Debug
-
-  # Advertise your Service range(s) so external traffic can reach them.
-  serviceClusterIPs:
-    - cidr: 10.43.0.0/16
-    - cidr: 2001:470:c0b5:5::/64
   serviceLoadBalancerIPs:
-    - cidr: 10.43.0.0/16
-    - cidr: 2001:470:c0b5:6::/64
-
+    - cidr: 2001:470:c0b5:5::/64
+  serviceClusterIPs:
+    - cidr: 10.43.0.0/16
diff --git a/k8s/mailserver/base/service.yaml b/k8s/mailserver/base/service.yaml
@@ -6,9 +6,8 @@ metadata:
   annotations:
     external-dns.alpha.kubernetes.io/hostname: "mail.tunnel.threadr.ai"
     metallb.universe.tf/address-pool: k3s-pool
-    metallb.universe.tf/loadBalancerIPs: "2001:470:c0b5:6::2,10.43.0.25"
 spec:
-  externalTrafficPolicy: Local
+  externalTrafficPolicy: Cluster
   type: LoadBalancer
   ipFamilyPolicy: PreferDualStack
   ipFamilies:

diff --git a/k8s/metallb/02-ip-pool.yaml b/k8s/metallb/02-ip-pool.yaml
@@ -7,6 +7,5 @@ spec:
   addresses:
   - "10.43.0.3-10.43.0.254"
   - "2001:470:c0b5:5::1-2001:470:c0b5:5::ffff"
-  - "2001:470:c0b5:6::1-2001:470:c0b5:6::ffff"
 
 
diff --git a/k8s/metallb/04-bgppeers.yaml b/k8s/metallb/04-bgppeers.yaml
@@ -0,0 +1,29 @@
+apiVersion: metallb.io/v1beta1
+kind: BGPPeer
+metadata:
+  name: router-peer
+  namespace: metallb-system
+spec:
+  myASN: 65001
+  peerASN: 65000
+  peerAddress: 192.168.2.1
+---
+apiVersion: metallb.io/v1beta1
+kind: BGPPeer
+metadata:
+  name: router-peer-ipv6
+  namespace: metallb-system
+spec:
+  myASN: 65001
+  peerASN: 65000
+  peerAddress: 2001:470:c0b5:2::1
+---
+apiVersion: metallb.io/v1beta1
+kind: BGPPeer
+metadata:
+  name: router-peer
+  namespace: metallb-system
+spec:
+  myASN: 65001
+  peerASN: 65000
+  peerAddress: 192.168.1.1
diff --git a/k8s/metallb/k3s-pool-bgp-adv.yaml b/k8s/metallb/k3s-pool-bgp-adv.yaml