diff --git a/charts/sorcerer/prod/pv.yaml b/charts/sorcerer/prod/pv.yaml index 31a9b37d..5e47eea4 100644 --- a/charts/sorcerer/prod/pv.yaml +++ b/charts/sorcerer/prod/pv.yaml @@ -1,41 +1,40 @@ -apiVersion: v1 -kind: PersistentVolume -metadata: - name: pv-prod-oceanbox-archives -spec: - accessModes: - - ReadWriteMany - capacity: - storage: 300T - mountOptions: - - vers=4.2 - - rdma - - soft - nfs: - path: /data/archives - server: 10.255.243.80 - persistentVolumeReclaimPolicy: Retain - volumeMode: Filesystem ---- # apiVersion: v1 # kind: PersistentVolume # metadata: -# name: pv-oceanbox-archives-local +# name: pv-prod-oceanbox-archives # spec: # accessModes: # - ReadWriteMany # capacity: # storage: 300T -# local: +# mountOptions: +# - vers=4.2 +# - rdma +# - soft +# nfs: # path: /data/archives +# server: 10.255.243.80 # persistentVolumeReclaimPolicy: Retain # volumeMode: Filesystem -# nodeAffinity: -# required: -# nodeSelectorTerms: -# - matchExpressions: -# - key: kubernetes.io/hostname -# operator: In -# values: -# - nfs0.cluster.local - +--- +apiVersion: v1 +kind: PersistentVolume +metadata: + name: pv-prod-backup-archives +spec: + accessModes: + - ReadWriteMany + capacity: + storage: 400T + local: + path: /backup/archives + persistentVolumeReclaimPolicy: Retain + volumeMode: Filesystem + nodeAffinity: + required: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/hostname + operator: In + values: + - fs2.cluster.local diff --git a/charts/sorcerer/prod/pvc.yaml b/charts/sorcerer/prod/pvc.yaml index fb8e5f5b..e219d6d0 100644 --- a/charts/sorcerer/prod/pvc.yaml +++ b/charts/sorcerer/prod/pvc.yaml @@ -1,18 +1,32 @@ +# apiVersion: v1 +# kind: PersistentVolumeClaim +# metadata: +# name: prod-oceanbox-archives +# spec: +# accessModes: +# - ReadWriteMany +# resources: +# requests: +# storage: 300T +# storageClassName: "" +# volumeMode: Filesystem +# volumeName: pv-prod-oceanbox-archives +# status: +# accessModes: +# - ReadWriteMany +# capacity: +# storage: 300T +--- apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: prod-oceanbox-archives + name: prod-oceanbox-backup-archives spec: accessModes: - ReadWriteMany resources: requests: - storage: 300T + storage: 400T storageClassName: "" volumeMode: Filesystem - volumeName: pv-prod-oceanbox-archives -status: - accessModes: - - ReadWriteMany - capacity: - storage: 300T + volumeName: pv-prod-backup-archives diff --git a/charts/sorcerer/staging/pv.yaml b/charts/sorcerer/staging/pv.yaml index ef455892..4eaa7130 100644 --- a/charts/sorcerer/staging/pv.yaml +++ b/charts/sorcerer/staging/pv.yaml @@ -1,41 +1,41 @@ -apiVersion: v1 -kind: PersistentVolume -metadata: - name: pv-staging-oceanbox-archives -spec: - accessModes: - - ReadWriteMany - capacity: - storage: 300T - mountOptions: - - vers=4.2 - - rdma - - soft - nfs: - path: /data/archives - server: 10.255.243.80 - persistentVolumeReclaimPolicy: Retain - volumeMode: Filesystem ---- # apiVersion: v1 # kind: PersistentVolume # metadata: -# name: pv-oceanbox-archives-local +# name: pv-staging-oceanbox-archives # spec: # accessModes: # - ReadWriteMany # capacity: # storage: 300T -# local: +# mountOptions: +# - vers=4.2 +# - rdma +# - soft +# nfs: # path: /data/archives +# server: 10.255.243.80 # persistentVolumeReclaimPolicy: Retain # volumeMode: Filesystem -# nodeAffinity: -# required: -# nodeSelectorTerms: -# - matchExpressions: -# - key: kubernetes.io/hostname -# operator: In -# values: -# - nfs0.cluster.local +--- +apiVersion: v1 +kind: PersistentVolume +metadata: + name: pv-staging-backup-archives +spec: + accessModes: + - ReadWriteMany + capacity: + storage: 400T + local: + path: /backup/archives + persistentVolumeReclaimPolicy: Retain + volumeMode: Filesystem + nodeAffinity: + required: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/hostname + operator: In + values: + - fs2.cluster.local diff --git a/charts/sorcerer/staging/pvc.yaml b/charts/sorcerer/staging/pvc.yaml index 31940900..ccf4510d 100644 --- a/charts/sorcerer/staging/pvc.yaml +++ b/charts/sorcerer/staging/pvc.yaml @@ -1,18 +1,32 @@ +# apiVersion: v1 +# kind: PersistentVolumeClaim +# metadata: +# name: staging-oceanbox-archives +# spec: +# accessModes: +# - ReadWriteMany +# resources: +# requests: +# storage: 300T +# storageClassName: "" +# volumeMode: Filesystem +# volumeName: pv-staging-oceanbox-archives +# status: +# accessModes: +# - ReadWriteMany +# capacity: +# storage: 300T +# --- apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: staging-oceanbox-archives + name: staging-oceanbox-backup-archives spec: accessModes: - ReadWriteMany resources: requests: - storage: 300T + storage: 400T storageClassName: "" volumeMode: Filesystem - volumeName: pv-staging-oceanbox-archives -status: - accessModes: - - ReadWriteMany - capacity: - storage: 300T + volumeName: pv-staging-backup-archives diff --git a/charts/sorcerer/values-prod.yaml b/charts/sorcerer/values-prod.yaml index 6cce4970..aa919831 100644 --- a/charts/sorcerer/values-prod.yaml +++ b/charts/sorcerer/values-prod.yaml @@ -17,6 +17,8 @@ persistence: nodeSelector: topology.kubernetes.io/group: srv + kubernetes.io/hostname: fs2 + # node-role.kubernetes.io/worker: c1-1 tolerations: - key: workload diff --git a/charts/sorcerer/values-staging.yaml b/charts/sorcerer/values-staging.yaml index ee1b7e49..6c13b2b8 100644 --- a/charts/sorcerer/values-staging.yaml +++ b/charts/sorcerer/values-staging.yaml @@ -17,6 +17,8 @@ persistence: existingClaim: staging-oceanbox-archives nodeSelector: topology.kubernetes.io/group: srv + kubernetes.io/hostname: fs2 + # node-role.kubernetes.io/worker: c1-1 tolerations: - key: workload operator: Equal