diff --git a/ansible/host_vars/gpu-node.yaml b/ansible/host_vars/gpu-node.yaml index 25e72bd..92cec75 100644 --- a/ansible/host_vars/gpu-node.yaml +++ b/ansible/host_vars/gpu-node.yaml @@ -38,7 +38,7 @@ nvidia_driver_version: "570" cuda_version: "12-8" # ── 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 }}" # Check current cluster version with: k3s --version on minisforum diff --git a/ansible/inventory.yaml b/ansible/inventory.yaml index c59b64e..e9b2658 100644 --- a/ansible/inventory.yaml +++ b/ansible/inventory.yaml @@ -9,24 +9,24 @@ all: k3s_server: hosts: minisforum: - ansible_host: 192.168.7.77 + ansible_host: 10.10.40.53 ansible_port: 430 k3s_agents: hosts: debian: - ansible_host: 192.168.7.183 + ansible_host: 10.10.40.20 ansible_port: 430 mac_mini: hosts: mac-mini: - ansible_host: 192.168.7.96 + ansible_host: 10.10.40.30 ansible_python_interpreter: /usr/bin/python3 gpu_workstation: hosts: gpu-node: - ansible_host: 192.168.7.98 + ansible_host: 10.10.40.12 ansible_port: 430 ansible_python_interpreter: /usr/bin/python3.12 \ No newline at end of file diff --git a/ansible/roles/k3s-agent/defaults/main.yaml b/ansible/roles/k3s-agent/defaults/main.yaml index 83f1b0a..edf9d2c 100644 --- a/ansible/roles/k3s-agent/defaults/main.yaml +++ b/ansible/roles/k3s-agent/defaults/main.yaml @@ -4,5 +4,5 @@ # Description: Default variables for the k3s-agent role including version, server URL, and join token. 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: "" diff --git a/ansible/roles/k3s-server/defaults/main.yaml b/ansible/roles/k3s-server/defaults/main.yaml index 65f806a..02d3399 100644 --- a/ansible/roles/k3s-server/defaults/main.yaml +++ b/ansible/roles/k3s-server/defaults/main.yaml @@ -4,7 +4,7 @@ # Description: Default variables for the k3s-server role including version, IP, and server configuration. k3s_version: v1.32.4+k3s1 -k3s_server_ip: 192.168.7.77 +k3s_server_ip: 10.10.40.53 k3s_server_config: disable: diff --git a/ansible/roles/nfs-server/defaults/main.yaml b/ansible/roles/nfs-server/defaults/main.yaml index fcd53fa..c263a50 100644 --- a/ansible/roles/nfs-server/defaults/main.yaml +++ b/ansible/roles/nfs-server/defaults/main.yaml @@ -4,4 +4,4 @@ # Description: Default variables for the nfs-server role including export path and allowed client IP. nfs_export_path: /mnt/storage -nfs_allowed_ip: 192.168.7.77 +nfs_allowed_ip: 10.10.40.53 diff --git a/ansible/roles/nfs-server/templates/exports.j2 b/ansible/roles/nfs-server/templates/exports.j2 index 4cc7b7f..d1595f8 100644 --- a/ansible/roles/nfs-server/templates/exports.j2 +++ b/ansible/roles/nfs-server/templates/exports.j2 @@ -3,5 +3,5 @@ # /etc/exports - managed by Ansible # NFS exports for K3s cluster -/mnt/storage 192.168.7.77(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) +/mnt/storage 10.10.40.53(ro,sync,no_subtree_check,no_root_squash,fsid=1) +/home/nik/backups 10.10.40.53(rw,sync,no_subtree_check,no_root_squash,fsid=2) diff --git a/ansible/roles/wireguard/tasks/main.yaml b/ansible/roles/wireguard/tasks/main.yaml index f68ae76..92e41e5 100644 --- a/ansible/roles/wireguard/tasks/main.yaml +++ b/ansible/roles/wireguard/tasks/main.yaml @@ -139,12 +139,12 @@ [Interface] PrivateKey = {{ phone_private_key.content | b64decode | trim }} Address = 10.10.0.2/32 - DNS = 192.168.7.77 + DNS = 10.10.40.53 [Peer] PublicKey = {{ server_public_key.stdout }} 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 # --- Mac client config --- @@ -158,7 +158,7 @@ [Interface] PrivateKey = {{ mac_private_key.content | b64decode | trim }} Address = 10.10.0.3/32 - DNS = 192.168.7.77 + DNS = 10.10.40.53 [Peer] PublicKey = {{ server_public_key.stdout }} diff --git a/config/dashy/conf.yaml b/config/dashy/conf.yaml index 9d5d094..d70dfa9 100644 --- a/config/dashy/conf.yaml +++ b/config/dashy/conf.yaml @@ -228,7 +228,7 @@ sections: id: 1_services_dashy - title: Ollama icon: mdi-robot-outline - url: http://192.168.7.96:11434 + url: http://10.10.40.30:11434 target: newtab id: 2_services_ollama - title: Glances diff --git a/manifests/core/coredns-custom.yaml b/manifests/core/coredns-custom.yaml index 781273e..18c284b 100644 --- a/manifests/core/coredns-custom.yaml +++ b/manifests/core/coredns-custom.yaml @@ -1,6 +1,6 @@ # Apply: kubectl apply -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 kind: ConfigMap metadata: @@ -11,5 +11,5 @@ data: home.arpa:53 { errors cache 30 - forward . 192.168.7.77 + forward . 10.10.40.53 } diff --git a/manifests/gitea/gitea-backup.yaml b/manifests/gitea/gitea-backup.yaml index d7aa644..427b01c 100644 --- a/manifests/gitea/gitea-backup.yaml +++ b/manifests/gitea/gitea-backup.yaml @@ -96,7 +96,7 @@ spec: accessModes: - ReadWriteMany nfs: - server: 192.168.7.183 + server: 10.10.40.20 path: /home/nik/backups/gitea persistentVolumeReclaimPolicy: Retain --- diff --git a/manifests/home-services/ai-gateway.yaml b/manifests/home-services/ai-gateway.yaml index b26b04a..abe14d9 100644 --- a/manifests/home-services/ai-gateway.yaml +++ b/manifests/home-services/ai-gateway.yaml @@ -27,7 +27,7 @@ spec: - name: GRPC_PORT value: "50052" - name: OLLAMA_URL - value: "http://192.168.7.96:11434" + value: "http://10.10.40.30:11434" - name: OLLAMA_MODEL value: "llama3" - name: OLLAMA_TIMEOUT diff --git a/manifests/homeassistant/homeassistant.yaml b/manifests/homeassistant/homeassistant.yaml index ed893f2..2417b93 100644 --- a/manifests/homeassistant/homeassistant.yaml +++ b/manifests/homeassistant/homeassistant.yaml @@ -6,7 +6,7 @@ metadata: namespace: default subsets: - addresses: - - ip: 192.168.7.77 + - ip: 10.10.40.53 ports: - port: 8123 --- diff --git a/manifests/media/jellyfin.yaml b/manifests/media/jellyfin.yaml index e8d82ca..65704ee 100644 --- a/manifests/media/jellyfin.yaml +++ b/manifests/media/jellyfin.yaml @@ -17,7 +17,7 @@ spec: - ReadOnlyMany persistentVolumeReclaimPolicy: Retain nfs: - server: 192.168.7.183 + server: 10.10.40.20 path: /mnt/storage nodeAffinity: required: diff --git a/manifests/media/kavita.yaml b/manifests/media/kavita.yaml index 303a8d1..1389dc8 100644 --- a/manifests/media/kavita.yaml +++ b/manifests/media/kavita.yaml @@ -17,7 +17,7 @@ spec: - ReadOnlyMany persistentVolumeReclaimPolicy: Retain nfs: - server: 192.168.7.183 + server: 10.10.40.20 path: /mnt/storage/books nodeAffinity: required: diff --git a/manifests/media/kavita2.yaml b/manifests/media/kavita2.yaml index a70e5c1..e7d7fc7 100644 --- a/manifests/media/kavita2.yaml +++ b/manifests/media/kavita2.yaml @@ -17,7 +17,7 @@ spec: - ReadOnlyMany persistentVolumeReclaimPolicy: Retain nfs: - server: 192.168.7.183 + server: 10.10.40.20 path: /mnt/storage/jellyfin/other nodeAffinity: required: diff --git a/manifests/network/glances-debian-ingress.yaml b/manifests/network/glances-debian-ingress.yaml index 6326819..ed04b7e 100644 --- a/manifests/network/glances-debian-ingress.yaml +++ b/manifests/network/glances-debian-ingress.yaml @@ -8,7 +8,7 @@ metadata: namespace: glances subsets: - addresses: - - ip: 192.168.7.183 + - ip: 10.10.40.20 ports: - port: 61208 --- diff --git a/manifests/network/watch-party-ingress.yaml b/manifests/network/watch-party-ingress.yaml index d3ed572..79bbf29 100644 --- a/manifests/network/watch-party-ingress.yaml +++ b/manifests/network/watch-party-ingress.yaml @@ -8,7 +8,7 @@ metadata: namespace: default subsets: - addresses: - - ip: 192.168.7.96 + - ip: 10.10.40.30 ports: - port: 3000 --- diff --git a/values/gitea.yaml b/values/gitea.yaml index 8ec439e..e5221d5 100644 --- a/values/gitea.yaml +++ b/values/gitea.yaml @@ -63,7 +63,7 @@ service: ssh: type: LoadBalancer port: 2222 - loadBalancerIP: 192.168.7.77 + loadBalancerIP: 10.10.40.53 postgresql-ha: enabled: false diff --git a/values/pihole-debian.yaml b/values/pihole-debian.yaml index 5021c78..9b03f9f 100644 --- a/values/pihole-debian.yaml +++ b/values/pihole-debian.yaml @@ -16,7 +16,7 @@ serviceDns: type: ClusterIP port: 53 annotations: - kube-vip.io/loadbalancerIPs: 192.168.7.183 + kube-vip.io/loadbalancerIPs: 10.10.40.20 probes: liveness: @@ -34,26 +34,26 @@ extraEnvVars: dnsmasq: customDnsEntries: - - address=/gitea.home.arpa/192.168.7.77 - - address=/pihole.home.arpa/192.168.7.77 - - address=/home.arpa/192.168.7.77 - - address=/nik4nao.home.arpa/192.168.7.183 - - address=/dashy.home.arpa/192.168.7.77 - - address=/jellyfin.home.arpa/192.168.7.77 - - address=/qbittorrent.home.arpa/192.168.7.77 - - address=/jdownloader.home.arpa/192.168.7.77 - - address=/glances.home.arpa/192.168.7.77 - - address=/glances-debian.home.arpa/192.168.7.77 - - address=/ca.home.arpa/192.168.7.77 - - address=/auth.home.arpa/192.168.7.77 - - address=/traefik.home.arpa/192.168.7.77 - - address=/gitea.nik4nao.com/192.168.7.77 - - address=/ha.home.arpa/192.168.7.77 - - address=/argocd.home.arpa/192.168.7.77 - - address=/gluetun.home.arpa/192.168.7.77 - - address=/alert-bridge.home.arpa/192.168.7.77 - - address=/books.home.arpa/192.168.7.77 - - address=/books2.home.arpa/192.168.7.77 + - address=/gitea.home.arpa/10.10.40.53 + - address=/pihole.home.arpa/10.10.40.53 + - address=/home.arpa/10.10.40.53 + - address=/nik4nao.home.arpa/10.10.40.20 + - address=/dashy.home.arpa/10.10.40.53 + - address=/jellyfin.home.arpa/10.10.40.53 + - address=/qbittorrent.home.arpa/10.10.40.53 + - address=/jdownloader.home.arpa/10.10.40.53 + - address=/glances.home.arpa/10.10.40.53 + - address=/glances-debian.home.arpa/10.10.40.53 + - address=/ca.home.arpa/10.10.40.53 + - address=/auth.home.arpa/10.10.40.53 + - address=/traefik.home.arpa/10.10.40.53 + - address=/gitea.nik4nao.com/10.10.40.53 + - address=/ha.home.arpa/10.10.40.53 + - address=/argocd.home.arpa/10.10.40.53 + - address=/gluetun.home.arpa/10.10.40.53 + - address=/alert-bridge.home.arpa/10.10.40.53 + - address=/books.home.arpa/10.10.40.53 + - address=/books2.home.arpa/10.10.40.53 persistentVolumeClaim: enabled: true diff --git a/values/pihole.yaml b/values/pihole.yaml index 6bb76c9..d6a7410 100644 --- a/values/pihole.yaml +++ b/values/pihole.yaml @@ -65,23 +65,23 @@ extraEnvVars: dnsmasq: customDnsEntries: - - address=/gitea.home.arpa/192.168.7.77 - - address=/pihole.home.arpa/192.168.7.77 - - address=/home.arpa/192.168.7.77 - - address=/nik4nao.home.arpa/192.168.7.183 - - address=/dashy.home.arpa/192.168.7.77 - - address=/jellyfin.home.arpa/192.168.7.77 - - address=/qbittorrent.home.arpa/192.168.7.77 - - address=/jdownloader.home.arpa/192.168.7.77 - - address=/glances.home.arpa/192.168.7.77 - - address=/glances-debian.home.arpa/192.168.7.77 - - address=/ca.home.arpa/192.168.7.77 - - address=/auth.home.arpa/192.168.7.77 - - address=/traefik.home.arpa/192.168.7.77 - - address=/gitea.nik4nao.com/192.168.7.77 - - address=/ha.home.arpa/192.168.7.77 - - address=/argocd.home.arpa/192.168.7.77 - - address=/gluetun.home.arpa/192.168.7.77 - - address=/alert-bridge.home.arpa/192.168.7.77 - - address=/books.home.arpa/192.168.7.77 - - address=/books2.home.arpa/192.168.7.77 \ No newline at end of file + - address=/gitea.home.arpa/10.10.40.53 + - address=/pihole.home.arpa/10.10.40.53 + - address=/home.arpa/10.10.40.53 + - address=/nik4nao.home.arpa/10.10.40.20 + - address=/dashy.home.arpa/10.10.40.53 + - address=/jellyfin.home.arpa/10.10.40.53 + - address=/qbittorrent.home.arpa/10.10.40.53 + - address=/jdownloader.home.arpa/10.10.40.53 + - address=/glances.home.arpa/10.10.40.53 + - address=/glances-debian.home.arpa/10.10.40.53 + - address=/ca.home.arpa/10.10.40.53 + - address=/auth.home.arpa/10.10.40.53 + - address=/traefik.home.arpa/10.10.40.53 + - address=/gitea.nik4nao.com/10.10.40.53 + - address=/ha.home.arpa/10.10.40.53 + - address=/argocd.home.arpa/10.10.40.53 + - address=/gluetun.home.arpa/10.10.40.53 + - address=/alert-bridge.home.arpa/10.10.40.53 + - address=/books.home.arpa/10.10.40.53 + - address=/books2.home.arpa/10.10.40.53 \ No newline at end of file