From 84abfa688181c0eb878e26c7e87cdce79861825c Mon Sep 17 00:00:00 2001
From: reyesj2 <94730068+reyesj2@users.noreply.github.com>
Date: Wed, 1 May 2024 10:45:05 -0400
Subject: [PATCH] Remove check for existing value since Kafka pillar is made
 empty on upgrade

Signed-off-by: reyesj2 <94730068+reyesj2@users.noreply.github.com>
---
 salt/manager/tools/sbin/soup | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup
index 6e4820717..4c328b373 100755
--- a/salt/manager/tools/sbin/soup
+++ b/salt/manager/tools/sbin/soup
@@ -595,14 +595,10 @@ up_to_2.4.70() {
   touch /opt/so/saltstack/local/pillar/kafka/soc_kafka.sls
   touch /opt/so/saltstack/local/pillar/kafka/adv_kafka.sls
   echo 'kafka: ' > /opt/so/saltstack/local/pillar/kafka/soc_kafka.sls
-  if ! grep -q "^    cluster_id:" $local_salt_dir/pillar/kafka/soc_kafka.sls; then
-    kafka_cluster_id=$(get_random_value 22)
-    echo '    cluster_id: '$kafka_cluster_id >> $local_salt_dir/pillar/kafka/soc_kafka.sls
-  fi
-  if ! grep -q "^    kafka_pass:" $local_salt_dir/pillar/kafka/soc_kafka.sls; then
-    kafkapass=$(get_random_value)
-    echo '    kafka_pass: '$kafkapass >> $local_salt_dir/pillar/kafka/soc_kafka.sls
-  fi
+  kafka_cluster_id=$(get_random_value 22)
+  echo '    cluster_id: '$kafka_cluster_id >> $local_salt_dir/pillar/kafka/soc_kafka.sls
+  kafkapass=$(get_random_value)
+  echo '    kafka_pass: '$kafkapass >> $local_salt_dir/pillar/kafka/soc_kafka.sls
 
   INSTALLEDVERSION=2.4.70
 }