From 7acbc5d8adb101c4012abb9c1d3b241704a8ab24 Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Tue, 20 Feb 2024 13:40:57 +0100 Subject: [PATCH] fix: separate pv:s and pvc:s for staging and prod --- charts/sorcerer/prod/kustomization.yaml | 2 + charts/sorcerer/prod/pv.yaml | 41 ++++++++++++++++++++ charts/sorcerer/{resources => prod}/pvc.yaml | 4 +- charts/sorcerer/resources/pv.yaml | 41 -------------------- charts/sorcerer/staging/kustomization.yaml | 2 + charts/sorcerer/staging/pv.yaml | 41 ++++++++++++++++++++ charts/sorcerer/staging/pvc.yaml | 18 +++++++++ 7 files changed, 106 insertions(+), 43 deletions(-) create mode 100644 charts/sorcerer/prod/pv.yaml rename charts/sorcerer/{resources => prod}/pvc.yaml (78%) delete mode 100644 charts/sorcerer/resources/pv.yaml create mode 100644 charts/sorcerer/staging/pv.yaml create mode 100644 charts/sorcerer/staging/pvc.yaml diff --git a/charts/sorcerer/prod/kustomization.yaml b/charts/sorcerer/prod/kustomization.yaml index c2d3424f..a1c3120f 100644 --- a/charts/sorcerer/prod/kustomization.yaml +++ b/charts/sorcerer/prod/kustomization.yaml @@ -14,4 +14,6 @@ patches: kind: Deployment path: deployment_patch.yaml resources: +- pv.yaml +- pvc.yaml - ../base diff --git a/charts/sorcerer/prod/pv.yaml b/charts/sorcerer/prod/pv.yaml new file mode 100644 index 00000000..31a9b37d --- /dev/null +++ b/charts/sorcerer/prod/pv.yaml @@ -0,0 +1,41 @@ +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 +# spec: +# accessModes: +# - ReadWriteMany +# capacity: +# storage: 300T +# local: +# path: /data/archives +# persistentVolumeReclaimPolicy: Retain +# volumeMode: Filesystem +# nodeAffinity: +# required: +# nodeSelectorTerms: +# - matchExpressions: +# - key: kubernetes.io/hostname +# operator: In +# values: +# - nfs0.cluster.local + diff --git a/charts/sorcerer/resources/pvc.yaml b/charts/sorcerer/prod/pvc.yaml similarity index 78% rename from charts/sorcerer/resources/pvc.yaml rename to charts/sorcerer/prod/pvc.yaml index b9130ca4..bef4bc3c 100644 --- a/charts/sorcerer/resources/pvc.yaml +++ b/charts/sorcerer/prod/pvc.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: oceanbox-archives + name: prod-oceanbox-archives spec: accessModes: - ReadWriteMany @@ -10,7 +10,7 @@ spec: storage: 100G storageClassName: "" volumeMode: Filesystem - volumeName: pv-oceanbox-archives-local + volumeName: pv-prod-0oceanbox-archives status: accessModes: - ReadWriteMany diff --git a/charts/sorcerer/resources/pv.yaml b/charts/sorcerer/resources/pv.yaml deleted file mode 100644 index e4485823..00000000 --- a/charts/sorcerer/resources/pv.yaml +++ /dev/null @@ -1,41 +0,0 @@ -apiVersion: v1 -kind: PersistentVolume -metadata: - name: pv-oceanbox-archives-nfs -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 -spec: - accessModes: - - ReadWriteMany - capacity: - storage: 300T - local: - path: /data/archives - persistentVolumeReclaimPolicy: Retain - volumeMode: Filesystem - nodeAffinity: - required: - nodeSelectorTerms: - - matchExpressions: - - key: kubernetes.io/hostname - operator: In - values: - - nfs0.cluster.local - diff --git a/charts/sorcerer/staging/kustomization.yaml b/charts/sorcerer/staging/kustomization.yaml index cd1043be..c5123134 100644 --- a/charts/sorcerer/staging/kustomization.yaml +++ b/charts/sorcerer/staging/kustomization.yaml @@ -14,4 +14,6 @@ patches: kind: Deployment path: deployment_patch.yaml resources: +- pv.yaml +- pvc.yaml - ../base diff --git a/charts/sorcerer/staging/pv.yaml b/charts/sorcerer/staging/pv.yaml new file mode 100644 index 00000000..ef455892 --- /dev/null +++ b/charts/sorcerer/staging/pv.yaml @@ -0,0 +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 +# spec: +# accessModes: +# - ReadWriteMany +# capacity: +# storage: 300T +# local: +# path: /data/archives +# persistentVolumeReclaimPolicy: Retain +# volumeMode: Filesystem +# nodeAffinity: +# required: +# nodeSelectorTerms: +# - matchExpressions: +# - key: kubernetes.io/hostname +# operator: In +# values: +# - nfs0.cluster.local + diff --git a/charts/sorcerer/staging/pvc.yaml b/charts/sorcerer/staging/pvc.yaml new file mode 100644 index 00000000..9d2ef752 --- /dev/null +++ b/charts/sorcerer/staging/pvc.yaml @@ -0,0 +1,18 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: staging-oceanbox-archives +spec: + accessModes: + - ReadWriteMany + resources: + requests: + storage: 100G + storageClassName: "" + volumeMode: Filesystem + volumeName: pv-staging-0oceanbox-archives +status: + accessModes: + - ReadWriteMany + capacity: + storage: 100G