From 75fdad3ff9f2486b096efc26427019cf77fddfa6 Mon Sep 17 00:00:00 2001
From: Vladimir Kozhukalov <kozhukalov@gmail.com>
Date: Thu, 12 Sep 2024 13:45:39 -0500
Subject: [PATCH] Run utils-defragOSDs.sh in ceph-osd-default container

The Ceph defragosds cronjob script used to
connect to OSD pods not explicitly specifying
the ceph-osd-default container and eventually
tried to run the defrag script in the log-runner
container where the defrag script is mounted with
0644 permissions and shell fails to run it.

Change-Id: I4ffc6653070dbbc6f0766b278acf0ebe2b4ae1e1
---
 ceph-client/Chart.yaml                             | 2 +-
 ceph-client/templates/bin/utils/_defragOSDs.sh.tpl | 2 +-
 releasenotes/notes/ceph-client.yaml                | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ceph-client/Chart.yaml b/ceph-client/Chart.yaml
index 5178b7ac17..4989f94912 100644
--- a/ceph-client/Chart.yaml
+++ b/ceph-client/Chart.yaml
@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph Client
 name: ceph-client
-version: 0.1.51
+version: 0.1.52
 home: https://github.com/ceph/ceph-client
 ...
diff --git a/ceph-client/templates/bin/utils/_defragOSDs.sh.tpl b/ceph-client/templates/bin/utils/_defragOSDs.sh.tpl
index d796e9a8cd..68d0946643 100644
--- a/ceph-client/templates/bin/utils/_defragOSDs.sh.tpl
+++ b/ceph-client/templates/bin/utils/_defragOSDs.sh.tpl
@@ -21,7 +21,7 @@ PODS=$(kubectl get pods --namespace=${NAMESPACE} \
   '--output=jsonpath={range .items[*]}{.metadata.name}{"\n"}{end}')
 
 for POD in ${PODS}; do
-  kubectl exec -t ${POD} --namespace=${NAMESPACE} -- \
+  kubectl exec -t ${POD} -c ceph-osd-default --namespace=${NAMESPACE} -- \
   sh -c -e "/tmp/utils-defragOSDs.sh"
 done
 
diff --git a/releasenotes/notes/ceph-client.yaml b/releasenotes/notes/ceph-client.yaml
index e7cec9d08e..27a165f2fe 100644
--- a/releasenotes/notes/ceph-client.yaml
+++ b/releasenotes/notes/ceph-client.yaml
@@ -52,4 +52,5 @@ ceph-client:
   - 0.1.49 Update Ceph images to Jammy and Reef 18.2.1
   - 0.1.50 Update Ceph images to patched 18.2.2 and restore debian-reef repo
   - 0.1.51 Use quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal by default
+  - 0.1.52 Run utils-defragOSDs.sh in ceph-osd-default container
 ...