From f61292c89004dfab6ce160b5b493ee4add0e8bd0 Mon Sep 17 00:00:00 2001 From: Harshad Reddy Nalla Date: Mon, 26 Sep 2022 16:27:42 -0400 Subject: [PATCH] Use emptydir for db pg_dump Signed-off-by: Harshad Reddy Nalla --- graph-backup-job/base/cronjob.yaml | 12 ++++++-- .../overlays/moc-prod/kustomization.yaml | 12 ++++++++ .../overlays/ocp4-stage/kustomization.yaml | 28 ++++--------------- graph-backup-job/overlays/ocp4-stage/pvc.yaml | 12 -------- 4 files changed, 28 insertions(+), 36 deletions(-) delete mode 100644 graph-backup-job/overlays/ocp4-stage/pvc.yaml diff --git a/graph-backup-job/base/cronjob.yaml b/graph-backup-job/base/cronjob.yaml index bc3061f9c..4050acb69 100644 --- a/graph-backup-job/base/cronjob.yaml +++ b/graph-backup-job/base/cronjob.yaml @@ -23,7 +23,9 @@ spec: containers: - image: graph-backup-job:latest name: graph-backup - volumeMounts: [] + volumeMounts: + - name: postgresql-data + mountPath: "/var/lib/pgsql" env: - name: THOTH_DEPLOYMENT_NAME valueFrom: @@ -94,13 +96,17 @@ spec: secretKeyRef: name: postgresql key: database-name + - name: THOTH_DATA_DUMP_PATH + value: "/var/lib/pgsql/pg_dump.sql" resources: requests: memory: "1Gi" cpu: "1" + ephemeral-storage: "1Gi" limits: memory: "1Gi" cpu: "1" + ephemeral-storage: "1Gi" livenessProbe: tcpSocket: port: 80 @@ -108,4 +114,6 @@ spec: failureThreshold: 1 periodSeconds: 10 restartPolicy: OnFailure - volumes: [] + volumes: + - name: "postgresql-data" + emptyDir: {} diff --git a/graph-backup-job/overlays/moc-prod/kustomization.yaml b/graph-backup-job/overlays/moc-prod/kustomization.yaml index 7c59355da..47d036d14 100644 --- a/graph-backup-job/overlays/moc-prod/kustomization.yaml +++ b/graph-backup-job/overlays/moc-prod/kustomization.yaml @@ -20,3 +20,15 @@ patches: version: v1 kind: Job annotationSelector: "operation=chat-notification" + - patch: |- + - op: replace + path: "/spec/jobTemplate/spec/template/spec/containers/0/resources/requests/ephemeral-storage" + value: "20Gi" + - op: replace + path: "/spec/jobTemplate/spec/template/spec/containers/0/resources/limits/ephemeral-storage" + value: "20Gi" + target: + group: batch + version: v1beta1 + kind: CronJob + name: graph-backup diff --git a/graph-backup-job/overlays/ocp4-stage/kustomization.yaml b/graph-backup-job/overlays/ocp4-stage/kustomization.yaml index 46391b9bb..4f2d334fe 100644 --- a/graph-backup-job/overlays/ocp4-stage/kustomization.yaml +++ b/graph-backup-job/overlays/ocp4-stage/kustomization.yaml @@ -3,7 +3,6 @@ kind: Kustomization resources: - ../../base - thoth-notification.yaml - - pvc.yaml images: - name: graph-backup-job newName: image-registry.openshift-image-registry.svc:5000/thoth-graph-stage/graph-backup-job @@ -22,27 +21,12 @@ patches: kind: Job annotationSelector: "operation=chat-notification" - patch: |- - - op: add - path: "/spec/jobTemplate/spec/template/spec/containers/0/env/-1" - value: {"name": "THOTH_DATA_DUMP_PATH", "value": "/var/lib/pgsql/pg_dump.sql"} - target: - group: batch - version: v1beta1 - kind: CronJob - name: graph-backup - - patch: |- - - op: add - path: "/spec/jobTemplate/spec/template/spec/containers/0/volumeMounts/-1" - value: {"name": "postgresql-data","mountPath": "/var/lib/pgsql"} - target: - group: batch - version: v1beta1 - kind: CronJob - name: graph-backup - - patch: |- - - op: add - path: "/spec/jobTemplate/spec/template/spec/volumes/-1" - value: {"name": "postgresql-data","persistentVolumeClaim":{"claimName": "dbbackup"}} + - op: replace + path: "/spec/jobTemplate/spec/template/spec/containers/0/resources/requests/ephemeral-storage" + value: "20Gi" + - op: replace + path: "/spec/jobTemplate/spec/template/spec/containers/0/resources/limits/ephemeral-storage" + value: "20Gi" target: group: batch version: v1beta1 diff --git a/graph-backup-job/overlays/ocp4-stage/pvc.yaml b/graph-backup-job/overlays/ocp4-stage/pvc.yaml deleted file mode 100644 index a5eac8b9b..000000000 --- a/graph-backup-job/overlays/ocp4-stage/pvc.yaml +++ /dev/null @@ -1,12 +0,0 @@ -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: dbbackup -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 20Gi - storageClassName: standard - volumeMode: Filesystem