From c5089f64de25686479fbd1280ee647e4149f6802 Mon Sep 17 00:00:00 2001
From: daniellrr <daniel.redelberger@eficode.com>
Date: Mon, 29 Jan 2024 15:11:20 +0100
Subject: [PATCH] Merge branch 'main' of
 github.com:eficode-academy/k8s-edge-infra

---
 upgrade_edge/upgrade_edge.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/upgrade_edge/upgrade_edge.sh b/upgrade_edge/upgrade_edge.sh
index a4c13e0..101a91d 100644
--- a/upgrade_edge/upgrade_edge.sh
+++ b/upgrade_edge/upgrade_edge.sh
@@ -7,7 +7,7 @@
       #TALOS_VERSION="v1.5.5"
       #UPGRADE_KUBERENTES="true"
 
-if [[ "$UPGRADE_KUBERNETES" != "true" ]] || { [[ "$UPGRADE_TALOS" != "true" ]] && [[ -z "$TALOS_VERSION" ]]; }; then
+if [[ "$UPGRADE_KUBERNETES" != "true" ]] || [[ "$UPGRADE_TALOS" != "true" ]] ; then
   echo "None of the variables UPGRADE_KUBERNETES or UPGRADE_TALOS has been set to true (true as a string, not a boolean), exiting without any upgrading"
   echo $UPGRADE_KUBERENTES
   echo $UPGRADE_TALOS
@@ -78,7 +78,7 @@ upgrade_kubernetes() {
 
 if [ "$UPGRADE_TALOS" = "true" ] && [ "$UPGRADE_KUBERENTES" = "true" ]; then
     echo "Cannot upgrade both Talos and Kubernetes at the same time."
-    exit 1
+    exit 0
 elif [ "$UPGRADE_TALOS" = "true" ]; then
     check_talos_version_existence
     check_talosctl_version