diff --git a/jellyfin/samba.yaml b/jellyfin/samba.yaml index 6a17356..bdcfe1b 100644 --- a/jellyfin/samba.yaml +++ b/jellyfin/samba.yaml @@ -113,6 +113,8 @@ kind: PersistentVolumeClaim metadata: name: music namespace: jellyfin + labels: + velero.io/exclude-from-backup: "true" spec: accessModes: - ReadWriteMany @@ -127,6 +129,8 @@ kind: PersistentVolumeClaim metadata: name: movies namespace: jellyfin + labels: + velero.io/exclude-from-backup: "true" spec: accessModes: - ReadWriteMany @@ -141,6 +145,8 @@ kind: PersistentVolumeClaim metadata: name: tvshows namespace: jellyfin + labels: + velero.io/exclude-from-backup: "true" spec: accessModes: - ReadWriteMany diff --git a/jitsi/filesystem.yaml b/jitsi/filesystem.yaml deleted file mode 100644 index ab52a2d..0000000 --- a/jitsi/filesystem.yaml +++ /dev/null @@ -1,42 +0,0 @@ -apiVersion: ceph.rook.io/v1 -kind: CephFilesystem -metadata: - name: jitsi - namespace: rook-ceph -spec: - metadataPool: - failureDomain: host - replicated: - size: 3 - dataPools: - - name: replicated - failureDomain: host - replicated: - size: 3 - preserveFilesystemOnDelete: false - metadataServer: - activeCount: 1 - activeStandby: true - placement: - # nodeAffinity: - # requiredDuringSchedulingIgnoredDuringExecution: - # nodeSelectorTerms: - # - matchExpressions: - # - key: role - # operator: In - # values: - # - mds-node - tolerations: - - key: node-role.kubernetes.io/storage-node - operator: Exists - effect: NoSchedule - # podAffinity: - # podAntiAffinity: - # topologySpreadConstraints: - #resources: - # limits: - # cpu: "80m" - # memory: "1024Mi" - # requests: - # cpu: "500m" - # memory: "1024Mi" \ No newline at end of file diff --git a/jitsi/ingress.yaml b/jitsi/ingress.yaml index beeb23d..b776524 100644 --- a/jitsi/ingress.yaml +++ b/jitsi/ingress.yaml @@ -10,10 +10,10 @@ metadata: spec: tls: - hosts: - - jitsi.undercloud.cf + - jitsi.apps.undercloud.dev secretName: jitsi-tls rules: - - host: jitsi.undercloud.cf + - host: jitsi.apps.undercloud.dev http: paths: - path: / diff --git a/jitsi/jitsi.yaml b/jitsi/jitsi.yaml index a16db77..63a1d04 100644 --- a/jitsi/jitsi.yaml +++ b/jitsi/jitsi.yaml @@ -1,32 +1,3 @@ -apiVersion: storage.k8s.io/v1 -kind: StorageClass -metadata: - name: jitsi -# Change "rook-ceph" provisioner prefix to match the operator namespace if needed -provisioner: rook-ceph.cephfs.csi.ceph.com -parameters: - # clusterID is the namespace where the rook cluster is running - # If you change this namespace, also change the namespace below where the secret namespaces are defined - clusterID: rook-ceph - - # CephFS filesystem name into which the volume shall be created - fsName: jitsi - - # Ceph pool into which the volume shall be created - # Required for provisionVolume: "true" - pool: jitsi-replicated - - # The secrets contain Ceph admin credentials. These are generated automatically by the operator - # in the same namespace as the cluster. - csi.storage.k8s.io/provisioner-secret-name: rook-csi-cephfs-provisioner - csi.storage.k8s.io/provisioner-secret-namespace: rook-ceph - csi.storage.k8s.io/controller-expand-secret-name: rook-csi-cephfs-provisioner - csi.storage.k8s.io/controller-expand-secret-namespace: rook-ceph - csi.storage.k8s.io/node-stage-secret-name: rook-csi-cephfs-node - csi.storage.k8s.io/node-stage-secret-namespace: rook-ceph - -reclaimPolicy: Delete ---- apiVersion: v1 kind: PersistentVolumeClaim metadata: @@ -38,7 +9,7 @@ spec: resources: requests: storage: 512Mi - storageClassName: jitsi + storageClassName: cephfs-hyper --- apiVersion: apps/v1 kind: Deployment diff --git a/nextcloud/samba.yaml b/nextcloud/samba.yaml index 3d2826e..509a5a1 100644 --- a/nextcloud/samba.yaml +++ b/nextcloud/samba.yaml @@ -141,6 +141,8 @@ kind: PersistentVolumeClaim metadata: name: data namespace: nextcloud + labels: + velero.io/exclude-from-backup: "true" spec: accessModes: - ReadWriteMany @@ -155,6 +157,8 @@ kind: PersistentVolumeClaim metadata: name: music namespace: nextcloud + labels: + velero.io/exclude-from-backup: "true" spec: accessModes: - ReadWriteMany @@ -169,6 +173,8 @@ kind: PersistentVolumeClaim metadata: name: movies namespace: nextcloud + labels: + velero.io/exclude-from-backup: "true" spec: accessModes: - ReadWriteMany @@ -183,6 +189,8 @@ kind: PersistentVolumeClaim metadata: name: tvshows namespace: nextcloud + labels: + velero.io/exclude-from-backup: "true" spec: accessModes: - ReadWriteMany