From 56ae7ae52c41ca3e8ef0b3ed463d9180122c3883 Mon Sep 17 00:00:00 2001
From: "Ritchie, Frank (fr801x)" <fr801x@att.com>
Date: Thu, 8 Jul 2021 13:45:19 -0500
Subject: [PATCH] Disable RGW crash dumps

While ceph crash dumps are needed for mons and osds there is no
need for rgw.

Change-Id: I62c3c9a089d29528f79653c412fba5200fd1595e
---
 ceph-rgw/Chart.yaml                      |  2 +-
 ceph-rgw/templates/bin/_init-dirs.sh.tpl |  2 +-
 ceph-rgw/templates/deployment-rgw.yaml   | 10 ----------
 releasenotes/notes/ceph-rgw.yaml         |  1 +
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/ceph-rgw/Chart.yaml b/ceph-rgw/Chart.yaml
index d6bfd8d09..507a743da 100644
--- a/ceph-rgw/Chart.yaml
+++ b/ceph-rgw/Chart.yaml
@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph RadosGW
 name: ceph-rgw
-version: 0.1.13
+version: 0.1.14
 home: https://github.com/ceph/ceph
 ...
diff --git a/ceph-rgw/templates/bin/_init-dirs.sh.tpl b/ceph-rgw/templates/bin/_init-dirs.sh.tpl
index 8f727bcf4..9ab21097c 100644
--- a/ceph-rgw/templates/bin/_init-dirs.sh.tpl
+++ b/ceph-rgw/templates/bin/_init-dirs.sh.tpl
@@ -25,7 +25,7 @@ for keyring in ${RGW_BOOTSTRAP_KEYRING}; do
 done
 
 # Let's create the ceph directories
-for DIRECTORY in radosgw tmp crash; do
+for DIRECTORY in radosgw tmp; do
   mkdir -p "/var/lib/ceph/${DIRECTORY}"
 done
 
diff --git a/ceph-rgw/templates/deployment-rgw.yaml b/ceph-rgw/templates/deployment-rgw.yaml
index 473b4488a..94c63d35b 100644
--- a/ceph-rgw/templates/deployment-rgw.yaml
+++ b/ceph-rgw/templates/deployment-rgw.yaml
@@ -93,9 +93,6 @@ spec:
             - name: pod-var-lib-ceph
               mountPath: /var/lib/ceph
               readOnly: false
-            - name: pod-var-lib-ceph-crash
-              mountPath: /var/lib/ceph/crash
-              readOnly: false
         - name: ceph-rgw-init
 {{ tuple $envAll "ceph_rgw" | include "helm-toolkit.snippets.image" | indent 10 }}
 {{ tuple $envAll $envAll.Values.pod.resources.rgw | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
@@ -186,9 +183,6 @@ spec:
             - name: pod-var-lib-ceph
               mountPath: /var/lib/ceph
               readOnly: false
-            - name: pod-var-lib-ceph-crash
-              mountPath: /var/lib/ceph/crash
-              readOnly: false
 {{- dict "enabled" .Values.manifests.certificates "name" $tls_secret "path" "/etc/tls" | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
       volumes:
         - name: pod-tmp
@@ -208,10 +202,6 @@ spec:
             defaultMode: 0444
         - name: pod-var-lib-ceph
           emptyDir: {}
-        - name: pod-var-lib-ceph-crash
-          hostPath:
-            path: /var/lib/openstack-helm/ceph/crash
-            type: DirectoryOrCreate
         - name: ceph-bootstrap-rgw-keyring
           secret:
             secretName: {{ .Values.secrets.keyrings.rgw }}
diff --git a/releasenotes/notes/ceph-rgw.yaml b/releasenotes/notes/ceph-rgw.yaml
index 2fef9348d..e8594329c 100644
--- a/releasenotes/notes/ceph-rgw.yaml
+++ b/releasenotes/notes/ceph-rgw.yaml
@@ -14,4 +14,5 @@ ceph-rgw:
   - 0.1.11 Change s3 auth order to use local before external
   - 0.1.12 Export crash dumps when Ceph daemons crash
   - 0.1.13 Add configmap hash for keystone rgw
+  - 0.1.14 Disable crash dumps for rgw
 ...