Merge pull request #248 from h3mmy/dual-stack-migration

Dual stack migration
h3mmy · Feb 13, 2022 · 5785eba · 5785eba
2 parents b937bfe + 779de99
commit 5785eba
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/cluster/apps/networking/blocky/helm-release.yaml b/cluster/apps/networking/blocky/helm-release.yaml
@@ -55,7 +55,7 @@ spec:
       dns-tcp:
         enabled: true
         type: LoadBalancer
-        loadBalancerIP: ${SVC_BLOCKY_ADDR_1}
+        loadBalancerIP: ${SVC_BLOCKY_ADDR_V4}
         ports:
           dns-tcp:
             enabled: true
@@ -68,7 +68,7 @@ spec:
       dns-udp:
         enabled: true
         type: LoadBalancer
-        loadBalancerIP: ${SVC_BLOCKY_ADDR_1}
+        loadBalancerIP: ${SVC_BLOCKY_ADDR_V4}
         ports:
           dns-udp:
             enabled: true

diff --git a/cluster/apps/networking/traefik/helm-release.yaml b/cluster/apps/networking/traefik/helm-release.yaml
@@ -29,7 +29,10 @@ spec:
       enabled: true
       type: LoadBalancer
       spec:
-        loadBalancerIP: "${METALLB_TRAEFIK_ADDR}"
+        ipFamilyPolicy: PreferDualStack
+        loadBalancerIPs:
+          - "${METALLB_TRAEFIK_ADDR}"
+          - "${LB_V6_TRAEFIK}"
         externalTrafficPolicy: Local
     logs:
       general:

diff --git a/cluster/base/cluster-settings.yaml b/cluster/base/cluster-settings.yaml
@@ -12,6 +12,7 @@ data:
   LB_PLEX_IP: 10.1.0.105
   LB_PROMTAIL: 10.1.0.103
   LB_TRAEFIK_CLASSIC: 10.1.0.50
+  LB_V6_TRAEFIK: "2601:0404:c580:1c72::20:20/112"
   LOCAL_CIDR_1: "192.168.0.0/16"
   LOCAL_CIDR_2: "10.0.0.0/24"
   LOCAL_GATEWAY_BIG_BLOOP: "192.168.1.1"
@@ -20,21 +21,24 @@ data:
   LOCAL_GATEWAY_SMALL_BLOOP: "10.0.0.1"
   MEDIA_GID: "65537"
   METALLB_LB_RANGE: 10.1.0.100-10.5.0.255
+  METALLB_LB_IP6_RANGE: "2601:404:c580:1c72::20:2/112"
   METALLB_TRAEFIK_ADDR: 10.1.0.101
   NAS_ADDRESS: 192.168.55.55
   # Network CIDR used for pod IPs
   NETWORK_K8S_CLUSTER_CIDR: "10.42.0.0/16"
+  NETWORK_K8S_CLUSTER_CIDR_V6: "fdcf:f7c1:1987::/112"
   # Network CIDR used for service IPs
   NETWORK_K8S_SERVICE_CIDR: "10.43.0.0/16"
+  NETWORK_K8S_SERVICE_CIDR_V6: "fdcd:f7c1:1619::/112"
   NETWORK_MANAGEMENT_CIDR: "10.1.0.0/16"
   NODE_0_DEVICE_0: "sda"
   NODE_0_NAME: "slowpoke"
   NODE_1_DEVICE_0: "sdb"
   NODE_1_NAME: "k8s-1"
   PLEX_NOAUTH_NETWORKS: "10.0.0.0/8,172.16.0.0/16,192.168.83.89/255.255.255.254"
   PROMETHEUS_PROFILE_IMG_URL: https://avatars3.githubusercontent.com/u/3380462
-  SVC_BLOCKY_ADDR_1: "10.1.0.111"
-  SVC_BLOCKY_ADDR_2: "10.1.0.112"
+  SVC_BLOCKY_ADDR_V4: "10.1.0.111"
+  SVC_BLOCKY_ADDR_V6: "2601:0404:c580:1c72::30:30/112"
   SVC_QBITTORRENT_ADDR: "10.2.0.2"
   TZ: "America/Detroit"
   WG_VXLAN_CIDR: "10.6.1.0/24"
diff --git a/cluster/core/metallb-system/helm-release.yaml b/cluster/core/metallb-system/helm-release.yaml
@@ -22,6 +22,7 @@ spec:
           protocol: layer2
           addresses:
             - "${METALLB_LB_RANGE}"
+            - "${METALLB_LB_IP6_RANGE}"
 
     tolerations:
       - key: "arch"