From bcf3ba5f004317426a2c8041c11118988fa3d2fe Mon Sep 17 00:00:00 2001 From: auricom <27022259+auricom@users.noreply.github.com> Date: Fri, 30 Jul 2021 01:33:59 +0200 Subject: [PATCH] fix: FQDN --- cluster/apps/data/forecastle/helm-release.yaml | 2 +- cluster/apps/data/pgbackups/deployment.yaml | 2 +- cluster/apps/data/volumes/nfs-backups-data.yaml | 2 +- .../apps/data/volumes/nfs-home-claude-data.yaml | 2 +- .../apps/data/volumes/nfs-home-helene-data.yaml | 2 +- cluster/apps/data/volumes/nfs-music-data.yaml | 2 +- cluster/apps/data/volumes/nfs-photo-data.yaml | 2 +- .../data/volumes/nfs-shared-documents-data.yaml | 2 +- cluster/apps/data/volumes/nfs-video-data.yaml | 2 +- cluster/apps/development/gitea/backup-job.yaml | 2 +- cluster/apps/media/radarr/trash-updater-job.yaml | 2 +- cluster/apps/media/sonarr/trash-updater-job.yaml | 2 +- .../apps/media/volumes/nfs-downloads-media.yaml | 2 +- cluster/apps/media/volumes/nfs-music-media.yaml | 2 +- cluster/apps/media/volumes/nfs-photo-media.yaml | 2 +- cluster/apps/media/volumes/nfs-video-media.yaml | 2 +- .../monitoring/blackbox-exporter/helm-release.yaml | 14 +++++++------- .../kube-prometheus-stack/helm-release.yaml | 4 ++-- 18 files changed, 25 insertions(+), 25 deletions(-) diff --git a/cluster/apps/data/forecastle/helm-release.yaml b/cluster/apps/data/forecastle/helm-release.yaml index 5b5e562d1..0756f0c97 100644 --- a/cluster/apps/data/forecastle/helm-release.yaml +++ b/cluster/apps/data/forecastle/helm-release.yaml @@ -19,7 +19,7 @@ spec: values: forecastle: config: - title: "Xpander Homelab" + title: "Healthchecks" namespaceSelector: matchNames: - data diff --git a/cluster/apps/data/pgbackups/deployment.yaml b/cluster/apps/data/pgbackups/deployment.yaml index 0f5a59f34..cf43a3556 100644 --- a/cluster/apps/data/pgbackups/deployment.yaml +++ b/cluster/apps/data/pgbackups/deployment.yaml @@ -47,7 +47,7 @@ spec: - name: HEALTHCHECK_PORT value: "8080" - name: POST_BACKUP_HOOK - value: "curl -m 10 --retry 5 https://healthchecks.k3s.xpander.ovh/ping/c88641a5-12f2-4f32-ab9c-5a7d122a229e" + value: "curl -m 10 --retry 5 http://healthchecks.monitoring.svc.cluster.local.:8000/ping/c88641a5-12f2-4f32-ab9c-5a7d122a229e" resources: requests: cpu: 150m diff --git a/cluster/apps/data/volumes/nfs-backups-data.yaml b/cluster/apps/data/volumes/nfs-backups-data.yaml index 9aac076b6..704230611 100644 --- a/cluster/apps/data/volumes/nfs-backups-data.yaml +++ b/cluster/apps/data/volumes/nfs-backups-data.yaml @@ -20,7 +20,7 @@ spec: - ReadWriteMany persistentVolumeReclaimPolicy: Retain nfs: - server: truenas + server: truenas.${SECRET_CLUSTER_DOMAIN_ROOT}. 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 f6cc0f8fd..976a1be12 100644 --- a/cluster/apps/data/volumes/nfs-home-claude-data.yaml +++ b/cluster/apps/data/volumes/nfs-home-claude-data.yaml @@ -20,7 +20,7 @@ spec: - ReadWriteMany persistentVolumeReclaimPolicy: Retain nfs: - server: truenas + server: truenas.${SECRET_CLUSTER_DOMAIN_ROOT}. 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 bbd70a334..8f1ca8dd8 100644 --- a/cluster/apps/data/volumes/nfs-home-helene-data.yaml +++ b/cluster/apps/data/volumes/nfs-home-helene-data.yaml @@ -20,7 +20,7 @@ spec: - ReadWriteMany persistentVolumeReclaimPolicy: Retain nfs: - server: truenas + server: truenas.${SECRET_CLUSTER_DOMAIN_ROOT}. 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 334252132..c9d4085cd 100644 --- a/cluster/apps/data/volumes/nfs-music-data.yaml +++ b/cluster/apps/data/volumes/nfs-music-data.yaml @@ -20,7 +20,7 @@ spec: - ReadWriteMany persistentVolumeReclaimPolicy: Retain nfs: - server: truenas + server: truenas.${SECRET_CLUSTER_DOMAIN_ROOT}. 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 631f83bcc..4e601cc5a 100644 --- a/cluster/apps/data/volumes/nfs-photo-data.yaml +++ b/cluster/apps/data/volumes/nfs-photo-data.yaml @@ -20,7 +20,7 @@ spec: - ReadWriteMany persistentVolumeReclaimPolicy: Retain nfs: - server: truenas + server: truenas.${SECRET_CLUSTER_DOMAIN_ROOT}. 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 c65fb4e5a..8557ab3a1 100644 --- a/cluster/apps/data/volumes/nfs-shared-documents-data.yaml +++ b/cluster/apps/data/volumes/nfs-shared-documents-data.yaml @@ -20,7 +20,7 @@ spec: - ReadWriteMany persistentVolumeReclaimPolicy: Retain nfs: - server: truenas + server: truenas.${SECRET_CLUSTER_DOMAIN_ROOT}. 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 742d7b6c3..188785d6b 100644 --- a/cluster/apps/data/volumes/nfs-video-data.yaml +++ b/cluster/apps/data/volumes/nfs-video-data.yaml @@ -20,7 +20,7 @@ spec: - ReadWriteMany persistentVolumeReclaimPolicy: Retain nfs: - server: truenas + server: truenas.${SECRET_CLUSTER_DOMAIN_ROOT}. 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 00f297926..50d071bc4 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 << 'EOF' + ssh -o StrictHostKeyChecking=no homelab@truenas.${SECRET_CLUSTER_DOMAIN_ROOT}. << 'EOF' WORK_DIR="/mnt/storage/backups/gitea" diff --git a/cluster/apps/media/radarr/trash-updater-job.yaml b/cluster/apps/media/radarr/trash-updater-job.yaml index 540e1586a..9c83ab3d9 100644 --- a/cluster/apps/media/radarr/trash-updater-job.yaml +++ b/cluster/apps/media/radarr/trash-updater-job.yaml @@ -38,7 +38,7 @@ spec: ./trash radarr --config /opt/trash.yaml - curl -m 10 --retry 5 https://healthchecks.k3s.xpander.ovh/ping/4776417a-8410-4c33-91ca-20e4284254f0 + curl -m 10 --retry 5 http://healthchecks.monitoring.svc.cluster.local.:8000/ping/4776417a-8410-4c33-91ca-20e4284254f0 volumeMounts: - name: config mountPath: /opt/trash.yaml diff --git a/cluster/apps/media/sonarr/trash-updater-job.yaml b/cluster/apps/media/sonarr/trash-updater-job.yaml index 25639343d..63359c3c6 100644 --- a/cluster/apps/media/sonarr/trash-updater-job.yaml +++ b/cluster/apps/media/sonarr/trash-updater-job.yaml @@ -38,7 +38,7 @@ spec: ./trash sonarr --config /opt/trash.yaml - curl -m 10 --retry 5 https://healthchecks.k3s.xpander.ovh/ping/f4c120e6-e12d-44b2-9ff9-e5433c0b7df4 + curl -m 10 --retry 5 http://healthchecks.monitoring.svc.cluster.local.:8000/ping/f4c120e6-e12d-44b2-9ff9-e5433c0b7df4 volumeMounts: - name: config mountPath: /opt/trash.yaml diff --git a/cluster/apps/media/volumes/nfs-downloads-media.yaml b/cluster/apps/media/volumes/nfs-downloads-media.yaml index b5d5a03ad..5d41e4a5e 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 + server: truenas.${SECRET_CLUSTER_DOMAIN_ROOT}. 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 926668062..a3a42da19 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 + server: truenas.${SECRET_CLUSTER_DOMAIN_ROOT}. 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 7ac055c58..93e36444b 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 + server: truenas.${SECRET_CLUSTER_DOMAIN_ROOT}. 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 bf1682c42..8818f82bd 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 + server: truenas.${SECRET_CLUSTER_DOMAIN_ROOT}. 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 6b620220b..a7d5d1060 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 + url: truenas.${SECRET_CLUSTER_DOMAIN_ROOT}. module: icmp - name: truenas-remote - url: truenas-remote + url: truenas-remote.${SECRET_CLUSTER_DOMAIN_ROOT}. module: icmp - name: borgbackup - url: borgbackup + url: borgbackup.${SECRET_CLUSTER_DOMAIN_ROOT}. module: icmp - name: k3s-server - url: k3s-server + url: k3s-server.${SECRET_CLUSTER_DOMAIN_ROOT}. module: icmp - name: k3s-worker1 - url: k3s-worker1 + url: k3s-worker1.${SECRET_CLUSTER_DOMAIN_ROOT}. module: icmp - name: k3s-worker2 - url: k3s-worker2 + url: k3s-worker2.${SECRET_CLUSTER_DOMAIN_ROOT}. module: icmp - name: k3s-worker3 - url: k3s-worker3 + url: k3s-worker3.${SECRET_CLUSTER_DOMAIN_ROOT}. 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 45410c98c..0dfa27010 100644 --- a/cluster/apps/monitoring/kube-prometheus-stack/helm-release.yaml +++ b/cluster/apps/monitoring/kube-prometheus-stack/helm-release.yaml @@ -264,14 +264,14 @@ spec: scrape_interval: 60s metrics_path: "/metrics" static_configs: - - targets: ["truenas.${SECRET_CLUSTER_DOMAIN_ROOT}:9273"] + - targets: ["truenas.${SECRET_CLUSTER_DOMAIN_ROOT}.: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: ["truenas-remote.${SECRET_CLUSTER_DOMAIN_ROOT}.:9273"] labels: app: "truenas-remote" # Example scrape config for probing ingresses via the Blackbox Exporter.