From 914de65fe98643731c7bf4dc61b0e52188e7c3b9 Mon Sep 17 00:00:00 2001 From: Siteshwar Vashisht Date: Fri, 22 Mar 2024 12:17:20 +0100 Subject: [PATCH] openscanhub: add persistent storage for redis Signed-off-by: Siteshwar Vashisht --- playbooks/openshift-apps/openscanhub.yml | 4 ++++ .../files/deployment-redis-6-c9s.yml | 2 +- .../templates/pvc-var-lib-redis-data.yml | 20 +++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 roles/openshift-apps/openscanhub/templates/pvc-var-lib-redis-data.yml diff --git a/playbooks/openshift-apps/openscanhub.yml b/playbooks/openshift-apps/openscanhub.yml index 3437202682..5285211c7c 100644 --- a/playbooks/openshift-apps/openscanhub.yml +++ b/playbooks/openshift-apps/openscanhub.yml @@ -78,6 +78,10 @@ when: env == "staging" # Configurations for redis. + - role: openshift/object + app: openscanhub + template: pvc-var-lib-redis-data.yml + objectname: pvc-var-lib-redis-data - role: openshift/object app: openscanhub file: deployment-redis-6-c9s.yml diff --git a/roles/openshift-apps/openscanhub/files/deployment-redis-6-c9s.yml b/roles/openshift-apps/openscanhub/files/deployment-redis-6-c9s.yml index 3816dbcf85..6e84c23a87 100644 --- a/roles/openshift-apps/openscanhub/files/deployment-redis-6-c9s.yml +++ b/roles/openshift-apps/openscanhub/files/deployment-redis-6-c9s.yml @@ -53,7 +53,7 @@ spec: terminationMessagePolicy: File volumeMounts: - mountPath: /var/lib/redis/data - name: redis-6-c9s-1 + name: pvc-var-lib-redis-data dnsPolicy: ClusterFirst restartPolicy: Always schedulerName: default-scheduler diff --git a/roles/openshift-apps/openscanhub/templates/pvc-var-lib-redis-data.yml b/roles/openshift-apps/openscanhub/templates/pvc-var-lib-redis-data.yml new file mode 100644 index 0000000000..b369f322c1 --- /dev/null +++ b/roles/openshift-apps/openscanhub/templates/pvc-var-lib-redis-data.yml @@ -0,0 +1,20 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: pvc-var-lib-redis-data +spec: + # TODO: This name should be set when `storageClassName` is NFS + # volumeName: fedora-openscanhub-var-lib-osh-{{env_short}} + accessModes: + - ReadWriteOnce + resources: + requests: + # This should be manually expanded when production + # has gone beyond this limit. +{% if env == "staging" %} + storage: 1Gi +{% else %} + storage: 2Gi +{% endif %} + storageClassName: 'ocs-storagecluster-cephfs' + volumeMode: Filesystem