From 2d7a2dfbebd97e7db359be34024a7a2e2d18bb98 Mon Sep 17 00:00:00 2001
From: Junwei Zhao <wahyd4@gmail.com>
Date: Wed, 16 Dec 2020 19:14:56 +1100
Subject: [PATCH] update

---
 media.yaml             | 22 ++++++++--------------
 nginx-values.yaml      |  3 +++
 postgres-values.yaml   |  4 ++++
 prometheus-pv.yml      | 28 ++++++++++++++++++++++++++++
 prometheus-values.yaml |  8 +++++++-
 5 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/media.yaml b/media.yaml
index 55471e4..30a313b 100644
--- a/media.yaml
+++ b/media.yaml
@@ -184,19 +184,15 @@ spec:
       volumes:
         - name: config
           persistentVolumeClaim:
-            claimName: plex-nfs
-        - name: transcode
-          hostPath:
-            path: /mnt/plex-temp
-            type: DirectoryOrCreate
+            claimName: configs-nfs
         - name: downloads
           persistentVolumeClaim:
             claimName: downloads-nfs
-      nodeSelector:
-        dell: "true"
+      # nodeSelector:
+      #   dell: "true"
       containers:
         - name: plex
-          image: plexinc/pms-docker:latest
+          image: ghcr.io/linuxserver/plex
           # securityContext:
           #   runAsUser: 0
           imagePullPolicy: Always
@@ -224,18 +220,17 @@ spec:
             - name: TZ
               value: Australia/Melbourne
             - name: PLEX_CLAIM
-              value: "claim-b_w2MErxts9BHa8p356c"
+              value: "claim-CV5ZQuVy6qpMx-z1PLTZ"
             - name: HOSTNAME
               value: home-server
-            - name: PLEX_UID
+            - name: PUID
               value: "1000"
-            - name: PLEX_PGID
+            - name: PGID
               value: "1000"
           volumeMounts:
             - name: config
               mountPath: /config
-            - name: transcode
-              mountPath: /transcode
+              subPath: plex
             - name: downloads
               mountPath: /data
           resources:
@@ -246,7 +241,6 @@ spec:
               cpu: 1200m
               memory: 1500Mi
 
-
 ---
 apiVersion: v1
 kind: Service
diff --git a/nginx-values.yaml b/nginx-values.yaml
index 931124b..7657467 100644
--- a/nginx-values.yaml
+++ b/nginx-values.yaml
@@ -7,3 +7,6 @@ metrics:
       release: prometheus
 stats:
   enabled: true
+
+nodeSelector:
+  ip: 192.168.1.2
diff --git a/postgres-values.yaml b/postgres-values.yaml
index 0fb0900..bbdc3f9 100644
--- a/postgres-values.yaml
+++ b/postgres-values.yaml
@@ -22,3 +22,7 @@ metrics:
     enabled: true
     additionalLabels:
       release: prometheus
+
+primary:
+  nodeSelector:
+    ip: 192.168.1.2
diff --git a/prometheus-pv.yml b/prometheus-pv.yml
index 26a0bab..cf59513 100644
--- a/prometheus-pv.yml
+++ b/prometheus-pv.yml
@@ -54,3 +54,31 @@ spec:
     - ReadWriteOnce
   hostPath:
     path: "/mnt/prometheus-data"
+
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: configs-nfs-default
+spec:
+  capacity:
+    storage: 10Gi
+  accessModes:
+    - ReadWriteMany
+  nfs:
+    server: 192.168.1.4
+    path: "/configs"
+---
+
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  namespace: "default"
+  name: "configs-nfs-default"
+spec:
+  storageClassName: ""
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 10Gi
diff --git a/prometheus-values.yaml b/prometheus-values.yaml
index b927ad8..23d188d 100644
--- a/prometheus-values.yaml
+++ b/prometheus-values.yaml
@@ -1,6 +1,8 @@
 prometheusOperator:
   tls:
     enabled: false
+  nodeSelector:
+    ip: 192.168.1.2
   securityContext:
     runAsGroup: 1000
     runAsNonRoot: true
@@ -15,6 +17,8 @@ prometheusOperator:
 #       memory: 1500Mi
 prometheus:
   prometheusSpec:
+    nodeSelector:
+      ip: 192.168.1.2
     retentionSize: 50GiB
     retention: 1y
     image:
@@ -48,7 +52,9 @@ grafana:
   persistence:
     enabled: true
     storageClassName: manual
-    existingClaim: grafana-pvc
+    existingClaim: configs-nfs-default
+    subPath: grafana-data
+
   securityContext:
     fsGroup: 1000
     runAsUser: 1000