From f4087f668c07b51b7439cfc9f76b231e6c1183be Mon Sep 17 00:00:00 2001 From: Zee Aslam Date: Sat, 12 Feb 2022 17:45:11 -0500 Subject: [PATCH 1/2] step 1 --- cluster/apps/networking/blocky/helm-release.yaml | 4 ++-- cluster/apps/networking/traefik/helm-release.yaml | 2 +- cluster/base/cluster-settings.yaml | 7 +++++-- cluster/core/metallb-system/helm-release.yaml | 1 + 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cluster/apps/networking/blocky/helm-release.yaml b/cluster/apps/networking/blocky/helm-release.yaml index 4e0b35cdd4..ecd8779869 100644 --- 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 index d5c5969b67..29d3a0bdeb 100644 --- a/cluster/apps/networking/traefik/helm-release.yaml +++ b/cluster/apps/networking/traefik/helm-release.yaml @@ -29,7 +29,7 @@ spec: enabled: true type: LoadBalancer spec: - loadBalancerIP: "${METALLB_TRAEFIK_ADDR}" + loadBalancerIPs: "${METALLB_TRAEFIK_ADDR}" externalTrafficPolicy: Local logs: general: diff --git a/cluster/base/cluster-settings.yaml b/cluster/base/cluster-settings.yaml index f1e016338e..d2ee15902c 100644 --- a/cluster/base/cluster-settings.yaml +++ b/cluster/base/cluster-settings.yaml @@ -20,12 +20,15 @@ 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: 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::/48" # Network CIDR used for service IPs NETWORK_K8S_SERVICE_CIDR: "10.43.0.0/16" + NETWORK_K8S_SERVICE_CIDR_V6: "fdcd:c7cd:1619::/48" NETWORK_MANAGEMENT_CIDR: "10.1.0.0/16" NODE_0_DEVICE_0: "sda" NODE_0_NAME: "slowpoke" @@ -33,8 +36,8 @@ data: 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: "10.1.0.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 index 50881d50cd..fa9c4c8824 100644 --- 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" From 779de99a4a72140e2ff447e277c044ec6b0b18e4 Mon Sep 17 00:00:00 2001 From: Zee Aslam Date: Sat, 12 Feb 2022 21:55:58 -0500 Subject: [PATCH 2/2] Adjustments to ipv6 --- cluster/apps/networking/traefik/helm-release.yaml | 5 ++++- cluster/base/cluster-settings.yaml | 9 +++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cluster/apps/networking/traefik/helm-release.yaml b/cluster/apps/networking/traefik/helm-release.yaml index 29d3a0bdeb..5b11ea3d58 100644 --- 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: - loadBalancerIPs: "${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 index d2ee15902c..68352f8987 100644 --- 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,15 +21,15 @@ 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: + 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::/48" + 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:c7cd:1619::/48" + 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" @@ -37,7 +38,7 @@ data: 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_V4: "10.1.0.111" - SVC_BLOCKY_ADDR_V6: "10.1.0.112" + 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"