From 9a15fae7c8bfebd2fe5796f2352448e126f2fe55 Mon Sep 17 00:00:00 2001
From: Teddy Andrieux <teddy.andrieux@scality.com>
Date: Mon, 21 Nov 2022 14:38:59 +0100
Subject: [PATCH] salt,build: Properly require tar package

Since tar package is required by MetalK8s backup script, this package
should be installed automatically
---
 CHANGELOG.md                      | 5 +++++
 buildchain/buildchain/versions.py | 1 +
 salt/metalk8s/defaults.yaml       | 1 +
 3 files changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f60204471..ca1c4dab0d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # CHANGELOG
 ## Release 124.0.2 (in development)
 
+### Bug fixes
+
+- Ensure that tar is installed before using it
+  (PR[#3919](https://github.com/scality/metalk8s/pull/3919))
+
 ## Release 124.0.1
 
 ### Bug fixes 
diff --git a/buildchain/buildchain/versions.py b/buildchain/buildchain/versions.py
index 4212e59b18..c4a2311978 100644
--- a/buildchain/buildchain/versions.py
+++ b/buildchain/buildchain/versions.py
@@ -385,6 +385,7 @@ def rpm_full_name(self) -> str:
         PackageVersion(name="python36-pyOpenSSL"),
         PackageVersion(name="salt-minion", version=SALT_VERSION),
         PackageVersion(name="socat"),
+        PackageVersion(name="tar"),
         PackageVersion(name="util-linux"),
         PackageVersion(name="yum-utils"),
         PackageVersion(name="xfsprogs"),
diff --git a/salt/metalk8s/defaults.yaml b/salt/metalk8s/defaults.yaml
index de0b8c019e..1bde7b13fc 100644
--- a/salt/metalk8s/defaults.yaml
+++ b/salt/metalk8s/defaults.yaml
@@ -20,6 +20,7 @@ kubernetes:
 kubeadm_preflight:
   mandatory:
     packages:
+      - tar
       - util-linux            # provides nsenter, mount
       - iproute               # provides ip
       - iptables              # provides iptables