diff --git a/cluster/apps/data/volumes/nfs-backups-data.yaml b/cluster/apps/data/volumes/nfs-backups-data.yaml index 704230611..a5d1263cd 100644 --- a/cluster/apps/data/volumes/nfs-backups-data.yaml +++ b/cluster/apps/data/volumes/nfs-backups-data.yaml @@ -3,7 +3,6 @@ kind: StorageClass apiVersion: storage.k8s.io/v1 metadata: name: nfs-backups-data - namespace: data provisioner: nfs reclaimPolicy: Retain --- @@ -20,7 +19,7 @@ spec: - ReadWriteMany persistentVolumeReclaimPolicy: Retain nfs: - server: truenas.${SECRET_CLUSTER_DOMAIN_ROOT}. + server: "${LOCAL_LAN_TRUENAS}" path: "/mnt/storage/backups" --- apiVersion: v1 diff --git a/cluster/apps/data/volumes/nfs-home-claude-data.yaml b/cluster/apps/data/volumes/nfs-home-claude-data.yaml index 976a1be12..ae89e5d6e 100644 --- a/cluster/apps/data/volumes/nfs-home-claude-data.yaml +++ b/cluster/apps/data/volumes/nfs-home-claude-data.yaml @@ -3,7 +3,6 @@ kind: StorageClass apiVersion: storage.k8s.io/v1 metadata: name: nfs-home-claude-data - namespace: data provisioner: nfs reclaimPolicy: Retain --- @@ -20,7 +19,7 @@ spec: - ReadWriteMany persistentVolumeReclaimPolicy: Retain nfs: - server: truenas.${SECRET_CLUSTER_DOMAIN_ROOT}. + server: "${LOCAL_LAN_TRUENAS}" path: "/mnt/storage/home/claude" --- apiVersion: v1 diff --git a/cluster/apps/data/volumes/nfs-home-helene-data.yaml b/cluster/apps/data/volumes/nfs-home-helene-data.yaml index 8f1ca8dd8..fbf8bb82b 100644 --- a/cluster/apps/data/volumes/nfs-home-helene-data.yaml +++ b/cluster/apps/data/volumes/nfs-home-helene-data.yaml @@ -3,7 +3,6 @@ kind: StorageClass apiVersion: storage.k8s.io/v1 metadata: name: nfs-home-helene-data - namespace: data provisioner: nfs reclaimPolicy: Retain --- @@ -20,7 +19,7 @@ spec: - ReadWriteMany persistentVolumeReclaimPolicy: Retain nfs: - server: truenas.${SECRET_CLUSTER_DOMAIN_ROOT}. + server: "${LOCAL_LAN_TRUENAS}" path: "/mnt/storage/home/helene" --- apiVersion: v1 diff --git a/cluster/apps/data/volumes/nfs-music-data.yaml b/cluster/apps/data/volumes/nfs-music-data.yaml index c9d4085cd..f637eac45 100644 --- a/cluster/apps/data/volumes/nfs-music-data.yaml +++ b/cluster/apps/data/volumes/nfs-music-data.yaml @@ -3,7 +3,6 @@ kind: StorageClass apiVersion: storage.k8s.io/v1 metadata: name: nfs-music-data - namespace: data provisioner: nfs reclaimPolicy: Retain --- @@ -20,7 +19,7 @@ spec: - ReadWriteMany persistentVolumeReclaimPolicy: Retain nfs: - server: truenas.${SECRET_CLUSTER_DOMAIN_ROOT}. + server: "${LOCAL_LAN_TRUENAS}" path: "/mnt/storage/music" --- apiVersion: v1 diff --git a/cluster/apps/data/volumes/nfs-photo-data.yaml b/cluster/apps/data/volumes/nfs-photo-data.yaml index 4e601cc5a..853b3e737 100644 --- a/cluster/apps/data/volumes/nfs-photo-data.yaml +++ b/cluster/apps/data/volumes/nfs-photo-data.yaml @@ -3,7 +3,6 @@ kind: StorageClass apiVersion: storage.k8s.io/v1 metadata: name: nfs-photo-data - namespace: data provisioner: nfs reclaimPolicy: Retain --- @@ -20,7 +19,7 @@ spec: - ReadWriteMany persistentVolumeReclaimPolicy: Retain nfs: - server: truenas.${SECRET_CLUSTER_DOMAIN_ROOT}. + server: "${LOCAL_LAN_TRUENAS}" path: "/mnt/storage/photo" --- apiVersion: v1 diff --git a/cluster/apps/data/volumes/nfs-shared-documents-data.yaml b/cluster/apps/data/volumes/nfs-shared-documents-data.yaml index 8557ab3a1..878ccb749 100644 --- a/cluster/apps/data/volumes/nfs-shared-documents-data.yaml +++ b/cluster/apps/data/volumes/nfs-shared-documents-data.yaml @@ -3,7 +3,6 @@ kind: StorageClass apiVersion: storage.k8s.io/v1 metadata: name: nfs-shared-documents-data - namespace: data provisioner: nfs reclaimPolicy: Retain --- @@ -20,7 +19,7 @@ spec: - ReadWriteMany persistentVolumeReclaimPolicy: Retain nfs: - server: truenas.${SECRET_CLUSTER_DOMAIN_ROOT}. + server: "${LOCAL_LAN_TRUENAS}" path: "/mnt/storage/shared-documents" --- apiVersion: v1 diff --git a/cluster/apps/data/volumes/nfs-video-data.yaml b/cluster/apps/data/volumes/nfs-video-data.yaml index 188785d6b..fce5e8f20 100644 --- a/cluster/apps/data/volumes/nfs-video-data.yaml +++ b/cluster/apps/data/volumes/nfs-video-data.yaml @@ -3,7 +3,6 @@ kind: StorageClass apiVersion: storage.k8s.io/v1 metadata: name: nfs-video-data - namespace: data provisioner: nfs reclaimPolicy: Retain --- @@ -20,7 +19,7 @@ spec: - ReadWriteMany persistentVolumeReclaimPolicy: Retain nfs: - server: truenas.${SECRET_CLUSTER_DOMAIN_ROOT}. + server: "${LOCAL_LAN_TRUENAS}" path: "/mnt/storage/video" --- apiVersion: v1 diff --git a/cluster/apps/development/gitea/backup-job.yaml b/cluster/apps/development/gitea/backup-job.yaml index 718af1860..f93711dda 100644 --- a/cluster/apps/development/gitea/backup-job.yaml +++ b/cluster/apps/development/gitea/backup-job.yaml @@ -32,7 +32,7 @@ spec: cp /opt/id_rsa ~/.ssh/id_rsa chmod 600 ~/.ssh/id_rsa - ssh -o StrictHostKeyChecking=no homelab@truenas.${SECRET_CLUSTER_DOMAIN_ROOT}. << 'EOF' + ssh -o StrictHostKeyChecking=no homelab@${LOCAL_LAN_TRUENAS} << 'EOF' WORK_DIR="/mnt/storage/backups/gitea" diff --git a/cluster/apps/media/volumes/nfs-downloads-media.yaml b/cluster/apps/media/volumes/nfs-downloads-media.yaml index 5d41e4a5e..b5efcf18d 100644 --- a/cluster/apps/media/volumes/nfs-downloads-media.yaml +++ b/cluster/apps/media/volumes/nfs-downloads-media.yaml @@ -18,7 +18,7 @@ spec: - ReadWriteMany persistentVolumeReclaimPolicy: Retain nfs: - server: truenas.${SECRET_CLUSTER_DOMAIN_ROOT}. + server: "${LOCAL_LAN_TRUENAS}" path: "/mnt/storage/downloads" --- apiVersion: v1 diff --git a/cluster/apps/media/volumes/nfs-music-media.yaml b/cluster/apps/media/volumes/nfs-music-media.yaml index a3a42da19..520a4d061 100644 --- a/cluster/apps/media/volumes/nfs-music-media.yaml +++ b/cluster/apps/media/volumes/nfs-music-media.yaml @@ -18,7 +18,7 @@ spec: - ReadWriteMany persistentVolumeReclaimPolicy: Retain nfs: - server: truenas.${SECRET_CLUSTER_DOMAIN_ROOT}. + server: "${LOCAL_LAN_TRUENAS}" path: "/mnt/storage/music" --- apiVersion: v1 diff --git a/cluster/apps/media/volumes/nfs-photo-media.yaml b/cluster/apps/media/volumes/nfs-photo-media.yaml index 93e36444b..836eb0c04 100644 --- a/cluster/apps/media/volumes/nfs-photo-media.yaml +++ b/cluster/apps/media/volumes/nfs-photo-media.yaml @@ -18,7 +18,7 @@ spec: - ReadWriteMany persistentVolumeReclaimPolicy: Retain nfs: - server: truenas.${SECRET_CLUSTER_DOMAIN_ROOT}. + server: "${LOCAL_LAN_TRUENAS}" path: "/mnt/storage/photo" --- apiVersion: v1 diff --git a/cluster/apps/media/volumes/nfs-video-media.yaml b/cluster/apps/media/volumes/nfs-video-media.yaml index 8818f82bd..2ccbb9198 100644 --- a/cluster/apps/media/volumes/nfs-video-media.yaml +++ b/cluster/apps/media/volumes/nfs-video-media.yaml @@ -18,7 +18,7 @@ spec: - ReadWriteMany persistentVolumeReclaimPolicy: Retain nfs: - server: truenas.${SECRET_CLUSTER_DOMAIN_ROOT}. + server: "${LOCAL_LAN_TRUENAS}" path: "/mnt/storage/video" --- apiVersion: v1 diff --git a/cluster/apps/monitoring/blackbox-exporter/helm-release.yaml b/cluster/apps/monitoring/blackbox-exporter/helm-release.yaml index a7d5d1060..09edc5fcc 100644 --- a/cluster/apps/monitoring/blackbox-exporter/helm-release.yaml +++ b/cluster/apps/monitoring/blackbox-exporter/helm-release.yaml @@ -44,25 +44,25 @@ spec: scrapeTimeout: 30s targets: - name: truenas - url: truenas.${SECRET_CLUSTER_DOMAIN_ROOT}. + url: "${LOCAL_LAN_TRUENAS}" module: icmp - name: truenas-remote - url: truenas-remote.${SECRET_CLUSTER_DOMAIN_ROOT}. + url: "${LOCAL_LAN_TRUENAS_REMOTE}" module: icmp - name: borgbackup - url: borgbackup.${SECRET_CLUSTER_DOMAIN_ROOT}. + url: "${LOCAL_LAN_BORGBACKUP}" module: icmp - name: k3s-server - url: k3s-server.${SECRET_CLUSTER_DOMAIN_ROOT}. + url: "${LOCAL_LAN_K3SSERVER}" module: icmp - name: k3s-worker1 - url: k3s-worker1.${SECRET_CLUSTER_DOMAIN_ROOT}. + url: "${LOCAL_LAN_K3SWORKER1}" module: icmp - name: k3s-worker2 - url: k3s-worker2.${SECRET_CLUSTER_DOMAIN_ROOT}. + url: "${LOCAL_LAN_K3SWORKER2}" module: icmp - name: k3s-worker3 - url: k3s-worker3.${SECRET_CLUSTER_DOMAIN_ROOT}. + url: "${LOCAL_LAN_K3SWORKER3}" module: icmp prometheusRule: enabled: true diff --git a/cluster/apps/monitoring/kube-prometheus-stack/helm-release.yaml b/cluster/apps/monitoring/kube-prometheus-stack/helm-release.yaml index 17da2658e..0cabbbc25 100644 --- a/cluster/apps/monitoring/kube-prometheus-stack/helm-release.yaml +++ b/cluster/apps/monitoring/kube-prometheus-stack/helm-release.yaml @@ -248,7 +248,7 @@ spec: scrape_interval: 60s metrics_path: "/metrics" static_configs: - - targets: ["opnsense.${SECRET_CLUSTER_DOMAIN_ROOT}.:9273"] + - targets: ["${LOCAL_LAN_OPNSENSE}:9273"] labels: app: "opnsense" - job_name: "hass" @@ -264,14 +264,14 @@ spec: scrape_interval: 60s metrics_path: "/metrics" static_configs: - - targets: ["truenas.${SECRET_CLUSTER_DOMAIN_ROOT}.:9273"] + - targets: ["${LOCAL_LAN_TRUENAS}:9273"] labels: app: "truenas" - job_name: "truenas-remote" scrape_interval: 60s metrics_path: "/metrics" static_configs: - - targets: ["truenas-remote.${SECRET_CLUSTER_DOMAIN_ROOT}.:9273"] + - targets: ["${LOCAL_LAN_TRUENAS_REMOTE}:9273"] labels: app: "truenas-remote" # Example scrape config for probing ingresses via the Blackbox Exporter. diff --git a/cluster/base-custom/settings/cluster-settings.yaml b/cluster/base-custom/settings/cluster-settings.yaml index 7a4ad1cf2..97e2c5b02 100644 --- a/cluster/base-custom/settings/cluster-settings.yaml +++ b/cluster/base-custom/settings/cluster-settings.yaml @@ -16,3 +16,11 @@ data: CLUSTER_LB_EMQX: 192.168.169.109 CLUSTER_LB_TDARR: 192.168.169.110 LOCAL_LAN: 192.168.8.0/22 + LOCAL_LAN_OPNSENSE: 192.168.8.1 + LOCAL_LAN_TRUENAS: 192.168.9.10 + LOCAL_LAN_TRUENAS_REMOTE: 10.10.0.2 + LOCAL_LAN_BORGBACKUP: 192.168.9.20 + LOCAL_LAN_K3SSERVER: 192.168.9.100 + LOCAL_LAN_K3SWORKER1: 192.168.9.105 + LOCAL_LAN_K3SWORKER2: 192.168.9.106 + LOCAL_LAN_K3SWORKER3: 192.168.9.107