From 11f35e462ca5ca8f9f27584b1f1515ab3be8fc55 Mon Sep 17 00:00:00 2001
From: Max Gautier <mg@max.gautier.name>
Date: Mon, 8 Apr 2024 16:25:57 +0200
Subject: [PATCH] Convert common packages to use the new tooling

The empty dict means that packages will always be installed on the host.
---
 roles/kubernetes/preinstall/defaults/main.yml | 10 ----------
 roles/kubernetes/preinstall/vars/main.yml     | 10 ++++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/roles/kubernetes/preinstall/defaults/main.yml b/roles/kubernetes/preinstall/defaults/main.yml
index 372421415..09da2ec9b 100644
--- a/roles/kubernetes/preinstall/defaults/main.yml
+++ b/roles/kubernetes/preinstall/defaults/main.yml
@@ -7,16 +7,6 @@ epel_enabled: false
 dns_late: false
 
 common_required_pkgs:
-  - openssl
-  - curl
-  - rsync
-  - socat
-  - unzip
-  - e2fsprogs
-  - xfsprogs
-  - ebtables
-  - bash-completion
-  - tar
   - "{{ kube_proxy_mode == 'ipvs' | ternary(['ipvsadm', 'ipset'], []) }}"
 
 # Set to true if your network does not support IPv6
diff --git a/roles/kubernetes/preinstall/vars/main.yml b/roles/kubernetes/preinstall/vars/main.yml
index 6f7d6fa94..7c83d855e 100644
--- a/roles/kubernetes/preinstall/vars/main.yml
+++ b/roles/kubernetes/preinstall/vars/main.yml
@@ -13,6 +13,7 @@ pkgs:
         Debian:
           major_versions:
           - "10"
+  bash-completion: {}
   conntrack: &deb_redhat
     groups:
     - k8s_cluster
@@ -34,6 +35,7 @@ pkgs:
     os:
       families:
       - RedHat
+  curl: {}
   device-mapper:
     groups:
     - k8s_cluster
@@ -41,6 +43,8 @@ pkgs:
       families:
       - Suse
   device-mapper-libs: *redhat_family
+  e2fsprogs: {}
+  ebtables: {}
   gnupg: &debian
     groups:
     - k8s_cluster
@@ -74,6 +78,7 @@ pkgs:
           major_versions:
           - "12"
   nss: *redhat_family
+  openssl: {}
   python-apt: *deb_10
   # TODO: not for debian 10
   python3-apt: *debian_family_base
@@ -85,4 +90,9 @@ pkgs:
           - "8"
           - "9"
         Centos: *major_redhat_like
+  rsync: {}
+  socat: {}
   software-properties-common: *debian_family_base
+  tar: {}
+  unzip: {}
+  xfsprogs: {}