From c64b997538caceca2c1fcb2fc5944fe23e3b390f Mon Sep 17 00:00:00 2001 From: Edward Cheng Date: Fri, 19 Jul 2024 00:06:40 +1000 Subject: [PATCH 1/2] fix namespace discrepancy --- infrastructures/postgresql/env/k3s-cluster/values.yaml | 6 +++++- .../env/k3s-cluster/templates/postgresql-primary-pv.yaml | 2 +- .../env/k3s-cluster/templates/postgresql-primary-pvc.yaml | 2 +- .../env/k3s-cluster/templates/postgresql-replica-pv.yaml | 2 +- .../env/k3s-cluster/templates/postgresql-replica-pvc.yaml | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/infrastructures/postgresql/env/k3s-cluster/values.yaml b/infrastructures/postgresql/env/k3s-cluster/values.yaml index 5f2148d..68325db 100644 --- a/infrastructures/postgresql/env/k3s-cluster/values.yaml +++ b/infrastructures/postgresql/env/k3s-cluster/values.yaml @@ -26,6 +26,8 @@ primary: selector: matchLabels: name: postgresql-primary-pvc + persistentVolumeClaimRetentionPolicy: + enabled: true readReplicas: name: "replica" podSecurityContext: @@ -43,4 +45,6 @@ readReplicas: existingClaim: postgresql-replica-pvc selector: matchLabels: - name: postgresql-replica-pvc \ No newline at end of file + name: postgresql-replica-pvc + persistentVolumeClaimRetentionPolicy: + enabled: true \ No newline at end of file diff --git a/resources/app-volumes/env/k3s-cluster/templates/postgresql-primary-pv.yaml b/resources/app-volumes/env/k3s-cluster/templates/postgresql-primary-pv.yaml index 03dd795..49daad8 100644 --- a/resources/app-volumes/env/k3s-cluster/templates/postgresql-primary-pv.yaml +++ b/resources/app-volumes/env/k3s-cluster/templates/postgresql-primary-pv.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: PersistentVolume metadata: name: postgresql-primary-pv - namespace: postgresql + namespace: argocd labels: type: local spec: diff --git a/resources/app-volumes/env/k3s-cluster/templates/postgresql-primary-pvc.yaml b/resources/app-volumes/env/k3s-cluster/templates/postgresql-primary-pvc.yaml index d95e66d..1ee26f6 100644 --- a/resources/app-volumes/env/k3s-cluster/templates/postgresql-primary-pvc.yaml +++ b/resources/app-volumes/env/k3s-cluster/templates/postgresql-primary-pvc.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: name: postgresql-primary-pvc - namespace: postgresql + namespace: argocd labels: name: postgresql-primary-pvc spec: diff --git a/resources/app-volumes/env/k3s-cluster/templates/postgresql-replica-pv.yaml b/resources/app-volumes/env/k3s-cluster/templates/postgresql-replica-pv.yaml index b59866e..f8c5aea 100644 --- a/resources/app-volumes/env/k3s-cluster/templates/postgresql-replica-pv.yaml +++ b/resources/app-volumes/env/k3s-cluster/templates/postgresql-replica-pv.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: PersistentVolume metadata: name: postgresql-replica-pv - namespace: flux-system + namespace: argocd labels: type: local spec: diff --git a/resources/app-volumes/env/k3s-cluster/templates/postgresql-replica-pvc.yaml b/resources/app-volumes/env/k3s-cluster/templates/postgresql-replica-pvc.yaml index 5953fb6..c9f60cd 100644 --- a/resources/app-volumes/env/k3s-cluster/templates/postgresql-replica-pvc.yaml +++ b/resources/app-volumes/env/k3s-cluster/templates/postgresql-replica-pvc.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: name: postgresql-replica-pvc - namespace: postgresql + namespace: argocd labels: name: postgresql-replica-pvc spec: From de4e85cb46b43db6eb02d10307e51dc51ab33c70 Mon Sep 17 00:00:00 2001 From: Edward Cheng Date: Fri, 19 Jul 2024 00:10:40 +1000 Subject: [PATCH 2/2] add PVs and PVCs for Redis --- .../templates/postgresql-replica-pv.yaml | 2 +- .../templates/redis-master-pv.yaml | 30 +++++++++++++++++++ .../templates/redis-master-pvc.yaml | 15 ++++++++++ .../templates/redis-replica-pv.yaml | 30 +++++++++++++++++++ .../templates/redis-replica-pvc.yaml | 15 ++++++++++ 5 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 resources/app-volumes/env/k3s-cluster/templates/redis-master-pv.yaml create mode 100644 resources/app-volumes/env/k3s-cluster/templates/redis-master-pvc.yaml create mode 100644 resources/app-volumes/env/k3s-cluster/templates/redis-replica-pv.yaml create mode 100644 resources/app-volumes/env/k3s-cluster/templates/redis-replica-pvc.yaml diff --git a/resources/app-volumes/env/k3s-cluster/templates/postgresql-replica-pv.yaml b/resources/app-volumes/env/k3s-cluster/templates/postgresql-replica-pv.yaml index f8c5aea..52f489a 100644 --- a/resources/app-volumes/env/k3s-cluster/templates/postgresql-replica-pv.yaml +++ b/resources/app-volumes/env/k3s-cluster/templates/postgresql-replica-pv.yaml @@ -27,4 +27,4 @@ spec: - key: kubernetes.io/hostname operator: In values: - - rpi5-cluster-node-2 \ No newline at end of file + - k3s-cluster-node-2 \ No newline at end of file diff --git a/resources/app-volumes/env/k3s-cluster/templates/redis-master-pv.yaml b/resources/app-volumes/env/k3s-cluster/templates/redis-master-pv.yaml new file mode 100644 index 0000000..9ee2001 --- /dev/null +++ b/resources/app-volumes/env/k3s-cluster/templates/redis-master-pv.yaml @@ -0,0 +1,30 @@ +apiVersion: v1 +kind: PersistentVolume +metadata: + name: redis-master-pv + namespace: redis + labels: + type: local +spec: + storageClassName: local-path + volumeMode: Filesystem + capacity: + storage: 8Gi + accessModes: + - ReadWriteOnce + persistentVolumeReclaimPolicy: Retain + local: + path: "/mnt/nfs/AppData/redis/master" + claimRef: + apiVersion: v1 + kind: PersistentVolumeClaim + name: redis-master-pvc + namespace: redis + nodeAffinity: + required: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/hostname + operator: In + values: + - k3s-cluster-node-2 \ No newline at end of file diff --git a/resources/app-volumes/env/k3s-cluster/templates/redis-master-pvc.yaml b/resources/app-volumes/env/k3s-cluster/templates/redis-master-pvc.yaml new file mode 100644 index 0000000..c4a14d3 --- /dev/null +++ b/resources/app-volumes/env/k3s-cluster/templates/redis-master-pvc.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: redis-master-pvc + namespace: redis + labels: + name: redis-master-pvc +spec: + storageClassName: local-path + volumeMode: Filesystem + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 8Gi \ No newline at end of file diff --git a/resources/app-volumes/env/k3s-cluster/templates/redis-replica-pv.yaml b/resources/app-volumes/env/k3s-cluster/templates/redis-replica-pv.yaml new file mode 100644 index 0000000..ed9eb0d --- /dev/null +++ b/resources/app-volumes/env/k3s-cluster/templates/redis-replica-pv.yaml @@ -0,0 +1,30 @@ +apiVersion: v1 +kind: PersistentVolume +metadata: + name: redis-replica-pv + namespace: redis + labels: + type: local +spec: + storageClassName: local-path + volumeMode: Filesystem + capacity: + storage: 8Gi + accessModes: + - ReadWriteOnce + persistentVolumeReclaimPolicy: Retain + local: + path: "/mnt/nfs/AppData/redis/replica" + claimRef: + apiVersion: v1 + kind: PersistentVolumeClaim + name: redis-replica-pvc + namespace: redis + nodeAffinity: + required: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/hostname + operator: In + values: + - k3s-cluster-node-2 \ No newline at end of file diff --git a/resources/app-volumes/env/k3s-cluster/templates/redis-replica-pvc.yaml b/resources/app-volumes/env/k3s-cluster/templates/redis-replica-pvc.yaml new file mode 100644 index 0000000..c4c1c95 --- /dev/null +++ b/resources/app-volumes/env/k3s-cluster/templates/redis-replica-pvc.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: redis-replica-pvc + namespace: redis + labels: + name: redis-replica-pvc +spec: + storageClassName: local-path + volumeMode: Filesystem + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 8Gi \ No newline at end of file