From 46b42239d1db8aaf44c7b44ae0e12428de953fda Mon Sep 17 00:00:00 2001 From: auricom Date: Thu, 17 Dec 2020 14:34:53 +0100 Subject: [PATCH] removed others resources from helmreleases templates --- cluster/data/_volumes.yaml | 39 ++++ cluster/data/bitwardenrs.yaml | 13 -- cluster/data/freshrss.yaml | 13 -- cluster/data/nextcloud.yaml | 1 - cluster/data/unifi.yaml | 16 -- cluster/development/_volumes.yaml | 39 ++++ cluster/development/drone.yaml | 13 -- cluster/development/gitea.yaml | 13 -- cluster/development/pgadmin.yaml | 13 -- cluster/longhorn-system/longhorn.yaml | 31 ---- cluster/longhorn-system/storageClass.yaml | 30 +++ cluster/media/_volumes.yaml | 171 +++++++++++++++++- cluster/media/bazarr.yaml | 13 -- cluster/media/jackett.yaml | 13 -- cluster/media/jellyfin.yaml | 20 +- cluster/media/lidarr.yaml | 13 -- cluster/media/lychee.yaml | 39 ---- cluster/media/navidrome.yaml | 13 -- cluster/media/pyload.yaml | 13 -- cluster/media/qbittorrent.yaml | 26 --- cluster/media/radarr.yaml | 19 +- cluster/media/sonarr.yaml | 13 -- .../kubernetes-dashboard-resources.yaml | 19 ++ cluster/monitoring/kubernetes-dashboard.yaml | 19 -- 24 files changed, 303 insertions(+), 309 deletions(-) create mode 100644 cluster/development/_volumes.yaml create mode 100644 cluster/longhorn-system/storageClass.yaml create mode 100644 cluster/monitoring/kubernetes-dashboard-resources.yaml diff --git a/cluster/data/_volumes.yaml b/cluster/data/_volumes.yaml index 12f5d8601..0beddae6b 100644 --- a/cluster/data/_volumes.yaml +++ b/cluster/data/_volumes.yaml @@ -24,3 +24,42 @@ spec: resources: requests: storage: 1Mi +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: bitwarden-config + namespace: data +spec: + accessModes: + - ReadWriteOnce + storageClassName: longhorn-backups + resources: + requests: + storage: 1Gi +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: freshrss-config + namespace: data +spec: + accessModes: + - ReadWriteOnce + storageClassName: longhorn-backups + resources: + requests: + storage: 1Gi +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: unifi-config + namespace: data +spec: + accessModes: + - ReadWriteOnce + storageClassName: longhorn-backups + resources: + requests: + storage: 10Gi diff --git a/cluster/data/bitwardenrs.yaml b/cluster/data/bitwardenrs.yaml index 96a5b1682..5409c1c35 100644 --- a/cluster/data/bitwardenrs.yaml +++ b/cluster/data/bitwardenrs.yaml @@ -50,16 +50,3 @@ spec: valuesFrom: - kind: ConfigMap name: helmrelease-data-bitwardenrs ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: bitwarden-config - namespace: data -spec: - accessModes: - - ReadWriteOnce - storageClassName: longhorn-backups - resources: - requests: - storage: 1Gi diff --git a/cluster/data/freshrss.yaml b/cluster/data/freshrss.yaml index 3e33d783d..51222fda7 100644 --- a/cluster/data/freshrss.yaml +++ b/cluster/data/freshrss.yaml @@ -49,16 +49,3 @@ spec: valuesFrom: - kind: ConfigMap name: helmrelease-data-freshrss ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: freshrss-config - namespace: data -spec: - accessModes: - - ReadWriteOnce - storageClassName: longhorn-backups - resources: - requests: - storage: 1Gi diff --git a/cluster/data/nextcloud.yaml b/cluster/data/nextcloud.yaml index 493b880ad..b97ea7e8f 100644 --- a/cluster/data/nextcloud.yaml +++ b/cluster/data/nextcloud.yaml @@ -50,4 +50,3 @@ spec: valuesFrom: - kind: ConfigMap name: helmrelease-data-nextcloud ---- diff --git a/cluster/data/unifi.yaml b/cluster/data/unifi.yaml index dac392b47..621fd6e85 100644 --- a/cluster/data/unifi.yaml +++ b/cluster/data/unifi.yaml @@ -63,22 +63,6 @@ spec: requests: memory: 2Gi cpu: 100m - #limits: - # memory: 2Gi - # cpu: 100m valuesFrom: - kind: ConfigMap name: helmrelease-data-unifi ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: unifi-config - namespace: data -spec: - accessModes: - - ReadWriteOnce - storageClassName: longhorn-backups - resources: - requests: - storage: 10Gi diff --git a/cluster/development/_volumes.yaml b/cluster/development/_volumes.yaml new file mode 100644 index 000000000..dbbd40f04 --- /dev/null +++ b/cluster/development/_volumes.yaml @@ -0,0 +1,39 @@ +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: drone-config + namespace: development +spec: + accessModes: + - ReadWriteOnce + storageClassName: longhorn-backups + resources: + requests: + storage: 10Gi +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: gitea-config + namespace: development +spec: + accessModes: + - ReadWriteOnce + storageClassName: longhorn-backups + resources: + requests: + storage: 15Gi +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: pgadmin-config + namespace: development +spec: + accessModes: + - ReadWriteOnce + storageClassName: longhorn-backups + resources: + requests: + storage: 5Gi diff --git a/cluster/development/drone.yaml b/cluster/development/drone.yaml index 7e9f4621d..2048f2045 100644 --- a/cluster/development/drone.yaml +++ b/cluster/development/drone.yaml @@ -29,16 +29,3 @@ spec: - kind: ConfigMap name: "helmrelease-development-drone" optional: false ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: drone-config - namespace: development -spec: - accessModes: - - ReadWriteOnce - storageClassName: longhorn-backups - resources: - requests: - storage: 10Gi \ No newline at end of file diff --git a/cluster/development/gitea.yaml b/cluster/development/gitea.yaml index 7b6768cca..cbd50db52 100644 --- a/cluster/development/gitea.yaml +++ b/cluster/development/gitea.yaml @@ -74,16 +74,3 @@ spec: valuesFrom: - kind: ConfigMap name: helmrelease-development-gitea ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: gitea-config - namespace: development -spec: - accessModes: - - ReadWriteOnce - storageClassName: longhorn-backups - resources: - requests: - storage: 15Gi diff --git a/cluster/development/pgadmin.yaml b/cluster/development/pgadmin.yaml index 9e7b3f5e8..2a7197534 100644 --- a/cluster/development/pgadmin.yaml +++ b/cluster/development/pgadmin.yaml @@ -36,16 +36,3 @@ spec: valuesFrom: - kind: ConfigMap name: "helmrelease-development-pgadmin" ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: pgadmin-config - namespace: development -spec: - accessModes: - - ReadWriteOnce - storageClassName: longhorn-backups - resources: - requests: - storage: 5Gi diff --git a/cluster/longhorn-system/longhorn.yaml b/cluster/longhorn-system/longhorn.yaml index 91e0e479e..6a9dd52db 100644 --- a/cluster/longhorn-system/longhorn.yaml +++ b/cluster/longhorn-system/longhorn.yaml @@ -34,40 +34,9 @@ spec: disableSchedulingOnCordonedNode: true replicaZoneSoftAntiAffinity: true volumeAttachmentRecoveryPolicy: wait - #mkfsExt4Parameters: csi: kubeletRootDir: /var/lib/kubelet tls: true valuesFrom: - kind: ConfigMap name: helmrelease-longhorn-system-longhorn ---- -kind: StorageClass -apiVersion: storage.k8s.io/v1 -metadata: - name: longhorn-hdd -provisioner: driver.longhorn.io -allowVolumeExpansion: true -parameters: - numberOfReplicas: "1" - staleReplicaTimeout: "2880" - fromBackup: "" - diskSelector: "hdd,slow" - nodeSelector: "storage,slow" ---- -kind: StorageClass -apiVersion: storage.k8s.io/v1 -metadata: - name: longhorn-backups -provisioner: driver.longhorn.io -allowVolumeExpansion: true -reclaimPolicy: Retain -parameters: - numberOfReplicas: "3" - staleReplicaTimeout: "2880" - fromBackup: "" - diskSelector: "ssd,fast" - nodeSelector: "storage,fast" - recurringJobs: - '[{"name":"backup", "task":"backup", "cron":"30 23 * * *", "retain":1, - "labels": {"interval":"daily"}}]' \ No newline at end of file diff --git a/cluster/longhorn-system/storageClass.yaml b/cluster/longhorn-system/storageClass.yaml new file mode 100644 index 000000000..4986c02ea --- /dev/null +++ b/cluster/longhorn-system/storageClass.yaml @@ -0,0 +1,30 @@ +--- +kind: StorageClass +apiVersion: storage.k8s.io/v1 +metadata: + name: longhorn-hdd +provisioner: driver.longhorn.io +allowVolumeExpansion: true +parameters: + numberOfReplicas: "1" + staleReplicaTimeout: "2880" + fromBackup: "" + diskSelector: "hdd,slow" + nodeSelector: "storage,slow" +--- +kind: StorageClass +apiVersion: storage.k8s.io/v1 +metadata: + name: longhorn-backups +provisioner: driver.longhorn.io +allowVolumeExpansion: true +reclaimPolicy: Retain +parameters: + numberOfReplicas: "3" + staleReplicaTimeout: "2880" + fromBackup: "" + diskSelector: "ssd,fast" + nodeSelector: "storage,fast" + recurringJobs: + '[{"name":"backup", "task":"backup", "cron":"30 23 * * *", "retain":1, + "labels": {"interval":"daily"}}]' diff --git a/cluster/media/_volumes.yaml b/cluster/media/_volumes.yaml index 299c1503e..5b9a0f42a 100644 --- a/cluster/media/_volumes.yaml +++ b/cluster/media/_volumes.yaml @@ -49,4 +49,173 @@ spec: storageClassName: nfs-photo resources: requests: - storage: 1Mi \ No newline at end of file + storage: 1Mi +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: bazarr-config + namespace: media +spec: + accessModes: + - ReadWriteOnce + storageClassName: longhorn-backups + resources: + requests: + storage: 5Gi +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: jackett-config + namespace: media +spec: + accessModes: + - ReadWriteOnce + storageClassName: longhorn-backups + resources: + requests: + storage: 1Gi +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: jellyfin-config + namespace: media +spec: + accessModes: + - ReadWriteOnce + storageClassName: longhorn-backups + resources: + requests: + storage: 20Gi +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: lidarr-config + namespace: media +spec: + accessModes: + - ReadWriteOnce + storageClassName: longhorn-backups + resources: + requests: + storage: 5Gi +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: lychee-config + namespace: media +spec: + accessModes: + - ReadWriteOnce + storageClassName: longhorn-backups + resources: + requests: + storage: 1Gi +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: lychee-uploads + namespace: media +spec: + accessModes: + - ReadWriteOnce + storageClassName: longhorn-backups + resources: + requests: + storage: 50Gi +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: lychee-sym + namespace: media +spec: + accessModes: + - ReadWriteOnce + storageClassName: longhorn-backups + resources: + requests: + storage: 1Gi +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: navidrome-config + namespace: media +spec: + accessModes: + - ReadWriteOnce + storageClassName: longhorn-backups + resources: + requests: + storage: 1Gi +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: pyload-config + namespace: media +spec: + accessModes: + - ReadWriteOnce + storageClassName: longhorn-backups + resources: + requests: + storage: 1Gi +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: qbittorrent-config + namespace: media +spec: + accessModes: + - ReadWriteOnce + storageClassName: longhorn-backups + resources: + requests: + storage: 1Gi +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: qbittorrent-downloads + namespace: media +spec: + accessModes: + - ReadWriteOnce + storageClassName: longhorn-hdd + resources: + requests: + storage: 800Gi +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: radarr-config + namespace: media +spec: + accessModes: + - ReadWriteOnce + storageClassName: longhorn-backups + resources: + requests: + storage: 5Gi +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: sonarr-config + namespace: media +spec: + accessModes: + - ReadWriteOnce + storageClassName: longhorn-backups + resources: + requests: + storage: 5Gi diff --git a/cluster/media/bazarr.yaml b/cluster/media/bazarr.yaml index fab75f035..646298ded 100644 --- a/cluster/media/bazarr.yaml +++ b/cluster/media/bazarr.yaml @@ -52,16 +52,3 @@ spec: valuesFrom: - kind: ConfigMap name: helmrelease-media-bazarr ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: bazarr-config - namespace: media -spec: - accessModes: - - ReadWriteOnce - storageClassName: longhorn-backups - resources: - requests: - storage: 5Gi diff --git a/cluster/media/jackett.yaml b/cluster/media/jackett.yaml index 49f3114d4..7fb5ef336 100644 --- a/cluster/media/jackett.yaml +++ b/cluster/media/jackett.yaml @@ -45,16 +45,3 @@ spec: valuesFrom: - kind: ConfigMap name: helmrelease-media-jackett ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: jackett-config - namespace: media -spec: - accessModes: - - ReadWriteOnce - storageClassName: longhorn-backups - resources: - requests: - storage: 1Gi diff --git a/cluster/media/jellyfin.yaml b/cluster/media/jellyfin.yaml index 4975a5822..a9d50b25d 100644 --- a/cluster/media/jellyfin.yaml +++ b/cluster/media/jellyfin.yaml @@ -24,6 +24,9 @@ spec: strategy: type: Recreate service: + annotations: + prometheus.io/probe: "true" + prometheus.io/protocol: http port: port: 8096 persistence: @@ -47,10 +50,6 @@ spec: - name: nfs-photo persistentVolumeClaim: claimName: nfs-photo - service: - annotations: - prometheus.io/probe: "true" - prometheus.io/protocol: http resources: requests: memory: 4Gi @@ -58,16 +57,3 @@ spec: valuesFrom: - kind: ConfigMap name: helmrelease-media-jellyfin ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: jellyfin-config - namespace: media -spec: - accessModes: - - ReadWriteOnce - storageClassName: longhorn-backups - resources: - requests: - storage: 20Gi diff --git a/cluster/media/lidarr.yaml b/cluster/media/lidarr.yaml index 7149c5ad9..593dc3736 100644 --- a/cluster/media/lidarr.yaml +++ b/cluster/media/lidarr.yaml @@ -66,16 +66,3 @@ spec: valuesFrom: - kind: ConfigMap name: helmrelease-media-lidarr ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: lidarr-config - namespace: media -spec: - accessModes: - - ReadWriteOnce - storageClassName: longhorn-backups - resources: - requests: - storage: 5Gi diff --git a/cluster/media/lychee.yaml b/cluster/media/lychee.yaml index 6f20b449b..565141298 100644 --- a/cluster/media/lychee.yaml +++ b/cluster/media/lychee.yaml @@ -56,42 +56,3 @@ spec: valuesFrom: - kind: ConfigMap name: helmrelease-media-lychee ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: lychee-config - namespace: media -spec: - accessModes: - - ReadWriteOnce - storageClassName: longhorn-backups - resources: - requests: - storage: 1Gi ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: lychee-uploads - namespace: media -spec: - accessModes: - - ReadWriteOnce - storageClassName: longhorn-backups - resources: - requests: - storage: 50Gi ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: lychee-sym - namespace: media -spec: - accessModes: - - ReadWriteOnce - storageClassName: longhorn-backups - resources: - requests: - storage: 1Gi diff --git a/cluster/media/navidrome.yaml b/cluster/media/navidrome.yaml index 733495892..2195406fa 100644 --- a/cluster/media/navidrome.yaml +++ b/cluster/media/navidrome.yaml @@ -51,16 +51,3 @@ spec: valuesFrom: - kind: ConfigMap name: helmrelease-media-navidrome ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: navidrome-config - namespace: media -spec: - accessModes: - - ReadWriteOnce - storageClassName: longhorn-backups - resources: - requests: - storage: 1Gi diff --git a/cluster/media/pyload.yaml b/cluster/media/pyload.yaml index 954ad41d9..c7d58f52f 100644 --- a/cluster/media/pyload.yaml +++ b/cluster/media/pyload.yaml @@ -57,16 +57,3 @@ spec: valuesFrom: - kind: ConfigMap name: helmrelease-media-pyload ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: pyload-config - namespace: media -spec: - accessModes: - - ReadWriteOnce - storageClassName: longhorn-backups - resources: - requests: - storage: 1Gi \ No newline at end of file diff --git a/cluster/media/qbittorrent.yaml b/cluster/media/qbittorrent.yaml index 25be3310d..e99d2f50a 100644 --- a/cluster/media/qbittorrent.yaml +++ b/cluster/media/qbittorrent.yaml @@ -79,29 +79,3 @@ spec: valuesFrom: - kind: ConfigMap name: helmrelease-media-qbittorrent ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: qbittorrent-config - namespace: media -spec: - accessModes: - - ReadWriteOnce - storageClassName: longhorn-backups - resources: - requests: - storage: 1Gi ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: qbittorrent-downloads - namespace: media -spec: - accessModes: - - ReadWriteOnce - storageClassName: longhorn-hdd - resources: - requests: - storage: 800Gi diff --git a/cluster/media/radarr.yaml b/cluster/media/radarr.yaml index 48c95089c..2be673590 100644 --- a/cluster/media/radarr.yaml +++ b/cluster/media/radarr.yaml @@ -63,19 +63,6 @@ spec: operator: In values: - k3os-worker3 - #valuesFrom: - #- kind: ConfigMap - # name: helmrelease-media-radarr ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: radarr-config - namespace: media -spec: - accessModes: - - ReadWriteOnce - storageClassName: longhorn-backups - resources: - requests: - storage: 5Gi + valuesFrom: + - kind: ConfigMap + name: helmrelease-media-radarr diff --git a/cluster/media/sonarr.yaml b/cluster/media/sonarr.yaml index 5a39e3174..9f98b0e3a 100644 --- a/cluster/media/sonarr.yaml +++ b/cluster/media/sonarr.yaml @@ -66,16 +66,3 @@ spec: valuesFrom: - kind: ConfigMap name: helmrelease-media-sonarr ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: sonarr-config - namespace: media -spec: - accessModes: - - ReadWriteOnce - storageClassName: longhorn-backups - resources: - requests: - storage: 5Gi diff --git a/cluster/monitoring/kubernetes-dashboard-resources.yaml b/cluster/monitoring/kubernetes-dashboard-resources.yaml new file mode 100644 index 000000000..46aa4828c --- /dev/null +++ b/cluster/monitoring/kubernetes-dashboard-resources.yaml @@ -0,0 +1,19 @@ +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: admin-user + namespace: monitoring +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: admin-user +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: cluster-admin +subjects: +- kind: ServiceAccount + name: admin-user + namespace: monitoring diff --git a/cluster/monitoring/kubernetes-dashboard.yaml b/cluster/monitoring/kubernetes-dashboard.yaml index 7703fc732..7845704a2 100644 --- a/cluster/monitoring/kubernetes-dashboard.yaml +++ b/cluster/monitoring/kubernetes-dashboard.yaml @@ -25,22 +25,3 @@ spec: - kind: ConfigMap name: "helmrelease-monitoring-kubernetes-dashboard" optional: false ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: admin-user - namespace: monitoring ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: admin-user -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: cluster-admin -subjects: -- kind: ServiceAccount - name: admin-user - namespace: monitoring