From 50aa3725bca79cd81c3d677a335c136e5983fd26 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Wed, 5 Apr 2023 14:21:10 +0000 Subject: [PATCH] using global server --- k8s/applications/videohosting/templates/plex-deploy.yaml | 2 +- k8s/applications/videohosting/values-prod.yaml | 2 -- k8s/applications/videohosting/values.yaml | 3 +-- k8s/argocd/values-prod.yaml | 2 ++ k8s/argocd/values.yaml | 4 +++- k8s/charts/templates/app-nfs-storage.yaml | 2 +- k8s/charts/values-prod.yaml | 1 - k8s/charts/values.yaml | 1 - 8 files changed, 8 insertions(+), 9 deletions(-) diff --git a/k8s/applications/videohosting/templates/plex-deploy.yaml b/k8s/applications/videohosting/templates/plex-deploy.yaml index 6dace1b..f64a09a 100644 --- a/k8s/applications/videohosting/templates/plex-deploy.yaml +++ b/k8s/applications/videohosting/templates/plex-deploy.yaml @@ -65,7 +65,7 @@ spec: {{ range $k, $v := .Values.nfs.shares }} - name: {{ $k }} nfs: - server: "{{ $.Values.nfs.server }}" + server: "{{ $.Values.global.nfs.server }}" path: "{{ $v }}" readOnly: true {{ end }} diff --git a/k8s/applications/videohosting/values-prod.yaml b/k8s/applications/videohosting/values-prod.yaml index a6f08ae..e69de29 100644 --- a/k8s/applications/videohosting/values-prod.yaml +++ b/k8s/applications/videohosting/values-prod.yaml @@ -1,2 +0,0 @@ -nfs: - server: "192.168.8.107" diff --git a/k8s/applications/videohosting/values.yaml b/k8s/applications/videohosting/values.yaml index a26abc1..2531cac 100644 --- a/k8s/applications/videohosting/values.yaml +++ b/k8s/applications/videohosting/values.yaml @@ -1,8 +1,7 @@ nfs: - server: "changeme" shares: torrents: "/mnt/EightTerra/DownloadedTorrents" - family-Videos: "/mnt/EightTerra/FamilyStorage/Video" + family-videos: "/mnt/EightTerra/FamilyStorage/Video" plex: repo: "plexinc/pms-docker" tag: "1.31.3.6868-28fc46b27" diff --git a/k8s/argocd/values-prod.yaml b/k8s/argocd/values-prod.yaml index fd6e7a8..4fe7234 100644 --- a/k8s/argocd/values-prod.yaml +++ b/k8s/argocd/values-prod.yaml @@ -4,5 +4,7 @@ global: tls: enabled: true issuer: "letsencrypt" + nfs: + server: "192.168.8.107" debugger: enabled: true diff --git a/k8s/argocd/values.yaml b/k8s/argocd/values.yaml index 7f593ae..5cc3083 100644 --- a/k8s/argocd/values.yaml +++ b/k8s/argocd/values.yaml @@ -27,4 +27,6 @@ global: issuer: "" secretName: "" domain: "" - deployment: "" \ No newline at end of file + deployment: "" + nfs: + server: "changme" diff --git a/k8s/charts/templates/app-nfs-storage.yaml b/k8s/charts/templates/app-nfs-storage.yaml index 0e903e7..15df78f 100644 --- a/k8s/charts/templates/app-nfs-storage.yaml +++ b/k8s/charts/templates/app-nfs-storage.yaml @@ -14,7 +14,7 @@ spec: releaseName: nfs-subdir-external-provisioner parameters: - name: nfs.server - value: "{{ .Values.nfs.server }}" + value: "{{ .Values.global.nfs.server }}" - name: nfs.path value: "{{ .Values.nfs.share }}" - name: storageClass.name diff --git a/k8s/charts/values-prod.yaml b/k8s/charts/values-prod.yaml index 3943d55..14c3871 100644 --- a/k8s/charts/values-prod.yaml +++ b/k8s/charts/values-prod.yaml @@ -1,3 +1,2 @@ nfs: - server: "192.168.8.107" share: "/mnt/EightTerra/k3s-cluster" diff --git a/k8s/charts/values.yaml b/k8s/charts/values.yaml index 44074c5..cda7db3 100644 --- a/k8s/charts/values.yaml +++ b/k8s/charts/values.yaml @@ -1,3 +1,2 @@ nfs: - server: "changeme" share: "/"