Merge pull request #17423 from rook/mergify/bp/release-1.18/pr-17420

core:remove newlines from liveness probe scripts (backport #17420)
This commit is contained in:
Travis Nielsen authored and GitHub committed 2026-04-24 09:09:11 -06:00
commit 11bccfebc3
1 file changed
+4 -8
+4 -8
View File
@@ -82,25 +82,21 @@ type daemonConfig struct {
var logger = capnslog.NewPackageLogger("github.com/rook/rook", "ceph-spec")
var (
osdLivenessProbeScript = `
outp="$(ceph --admin-daemon %s %s 2>&1)"
osdLivenessProbeScript = `outp="$(ceph --admin-daemon %s %s 2>&1)"
rc=$?
if [ $rc -ne 0 ] && [ ! -f /tmp/osd-sleep ]; then
echo "ceph daemon health check failed with the following output:"
echo "$outp" | sed -e 's/^/> /g'
exit $rc
fi
`
fi`
livenessProbeScript = `
outp="$(ceph --admin-daemon %s %s 2>&1)"
livenessProbeScript = `outp="$(ceph --admin-daemon %s %s 2>&1)"
rc=$?
if [ $rc -ne 0 ]; then
echo "ceph daemon health check failed with the following output:"
echo "$outp" | sed -e 's/^/> /g'
exit $rc
fi
`
fi`
cronLogRotate = `
CEPH_CLIENT_ID=%s