fix: update fleet IPs after subnet migration to 10.10.40.0/24
Some checks failed
validate / lint (push) Has been cancelled
Some checks failed
validate / lint (push) Has been cancelled
minisforum, debian, mac-mini, and gpu-node all moved from 192.168.7.0/24 to 10.10.40.0/24. Updates K3s server/agent config and node IPs (including gpu-node's host_vars override), NFS export allow-list and exports template, Pi-hole DNS records and kube-vip/loadBalancerIP pins, WireGuard's pushed DNS/AllowedIPs, and the NFS server IP baked into Jellyfin/Kavita/gitea-backup PVs and the Ollama URL used by ai-gateway/Dashy. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
parent
abc316d7f8
commit
7a8c73d78a
@ -38,7 +38,7 @@ nvidia_driver_version: "570"
|
|||||||
cuda_version: "12-8"
|
cuda_version: "12-8"
|
||||||
|
|
||||||
# ── k3s-agent ──────────────────────────────────────────────────────────────────
|
# ── k3s-agent ──────────────────────────────────────────────────────────────────
|
||||||
k3s_server_url: "https://192.168.7.77:6443"
|
k3s_server_url: "https://10.10.40.53:6443"
|
||||||
k3s_node_token: "{{ vault_k3s_node_token }}"
|
k3s_node_token: "{{ vault_k3s_node_token }}"
|
||||||
|
|
||||||
# Check current cluster version with: k3s --version on minisforum
|
# Check current cluster version with: k3s --version on minisforum
|
||||||
|
|||||||
@ -9,24 +9,24 @@ all:
|
|||||||
k3s_server:
|
k3s_server:
|
||||||
hosts:
|
hosts:
|
||||||
minisforum:
|
minisforum:
|
||||||
ansible_host: 192.168.7.77
|
ansible_host: 10.10.40.53
|
||||||
ansible_port: 430
|
ansible_port: 430
|
||||||
|
|
||||||
k3s_agents:
|
k3s_agents:
|
||||||
hosts:
|
hosts:
|
||||||
debian:
|
debian:
|
||||||
ansible_host: 192.168.7.183
|
ansible_host: 10.10.40.20
|
||||||
ansible_port: 430
|
ansible_port: 430
|
||||||
|
|
||||||
mac_mini:
|
mac_mini:
|
||||||
hosts:
|
hosts:
|
||||||
mac-mini:
|
mac-mini:
|
||||||
ansible_host: 192.168.7.96
|
ansible_host: 10.10.40.30
|
||||||
ansible_python_interpreter: /usr/bin/python3
|
ansible_python_interpreter: /usr/bin/python3
|
||||||
|
|
||||||
gpu_workstation:
|
gpu_workstation:
|
||||||
hosts:
|
hosts:
|
||||||
gpu-node:
|
gpu-node:
|
||||||
ansible_host: 192.168.7.98
|
ansible_host: 10.10.40.12
|
||||||
ansible_port: 430
|
ansible_port: 430
|
||||||
ansible_python_interpreter: /usr/bin/python3.12
|
ansible_python_interpreter: /usr/bin/python3.12
|
||||||
@ -4,5 +4,5 @@
|
|||||||
# Description: Default variables for the k3s-agent role including version, server URL, and join token.
|
# Description: Default variables for the k3s-agent role including version, server URL, and join token.
|
||||||
|
|
||||||
k3s_version: v1.32.4+k3s1
|
k3s_version: v1.32.4+k3s1
|
||||||
k3s_server_url: https://192.168.7.77:6443
|
k3s_server_url: https://10.10.40.53:6443
|
||||||
k3s_node_token: ""
|
k3s_node_token: ""
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
# Description: Default variables for the k3s-server role including version, IP, and server configuration.
|
# Description: Default variables for the k3s-server role including version, IP, and server configuration.
|
||||||
|
|
||||||
k3s_version: v1.32.4+k3s1
|
k3s_version: v1.32.4+k3s1
|
||||||
k3s_server_ip: 192.168.7.77
|
k3s_server_ip: 10.10.40.53
|
||||||
|
|
||||||
k3s_server_config:
|
k3s_server_config:
|
||||||
disable:
|
disable:
|
||||||
|
|||||||
@ -4,4 +4,4 @@
|
|||||||
# Description: Default variables for the nfs-server role including export path and allowed client IP.
|
# Description: Default variables for the nfs-server role including export path and allowed client IP.
|
||||||
|
|
||||||
nfs_export_path: /mnt/storage
|
nfs_export_path: /mnt/storage
|
||||||
nfs_allowed_ip: 192.168.7.77
|
nfs_allowed_ip: 10.10.40.53
|
||||||
|
|||||||
@ -3,5 +3,5 @@
|
|||||||
# /etc/exports - managed by Ansible
|
# /etc/exports - managed by Ansible
|
||||||
# NFS exports for K3s cluster
|
# NFS exports for K3s cluster
|
||||||
|
|
||||||
/mnt/storage 192.168.7.77(ro,sync,no_subtree_check,no_root_squash,fsid=1)
|
/mnt/storage 10.10.40.53(ro,sync,no_subtree_check,no_root_squash,fsid=1)
|
||||||
/home/nik/backups 192.168.7.77(rw,sync,no_subtree_check,no_root_squash,fsid=2)
|
/home/nik/backups 10.10.40.53(rw,sync,no_subtree_check,no_root_squash,fsid=2)
|
||||||
|
|||||||
@ -139,12 +139,12 @@
|
|||||||
[Interface]
|
[Interface]
|
||||||
PrivateKey = {{ phone_private_key.content | b64decode | trim }}
|
PrivateKey = {{ phone_private_key.content | b64decode | trim }}
|
||||||
Address = 10.10.0.2/32
|
Address = 10.10.0.2/32
|
||||||
DNS = 192.168.7.77
|
DNS = 10.10.40.53
|
||||||
|
|
||||||
[Peer]
|
[Peer]
|
||||||
PublicKey = {{ server_public_key.stdout }}
|
PublicKey = {{ server_public_key.stdout }}
|
||||||
Endpoint = {{ wireguard_endpoint }}:51820
|
Endpoint = {{ wireguard_endpoint }}:51820
|
||||||
AllowedIPs = 192.168.7.0/24, 10.10.0.0/24
|
AllowedIPs = 192.168.7.0/24, 10.10.40.0/24, 10.10.0.0/24
|
||||||
PersistentKeepalive = 25
|
PersistentKeepalive = 25
|
||||||
|
|
||||||
# --- Mac client config ---
|
# --- Mac client config ---
|
||||||
@ -158,7 +158,7 @@
|
|||||||
[Interface]
|
[Interface]
|
||||||
PrivateKey = {{ mac_private_key.content | b64decode | trim }}
|
PrivateKey = {{ mac_private_key.content | b64decode | trim }}
|
||||||
Address = 10.10.0.3/32
|
Address = 10.10.0.3/32
|
||||||
DNS = 192.168.7.77
|
DNS = 10.10.40.53
|
||||||
|
|
||||||
[Peer]
|
[Peer]
|
||||||
PublicKey = {{ server_public_key.stdout }}
|
PublicKey = {{ server_public_key.stdout }}
|
||||||
|
|||||||
@ -228,7 +228,7 @@ sections:
|
|||||||
id: 1_services_dashy
|
id: 1_services_dashy
|
||||||
- title: Ollama
|
- title: Ollama
|
||||||
icon: mdi-robot-outline
|
icon: mdi-robot-outline
|
||||||
url: http://192.168.7.96:11434
|
url: http://10.10.40.30:11434
|
||||||
target: newtab
|
target: newtab
|
||||||
id: 2_services_ollama
|
id: 2_services_ollama
|
||||||
- title: Glances
|
- title: Glances
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
# Apply: kubectl apply -f manifests/core/coredns-custom.yaml
|
# Apply: kubectl apply -f manifests/core/coredns-custom.yaml
|
||||||
# Delete: kubectl delete -f manifests/core/coredns-custom.yaml
|
# Delete: kubectl delete -f manifests/core/coredns-custom.yaml
|
||||||
# Description: CoreDNS custom ConfigMap to forward .home.arpa DNS queries to Pihole at 192.168.7.77.
|
# Description: CoreDNS custom ConfigMap to forward .home.arpa DNS queries to Pihole at 10.10.40.53.
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ConfigMap
|
kind: ConfigMap
|
||||||
metadata:
|
metadata:
|
||||||
@ -11,5 +11,5 @@ data:
|
|||||||
home.arpa:53 {
|
home.arpa:53 {
|
||||||
errors
|
errors
|
||||||
cache 30
|
cache 30
|
||||||
forward . 192.168.7.77
|
forward . 10.10.40.53
|
||||||
}
|
}
|
||||||
|
|||||||
@ -96,7 +96,7 @@ spec:
|
|||||||
accessModes:
|
accessModes:
|
||||||
- ReadWriteMany
|
- ReadWriteMany
|
||||||
nfs:
|
nfs:
|
||||||
server: 192.168.7.183
|
server: 10.10.40.20
|
||||||
path: /home/nik/backups/gitea
|
path: /home/nik/backups/gitea
|
||||||
persistentVolumeReclaimPolicy: Retain
|
persistentVolumeReclaimPolicy: Retain
|
||||||
---
|
---
|
||||||
|
|||||||
@ -27,7 +27,7 @@ spec:
|
|||||||
- name: GRPC_PORT
|
- name: GRPC_PORT
|
||||||
value: "50052"
|
value: "50052"
|
||||||
- name: OLLAMA_URL
|
- name: OLLAMA_URL
|
||||||
value: "http://192.168.7.96:11434"
|
value: "http://10.10.40.30:11434"
|
||||||
- name: OLLAMA_MODEL
|
- name: OLLAMA_MODEL
|
||||||
value: "llama3"
|
value: "llama3"
|
||||||
- name: OLLAMA_TIMEOUT
|
- name: OLLAMA_TIMEOUT
|
||||||
|
|||||||
@ -6,7 +6,7 @@ metadata:
|
|||||||
namespace: default
|
namespace: default
|
||||||
subsets:
|
subsets:
|
||||||
- addresses:
|
- addresses:
|
||||||
- ip: 192.168.7.77
|
- ip: 10.10.40.53
|
||||||
ports:
|
ports:
|
||||||
- port: 8123
|
- port: 8123
|
||||||
---
|
---
|
||||||
|
|||||||
@ -17,7 +17,7 @@ spec:
|
|||||||
- ReadOnlyMany
|
- ReadOnlyMany
|
||||||
persistentVolumeReclaimPolicy: Retain
|
persistentVolumeReclaimPolicy: Retain
|
||||||
nfs:
|
nfs:
|
||||||
server: 192.168.7.183
|
server: 10.10.40.20
|
||||||
path: /mnt/storage
|
path: /mnt/storage
|
||||||
nodeAffinity:
|
nodeAffinity:
|
||||||
required:
|
required:
|
||||||
|
|||||||
@ -17,7 +17,7 @@ spec:
|
|||||||
- ReadOnlyMany
|
- ReadOnlyMany
|
||||||
persistentVolumeReclaimPolicy: Retain
|
persistentVolumeReclaimPolicy: Retain
|
||||||
nfs:
|
nfs:
|
||||||
server: 192.168.7.183
|
server: 10.10.40.20
|
||||||
path: /mnt/storage/books
|
path: /mnt/storage/books
|
||||||
nodeAffinity:
|
nodeAffinity:
|
||||||
required:
|
required:
|
||||||
|
|||||||
@ -17,7 +17,7 @@ spec:
|
|||||||
- ReadOnlyMany
|
- ReadOnlyMany
|
||||||
persistentVolumeReclaimPolicy: Retain
|
persistentVolumeReclaimPolicy: Retain
|
||||||
nfs:
|
nfs:
|
||||||
server: 192.168.7.183
|
server: 10.10.40.20
|
||||||
path: /mnt/storage/jellyfin/other
|
path: /mnt/storage/jellyfin/other
|
||||||
nodeAffinity:
|
nodeAffinity:
|
||||||
required:
|
required:
|
||||||
|
|||||||
@ -8,7 +8,7 @@ metadata:
|
|||||||
namespace: glances
|
namespace: glances
|
||||||
subsets:
|
subsets:
|
||||||
- addresses:
|
- addresses:
|
||||||
- ip: 192.168.7.183
|
- ip: 10.10.40.20
|
||||||
ports:
|
ports:
|
||||||
- port: 61208
|
- port: 61208
|
||||||
---
|
---
|
||||||
|
|||||||
@ -8,7 +8,7 @@ metadata:
|
|||||||
namespace: default
|
namespace: default
|
||||||
subsets:
|
subsets:
|
||||||
- addresses:
|
- addresses:
|
||||||
- ip: 192.168.7.96
|
- ip: 10.10.40.30
|
||||||
ports:
|
ports:
|
||||||
- port: 3000
|
- port: 3000
|
||||||
---
|
---
|
||||||
|
|||||||
@ -63,7 +63,7 @@ service:
|
|||||||
ssh:
|
ssh:
|
||||||
type: LoadBalancer
|
type: LoadBalancer
|
||||||
port: 2222
|
port: 2222
|
||||||
loadBalancerIP: 192.168.7.77
|
loadBalancerIP: 10.10.40.53
|
||||||
|
|
||||||
postgresql-ha:
|
postgresql-ha:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
|||||||
@ -16,7 +16,7 @@ serviceDns:
|
|||||||
type: ClusterIP
|
type: ClusterIP
|
||||||
port: 53
|
port: 53
|
||||||
annotations:
|
annotations:
|
||||||
kube-vip.io/loadbalancerIPs: 192.168.7.183
|
kube-vip.io/loadbalancerIPs: 10.10.40.20
|
||||||
|
|
||||||
probes:
|
probes:
|
||||||
liveness:
|
liveness:
|
||||||
@ -34,26 +34,26 @@ extraEnvVars:
|
|||||||
|
|
||||||
dnsmasq:
|
dnsmasq:
|
||||||
customDnsEntries:
|
customDnsEntries:
|
||||||
- address=/gitea.home.arpa/192.168.7.77
|
- address=/gitea.home.arpa/10.10.40.53
|
||||||
- address=/pihole.home.arpa/192.168.7.77
|
- address=/pihole.home.arpa/10.10.40.53
|
||||||
- address=/home.arpa/192.168.7.77
|
- address=/home.arpa/10.10.40.53
|
||||||
- address=/nik4nao.home.arpa/192.168.7.183
|
- address=/nik4nao.home.arpa/10.10.40.20
|
||||||
- address=/dashy.home.arpa/192.168.7.77
|
- address=/dashy.home.arpa/10.10.40.53
|
||||||
- address=/jellyfin.home.arpa/192.168.7.77
|
- address=/jellyfin.home.arpa/10.10.40.53
|
||||||
- address=/qbittorrent.home.arpa/192.168.7.77
|
- address=/qbittorrent.home.arpa/10.10.40.53
|
||||||
- address=/jdownloader.home.arpa/192.168.7.77
|
- address=/jdownloader.home.arpa/10.10.40.53
|
||||||
- address=/glances.home.arpa/192.168.7.77
|
- address=/glances.home.arpa/10.10.40.53
|
||||||
- address=/glances-debian.home.arpa/192.168.7.77
|
- address=/glances-debian.home.arpa/10.10.40.53
|
||||||
- address=/ca.home.arpa/192.168.7.77
|
- address=/ca.home.arpa/10.10.40.53
|
||||||
- address=/auth.home.arpa/192.168.7.77
|
- address=/auth.home.arpa/10.10.40.53
|
||||||
- address=/traefik.home.arpa/192.168.7.77
|
- address=/traefik.home.arpa/10.10.40.53
|
||||||
- address=/gitea.nik4nao.com/192.168.7.77
|
- address=/gitea.nik4nao.com/10.10.40.53
|
||||||
- address=/ha.home.arpa/192.168.7.77
|
- address=/ha.home.arpa/10.10.40.53
|
||||||
- address=/argocd.home.arpa/192.168.7.77
|
- address=/argocd.home.arpa/10.10.40.53
|
||||||
- address=/gluetun.home.arpa/192.168.7.77
|
- address=/gluetun.home.arpa/10.10.40.53
|
||||||
- address=/alert-bridge.home.arpa/192.168.7.77
|
- address=/alert-bridge.home.arpa/10.10.40.53
|
||||||
- address=/books.home.arpa/192.168.7.77
|
- address=/books.home.arpa/10.10.40.53
|
||||||
- address=/books2.home.arpa/192.168.7.77
|
- address=/books2.home.arpa/10.10.40.53
|
||||||
|
|
||||||
persistentVolumeClaim:
|
persistentVolumeClaim:
|
||||||
enabled: true
|
enabled: true
|
||||||
|
|||||||
@ -65,23 +65,23 @@ extraEnvVars:
|
|||||||
|
|
||||||
dnsmasq:
|
dnsmasq:
|
||||||
customDnsEntries:
|
customDnsEntries:
|
||||||
- address=/gitea.home.arpa/192.168.7.77
|
- address=/gitea.home.arpa/10.10.40.53
|
||||||
- address=/pihole.home.arpa/192.168.7.77
|
- address=/pihole.home.arpa/10.10.40.53
|
||||||
- address=/home.arpa/192.168.7.77
|
- address=/home.arpa/10.10.40.53
|
||||||
- address=/nik4nao.home.arpa/192.168.7.183
|
- address=/nik4nao.home.arpa/10.10.40.20
|
||||||
- address=/dashy.home.arpa/192.168.7.77
|
- address=/dashy.home.arpa/10.10.40.53
|
||||||
- address=/jellyfin.home.arpa/192.168.7.77
|
- address=/jellyfin.home.arpa/10.10.40.53
|
||||||
- address=/qbittorrent.home.arpa/192.168.7.77
|
- address=/qbittorrent.home.arpa/10.10.40.53
|
||||||
- address=/jdownloader.home.arpa/192.168.7.77
|
- address=/jdownloader.home.arpa/10.10.40.53
|
||||||
- address=/glances.home.arpa/192.168.7.77
|
- address=/glances.home.arpa/10.10.40.53
|
||||||
- address=/glances-debian.home.arpa/192.168.7.77
|
- address=/glances-debian.home.arpa/10.10.40.53
|
||||||
- address=/ca.home.arpa/192.168.7.77
|
- address=/ca.home.arpa/10.10.40.53
|
||||||
- address=/auth.home.arpa/192.168.7.77
|
- address=/auth.home.arpa/10.10.40.53
|
||||||
- address=/traefik.home.arpa/192.168.7.77
|
- address=/traefik.home.arpa/10.10.40.53
|
||||||
- address=/gitea.nik4nao.com/192.168.7.77
|
- address=/gitea.nik4nao.com/10.10.40.53
|
||||||
- address=/ha.home.arpa/192.168.7.77
|
- address=/ha.home.arpa/10.10.40.53
|
||||||
- address=/argocd.home.arpa/192.168.7.77
|
- address=/argocd.home.arpa/10.10.40.53
|
||||||
- address=/gluetun.home.arpa/192.168.7.77
|
- address=/gluetun.home.arpa/10.10.40.53
|
||||||
- address=/alert-bridge.home.arpa/192.168.7.77
|
- address=/alert-bridge.home.arpa/10.10.40.53
|
||||||
- address=/books.home.arpa/192.168.7.77
|
- address=/books.home.arpa/10.10.40.53
|
||||||
- address=/books2.home.arpa/192.168.7.77
|
- address=/books2.home.arpa/10.10.40.53
|
||||||
Loading…
x
Reference in New Issue
Block a user