Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dual stack migration #248

Merged
merged 2 commits into from
Feb 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cluster/apps/networking/blocky/helm-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
5 changes: 4 additions & 1 deletion cluster/apps/networking/traefik/helm-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 6 additions & 2 deletions cluster/base/cluster-settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
1 change: 1 addition & 0 deletions cluster/core/metallb-system/helm-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ spec:
protocol: layer2
addresses:
- "${METALLB_LB_RANGE}"
- "${METALLB_LB_IP6_RANGE}"

tolerations:
- key: "arch"
Expand Down