From c6987e3fed342565ef4d95fadd57bbf6e4da2f9e Mon Sep 17 00:00:00 2001
From: Yaron Kaikov <yaronkaikov@scylladb.com>
Date: Sun, 6 Jul 2025 22:16:28 +0300
Subject: [PATCH] packaging: add `ps` command to dependancies

ScyllaDB container image doesn't have ps command installed, while this command is used by perftune.py script shipped within the same image. This breaks node and container tuning in Scylla Operator.

Fixes: #24827

Closes scylladb/scylladb#24830

(cherry picked from commit 66ff6ab6f9b2cafd5711b0f998a5b9970bff4869)

Closes scylladb/scylladb#24956
---
 dist/debian/control.template       | 2 +-
 dist/docker/redhat/build_docker.sh | 2 +-
 dist/redhat/scylla.spec            | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dist/debian/control.template b/dist/debian/control.template
index 276b9fa6c4..a574e4ae94 100644
--- a/dist/debian/control.template
+++ b/dist/debian/control.template
@@ -18,7 +18,7 @@ Breaks: scylla-enterprise-conf (<< 2025.1.0~)
 
 Package: %{product}-server
 Architecture: any
-Depends: ${misc:Depends}, %{product}-conf (= ${binary:Version}), %{product}-python3 (= ${binary:Version})
+Depends: ${misc:Depends}, %{product}-conf (= ${binary:Version}), %{product}-python3 (= ${binary:Version}), procps
 Replaces: %{product}-tools (<<5.5), scylla-enterprise-tools (<< 2024.2.0~), scylla-enterprise-server (<< 2025.1.0~)
 Breaks: %{product}-tools (<<5.5), scylla-enterprise-tools (<< 2024.2.0~), scylla-enterprise-server (<< 2025.1.0~)
 Description: Scylla database server binaries
diff --git a/dist/docker/redhat/build_docker.sh b/dist/docker/redhat/build_docker.sh
index 8786a7d106..5c1a307fda 100755
--- a/dist/docker/redhat/build_docker.sh
+++ b/dist/docker/redhat/build_docker.sh
@@ -88,7 +88,7 @@ bcp LICENSE-ScyllaDB-Source-Available.md /licenses/
 
 run microdnf clean all
 run microdnf --setopt=tsflags=nodocs -y update
-run microdnf --setopt=tsflags=nodocs -y install hostname python3 python3-pip kmod
+run microdnf --setopt=tsflags=nodocs -y install hostname kmod procps-ng python3 python3-pip
 run microdnf clean all
 run pip3 install --no-cache-dir --prefix /usr supervisor
 run bash -ec "echo LANG=C.UTF-8 > /etc/locale.conf"
diff --git a/dist/redhat/scylla.spec b/dist/redhat/scylla.spec
index 7849cdfa94..0a4d8549f3 100644
--- a/dist/redhat/scylla.spec
+++ b/dist/redhat/scylla.spec
@@ -76,6 +76,7 @@ Group:          Applications/Databases
 Summary:        The Scylla database server
 Requires:       %{product}-conf = %{version}-%{release}
 Requires:       %{product}-python3 = %{version}-%{release}
+Requires:       procps-ng
 AutoReqProv:    no
 Provides:       %{product}-tools:%{_bindir}/nodetool
 Provides:       %{product}-tools:%{_sysconfigdir}/bash_completion.d/nodetool-completion