diff --git a/apps/arr/homarr/homarr-deployment.yaml b/apps/arr/homarr/deployment.yaml similarity index 100% rename from apps/arr/homarr/homarr-deployment.yaml rename to apps/arr/homarr/deployment.yaml diff --git a/apps/arr/homarr/homarr-ingress.yaml b/apps/arr/homarr/ingress.yaml similarity index 100% rename from apps/arr/homarr/homarr-ingress.yaml rename to apps/arr/homarr/ingress.yaml diff --git a/apps/arr/homarr/kustomization.yaml b/apps/arr/homarr/kustomization.yaml index 8d47aff..3666f34 100644 --- a/apps/arr/homarr/kustomization.yaml +++ b/apps/arr/homarr/kustomization.yaml @@ -1,8 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- homarr-namespace.yaml -- homarr-ingress.yaml -- homarr-service.yaml -- homarr-pvc.yaml -- homarr-deployment.yaml +- namespace.yaml +- ingress.yaml +- service.yaml +- pvc.yaml +- deployment.yaml diff --git a/apps/arr/homarr/homarr-namespace.yaml b/apps/arr/homarr/namespace.yaml similarity index 100% rename from apps/arr/homarr/homarr-namespace.yaml rename to apps/arr/homarr/namespace.yaml diff --git a/apps/arr/homarr/homarr-pvc.yaml b/apps/arr/homarr/pvc.yaml similarity index 100% rename from apps/arr/homarr/homarr-pvc.yaml rename to apps/arr/homarr/pvc.yaml diff --git a/apps/arr/homarr/homarr-service.yaml b/apps/arr/homarr/service.yaml similarity index 100% rename from apps/arr/homarr/homarr-service.yaml rename to apps/arr/homarr/service.yaml diff --git a/apps/arr/mediapvs/kustomization.yaml b/apps/arr/mediapvs/kustomization.yaml index df5eacc..48cb3dd 100644 --- a/apps/arr/mediapvs/kustomization.yaml +++ b/apps/arr/mediapvs/kustomization.yaml @@ -1,8 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- mediapv-and-pvc.yaml -- mediadownloadspv-and-pvc.yaml -- mediapv-and-pvc-seagate.yaml -- mediadownloadspv-and-pvc-seagate.yaml - nas +- nvme2tb +- seagate diff --git a/apps/arr/mediapvs/nas/nasdiskspv-and-pvc.yaml b/apps/arr/mediapvs/nas/nasdiskspv-and-pvc.yaml deleted file mode 100644 index 4a84283..0000000 --- a/apps/arr/mediapvs/nas/nasdiskspv-and-pvc.yaml +++ /dev/null @@ -1,33 +0,0 @@ -apiVersion: v1 -kind: PersistentVolume -metadata: - name: jellyfin-nas -spec: - capacity: - storage: 3000Gi - accessModes: - - ReadWriteMany - persistentVolumeReclaimPolicy: Retain - storageClassName: "" - csi: - driver: smb.csi.k8s.io - volumeHandle: jellyfin-nas - volumeAttributes: - source: "//192.168.88.193/Media" - nodeStageSecretRef: - name: smb-credentials - namespace: media ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: jellyfin-nas - namespace: media -spec: - accessModes: - - ReadWriteMany - resources: - requests: - storage: 1900Gi - volumeName: jellyfin-nas - storageClassName: "" diff --git a/apps/arr/mediapvs/mediadownloadspv-and-pvc.yaml b/apps/arr/mediapvs/nvme2tb/downloadpv.yaml similarity index 55% rename from apps/arr/mediapvs/mediadownloadspv-and-pvc.yaml rename to apps/arr/mediapvs/nvme2tb/downloadpv.yaml index 71c3da8..af1d965 100644 --- a/apps/arr/mediapvs/mediadownloadspv-and-pvc.yaml +++ b/apps/arr/mediapvs/nvme2tb/downloadpv.yaml @@ -1,4 +1,3 @@ -#text apiVersion: v1 kind: PersistentVolume metadata: @@ -16,17 +15,3 @@ spec: - hard - nfsvers=3 storageClassName: "" ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: qbittorrent-downloads - namespace: media -spec: - accessModes: - - ReadWriteMany - resources: - requests: - storage: 1900Gi - volumeName: qbittorrent-downloads - storageClassName: "" diff --git a/apps/arr/mediapvs/nvme2tb/downloadpvc.yaml b/apps/arr/mediapvs/nvme2tb/downloadpvc.yaml new file mode 100644 index 0000000..92e57b5 --- /dev/null +++ b/apps/arr/mediapvs/nvme2tb/downloadpvc.yaml @@ -0,0 +1,13 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: qbittorrent-downloads + namespace: media +spec: + accessModes: + - ReadWriteMany + resources: + requests: + storage: 1900Gi + volumeName: qbittorrent-downloads + storageClassName: "" diff --git a/apps/arr/mediapvs/nvme2tb/kustomization.yaml b/apps/arr/mediapvs/nvme2tb/kustomization.yaml new file mode 100644 index 0000000..6621c5f --- /dev/null +++ b/apps/arr/mediapvs/nvme2tb/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- downloadpv.yaml +- downloadpvc.yaml +- mediapv.yaml +- mediapvc.yaml diff --git a/apps/arr/mediapvs/mediapv-and-pvc.yaml b/apps/arr/mediapvs/nvme2tb/mediapv.yaml similarity index 56% rename from apps/arr/mediapvs/mediapv-and-pvc.yaml rename to apps/arr/mediapvs/nvme2tb/mediapv.yaml index 90a29cc..36f690e 100644 --- a/apps/arr/mediapvs/mediapv-and-pvc.yaml +++ b/apps/arr/mediapvs/nvme2tb/mediapv.yaml @@ -15,17 +15,3 @@ spec: - hard - nfsvers=3 storageClassName: "" ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: jellyfin-media - namespace: media -spec: - accessModes: - - ReadWriteMany - resources: - requests: - storage: 1900Gi - volumeName: jellyfin-media - storageClassName: "" diff --git a/apps/arr/mediapvs/nvme2tb/mediapvc.yaml b/apps/arr/mediapvs/nvme2tb/mediapvc.yaml new file mode 100644 index 0000000..1cfd062 --- /dev/null +++ b/apps/arr/mediapvs/nvme2tb/mediapvc.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: jellyfin-media + namespace: media +spec: + accessModes: + - ReadWriteMany + resources: + requests: + storage: 1900Gi + volumeName: jellyfin-media + storageClassName: "" + diff --git a/apps/arr/mediapvs/seagate/kustomization.yaml b/apps/arr/mediapvs/seagate/kustomization.yaml new file mode 100644 index 0000000..94055d6 --- /dev/null +++ b/apps/arr/mediapvs/seagate/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- seagatemediapvc.yaml +- seagatemediapv.yaml +- seagatedownloadspv.yaml +- seagatedownloadspvc.yaml diff --git a/apps/arr/mediapvs/mediadownloadspv-and-pvc-seagate.yaml b/apps/arr/mediapvs/seagate/seagatedownloadspv.yaml similarity index 54% rename from apps/arr/mediapvs/mediadownloadspv-and-pvc-seagate.yaml rename to apps/arr/mediapvs/seagate/seagatedownloadspv.yaml index a6774cd..0aa06bc 100644 --- a/apps/arr/mediapvs/mediadownloadspv-and-pvc-seagate.yaml +++ b/apps/arr/mediapvs/seagate/seagatedownloadspv.yaml @@ -1,4 +1,3 @@ -#text apiVersion: v1 kind: PersistentVolume metadata: @@ -16,17 +15,3 @@ spec: - hard - nfsvers=3 storageClassName: "" ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: qbittorrent-downloads-seagate - namespace: media -spec: - accessModes: - - ReadWriteMany - resources: - requests: - storage: 2800Gi - volumeName: qbittorrent-downloads-seagate - storageClassName: "" diff --git a/apps/arr/mediapvs/seagate/seagatedownloadspvc.yaml b/apps/arr/mediapvs/seagate/seagatedownloadspvc.yaml new file mode 100644 index 0000000..ac44b95 --- /dev/null +++ b/apps/arr/mediapvs/seagate/seagatedownloadspvc.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: qbittorrent-downloads-seagate + namespace: media +spec: + accessModes: + - ReadWriteMany + resources: + requests: + storage: 2800Gi + volumeName: qbittorrent-downloads-seagate + storageClassName: "" + diff --git a/apps/arr/mediapvs/mediapv-and-pvc-seagate.yaml b/apps/arr/mediapvs/seagate/seagatemediapv.yaml similarity index 55% rename from apps/arr/mediapvs/mediapv-and-pvc-seagate.yaml rename to apps/arr/mediapvs/seagate/seagatemediapv.yaml index 8cd0056..7dd7240 100644 --- a/apps/arr/mediapvs/mediapv-and-pvc-seagate.yaml +++ b/apps/arr/mediapvs/seagate/seagatemediapv.yaml @@ -15,17 +15,3 @@ spec: - hard - nfsvers=3 storageClassName: "" ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: jellyfin-media-seagate - namespace: media -spec: - accessModes: - - ReadWriteMany - resources: - requests: - storage: 2800Gi - volumeName: jellyfin-media-seagate - storageClassName: "" diff --git a/apps/arr/mediapvs/seagate/seagatemediapvc.yaml b/apps/arr/mediapvs/seagate/seagatemediapvc.yaml new file mode 100644 index 0000000..3254b6c --- /dev/null +++ b/apps/arr/mediapvs/seagate/seagatemediapvc.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: jellyfin-media-seagate + namespace: media +spec: + accessModes: + - ReadWriteMany + resources: + requests: + storage: 2800Gi + volumeName: jellyfin-media-seagate + storageClassName: "" + diff --git a/apps/arr/prowlarr/prowlarr-config.yaml b/apps/arr/prowlarr/deployment.yaml similarity index 100% rename from apps/arr/prowlarr/prowlarr-config.yaml rename to apps/arr/prowlarr/deployment.yaml diff --git a/apps/arr/prowlarr/prowlarr-ingress.yaml b/apps/arr/prowlarr/ingress.yaml similarity index 100% rename from apps/arr/prowlarr/prowlarr-ingress.yaml rename to apps/arr/prowlarr/ingress.yaml diff --git a/apps/arr/prowlarr/kustomization.yaml b/apps/arr/prowlarr/kustomization.yaml index 25f99e4..ba04f58 100644 --- a/apps/arr/prowlarr/kustomization.yaml +++ b/apps/arr/prowlarr/kustomization.yaml @@ -1,7 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- prowlarr-ingress.yaml -- prowlarr-service.yaml -- prowlarr-pvc.yaml -- prowlarr-config.yaml +- ingress.yaml +- service.yaml +- pvc.yaml +- deployment.yaml diff --git a/apps/arr/prowlarr/prowlarr-pvc.yaml b/apps/arr/prowlarr/pvc.yaml similarity index 100% rename from apps/arr/prowlarr/prowlarr-pvc.yaml rename to apps/arr/prowlarr/pvc.yaml diff --git a/apps/arr/prowlarr/prowlarr-service.yaml b/apps/arr/prowlarr/service.yaml similarity index 100% rename from apps/arr/prowlarr/prowlarr-service.yaml rename to apps/arr/prowlarr/service.yaml diff --git a/apps/arr/qbittorrent/qbittorrent-deployment.yaml b/apps/arr/qbittorrent/deployment.yaml similarity index 100% rename from apps/arr/qbittorrent/qbittorrent-deployment.yaml rename to apps/arr/qbittorrent/deployment.yaml diff --git a/apps/arr/qbittorrent/qbittorrent-ingress.yaml b/apps/arr/qbittorrent/ingress.yaml similarity index 100% rename from apps/arr/qbittorrent/qbittorrent-ingress.yaml rename to apps/arr/qbittorrent/ingress.yaml diff --git a/apps/arr/qbittorrent/kustomization.yaml b/apps/arr/qbittorrent/kustomization.yaml index c7d09c9..ba04f58 100644 --- a/apps/arr/qbittorrent/kustomization.yaml +++ b/apps/arr/qbittorrent/kustomization.yaml @@ -1,7 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- qbittorrent-ingress.yaml -- qbittorrent-service.yaml -- qbittorrent-pvc.yaml -- qbittorrent-deployment.yaml +- ingress.yaml +- service.yaml +- pvc.yaml +- deployment.yaml diff --git a/apps/arr/qbittorrent/qbittorrent-pvc.yaml b/apps/arr/qbittorrent/pvc.yaml similarity index 100% rename from apps/arr/qbittorrent/qbittorrent-pvc.yaml rename to apps/arr/qbittorrent/pvc.yaml diff --git a/apps/arr/qbittorrent/qbittorrent-service.yaml b/apps/arr/qbittorrent/service.yaml similarity index 100% rename from apps/arr/qbittorrent/qbittorrent-service.yaml rename to apps/arr/qbittorrent/service.yaml diff --git a/apps/arr/radarr/radarr-deployment.yaml b/apps/arr/radarr/deployment.yaml similarity index 100% rename from apps/arr/radarr/radarr-deployment.yaml rename to apps/arr/radarr/deployment.yaml diff --git a/apps/arr/radarr/radarr-ingress.yaml b/apps/arr/radarr/ingress.yaml similarity index 90% rename from apps/arr/radarr/radarr-ingress.yaml rename to apps/arr/radarr/ingress.yaml index a4003d1..fafc3a1 100644 --- a/apps/arr/radarr/radarr-ingress.yaml +++ b/apps/arr/radarr/ingress.yaml @@ -19,4 +19,4 @@ spec: tls: - hosts: - radarr.jpcit.co.za - secretName: widlcard-jpcit-coza-tls + secretName: widlcard-jpcit-coza-tls diff --git a/apps/arr/radarr/kustomization.yaml b/apps/arr/radarr/kustomization.yaml index 304acc9..ba04f58 100644 --- a/apps/arr/radarr/kustomization.yaml +++ b/apps/arr/radarr/kustomization.yaml @@ -1,7 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- radarr-ingress.yaml -- radarr-service.yaml -- radarr-pvc.yaml -- radarr-deployment.yaml +- ingress.yaml +- service.yaml +- pvc.yaml +- deployment.yaml diff --git a/apps/arr/radarr/radarr-pvc.yaml b/apps/arr/radarr/pvc.yaml similarity index 100% rename from apps/arr/radarr/radarr-pvc.yaml rename to apps/arr/radarr/pvc.yaml diff --git a/apps/arr/radarr/radarr-service.yaml b/apps/arr/radarr/service.yaml similarity index 100% rename from apps/arr/radarr/radarr-service.yaml rename to apps/arr/radarr/service.yaml diff --git a/apps/arr/sonarr/sonarr-deployment.yaml b/apps/arr/sonarr/deployment.yaml similarity index 100% rename from apps/arr/sonarr/sonarr-deployment.yaml rename to apps/arr/sonarr/deployment.yaml diff --git a/apps/arr/sonarr/sonarr-ingress.yaml b/apps/arr/sonarr/ingress.yaml similarity index 100% rename from apps/arr/sonarr/sonarr-ingress.yaml rename to apps/arr/sonarr/ingress.yaml diff --git a/apps/arr/sonarr/kustomization.yaml b/apps/arr/sonarr/kustomization.yaml index bdd482d..ba04f58 100644 --- a/apps/arr/sonarr/kustomization.yaml +++ b/apps/arr/sonarr/kustomization.yaml @@ -1,7 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- sonarr-ingress.yaml -- sonarr-service.yaml -- sonarr-pvc.yaml -- sonarr-deployment.yaml +- ingress.yaml +- service.yaml +- pvc.yaml +- deployment.yaml diff --git a/apps/arr/sonarr/sonarr-pvc.yaml b/apps/arr/sonarr/pvc.yaml similarity index 100% rename from apps/arr/sonarr/sonarr-pvc.yaml rename to apps/arr/sonarr/pvc.yaml diff --git a/apps/arr/sonarr/sonarr-service.yaml b/apps/arr/sonarr/service.yaml similarity index 100% rename from apps/arr/sonarr/sonarr-service.yaml rename to apps/arr/sonarr/service.yaml