Move DC services to upper half of public IP

ifd3f · Apr 11, 2024 · 731b2e7 · 731b2e7
1 parent 047d9e8
commit 731b2e7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/docs/ipam.sexp b/docs/ipam.sexp
@@ -92,11 +92,11 @@
 
 (net SONIC-PROVIDED-V6 2001:5a8:4002:9300::/56
   (description "Sonic gave me this prefix for my house")
-  (net PROD-PUBLIC 2001:5a8:4002:9301::/64
-    (description "Address space for public services")
-  )
-  (net PROD-K8S 2001:5a8:4002:9308::/64
-    (description "Public address space for k8s nodes")
+  (net PUBLIC-DC 2001:5a8:4002:9380::/57
+    (description "Public address space for datacenter")
+    (net PROD-K8S 2001:5a8:4002:9388::/64
+      (description "Public address space for k8s nodes")
+    )
   )
   (net HOME-USERS-V6 2001:5a8:4002:930a::/64
     (description "IP space for ethernet connected users")

diff --git a/netconf/charon.rkt b/netconf/charon.rkt
@@ -21,15 +21,17 @@
                      (ethernet ,k8sbr [(hw-id "52:54:00:06:8c:9a")
                                        (description "k8sbr")
                                        (address "fca7:b01:f00d:c00b::1/64")
-                                       (address "2001:5a8:4002:9308::1/64")])])
+                                       (address "2001:5a8:4002:9388::1/64")])])
 
+    (delete protocols static)
     (set protocols static [(route "0.0.0.0/0" [(next-hop ,upstream-ll-addr4)
                                                (interface ,wan)])
                            (route6 "::/0" [(next-hop ,upstream-ll-addr6)
                                            (interface ,wan)])])
 
+    (delete service router-advert)
     (set service router-advert interface ,k8sbr [(prefix "fca7:b01:f00d:c00b::/64")
-                                                 (prefix "2001:5a8:4002:9308::/64")
+                                                 (prefix "2001:5a8:4002:9388::/64")
                                                  (name-server "fca7:b01:f00d:c00b::1")
                                                  (default-preference high)])])