fix servers flags (rancher#94)

Signed-off-by: Francisco <[email protected]>
aganesh-suse · May 6, 2024 · bf44a22 · bf44a22
1 parent 334dbe5
commit bf44a22
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 21 deletions.
diff --git a/modules/install/join_k3s_agent.sh b/modules/install/join_k3s_agent.sh
@@ -37,7 +37,7 @@ update_config() {
     echo -e "$worker_flags" >> /etc/rancher/k3s/config.yaml
   fi
 
-  if [[ "$worker_flags" != *"cloud-provider-name"* ]]; then
+  if [[ "$worker_flags" != *"cloud-provider-name"* ]] || [[ -z "$worker_flags" ]]; then
     if [ -n "$ipv6_ip" ] && [ -n "$public_ip" ] && [ -n "$private_ip" ]; then
       echo -e "node-external-ip: $public_ip,$ipv6_ip" >> /etc/rancher/k3s/config.yaml
       echo -e "node-ip: $private_ip,$ipv6_ip" >> /etc/rancher/k3s/config.yaml

diff --git a/modules/install/join_k3s_master.sh b/modules/install/join_k3s_master.sh
@@ -41,7 +41,7 @@ update_config() {
     echo -e "$server_flags" >> /etc/rancher/k3s/config.yaml
   fi
 
-  if [[ "$server_flags" != *"cloud-provider-name"* ]]; then
+  if [[ "$server_flags" != *"cloud-provider-name"* ]] || [[ -z "$server_flags" ]]; then
     if [ -n "$ipv6_ip" ] && [ -n "$public_ip" ] && [ -n "$private_ip" ]; then
       echo -e "node-external-ip: $public_ip,$ipv6_ip" >> /etc/rancher/k3s/config.yaml
       echo -e "node-ip: $private_ip,$ipv6_ip" >> /etc/rancher/k3s/config.yaml

diff --git a/modules/install/join_rke2_agent.sh b/modules/install/join_rke2_agent.sh
@@ -35,20 +35,21 @@ EOF
 update_config() {
   if [ -n "$worker_flags" ] && [[ "$worker_flags" == *":"* ]]; then
     echo -e "$worker_flags" >> /etc/rancher/rke2/config.yaml
-    if [[ "$worker_flags" != *"cloud-provider-name"* ]]; then
-      if [ -n "$ipv6_ip" ] && [ -n "$public_ip" ] && [ -n "$private_ip" ]; then
+  fi
+
+  if [[ "$worker_flags" != *"cloud-provider-name"* ]] || [[ -z "$worker_flags" ]]; then
+    if [ -n "$ipv6_ip" ] && [ -n "$public_ip" ] && [ -n "$private_ip" ]; then
         echo -e "node-external-ip: $public_ip,$ipv6_ip" >> /etc/rancher/rke2/config.yaml
         echo -e "node-ip: $private_ip,$ipv6_ip" >> /etc/rancher/rke2/config.yaml
-      elif [ -n "$ipv6_ip" ]; then
+    elif [ -n "$ipv6_ip" ]; then
         echo -e "node-external-ip: $ipv6_ip" >> /etc/rancher/rke2/config.yaml
         echo -e "node-ip: $ipv6_ip" >> /etc/rancher/rke2/config.yaml
-      else
+    else
         echo -e "node-external-ip: $public_ip" >> /etc/rancher/rke2/config.yaml
         echo -e "node-ip: $private_ip" >> /etc/rancher/rke2/config.yaml
-      fi
     fi
-    cat /etc/rancher/rke2/config.yaml
   fi
+    cat /etc/rancher/rke2/config.yaml
 }
 
 cis_setup() {

diff --git a/modules/install/join_rke2_master.sh b/modules/install/join_rke2_master.sh
@@ -39,20 +39,21 @@ EOF
 update_config() {
   if [ -n "$server_flags" ] && [[ "$server_flags" == *":"* ]]; then
     echo -e "$server_flags" >> /etc/rancher/rke2/config.yaml
-    if [[ "$server_flags" != *"cloud-provider-name"* ]]; then
-      if [ -n "$ipv6_ip" ] && [ -n "$public_ip" ] && [ -n "$private_ip" ]; then
+  fi
+
+  if [[ "$server_flags" != *"cloud-provider-name"* ]] || [[ -z "$server_flags" ]]; then
+    if [ -n "$ipv6_ip" ] && [ -n "$public_ip" ] && [ -n "$private_ip" ]; then
         echo -e "node-external-ip: $public_ip,$ipv6_ip" >> /etc/rancher/rke2/config.yaml
         echo -e "node-ip: $private_ip,$ipv6_ip" >> /etc/rancher/rke2/config.yaml
-      elif [ -n "$ipv6_ip" ]; then
+    elif [ -n "$ipv6_ip" ]; then
         echo -e "node-external-ip: $ipv6_ip" >> /etc/rancher/rke2/config.yaml
         echo -e "node-ip: $ipv6_ip" >> /etc/rancher/rke2/config.yaml
-      else
+    else
         echo -e "node-external-ip: $public_ip" >> /etc/rancher/rke2/config.yaml
         echo -e "node-ip: $private_ip" >> /etc/rancher/rke2/config.yaml
-      fi
     fi
-    cat /etc/rancher/rke2/config.yaml
   fi
+    cat /etc/rancher/rke2/config.yaml
 }
 
 subscription_manager() {

diff --git a/modules/install/k3s_master.sh b/modules/install/k3s_master.sh
@@ -39,7 +39,7 @@ update_config() {
     echo -e "$server_flags" >> /etc/rancher/k3s/config.yaml
   fi
 
-  if [[ "$server_flags" != *"cloud-provider-name"* ]]; then
+  if [[ "$server_flags" != *"cloud-provider-name"* ]] || [[ -z "$server_flags" ]]; then
     if [ -n "$ipv6_ip" ] && [ -n "$public_ip" ] && [ -n "$private_ip" ]; then
       echo -e "node-external-ip: $public_ip,$ipv6_ip" >> /etc/rancher/k3s/config.yaml
       echo -e "node-ip: $private_ip,$ipv6_ip" >> /etc/rancher/k3s/config.yaml

diff --git a/modules/install/rke2_master.sh b/modules/install/rke2_master.sh
@@ -37,20 +37,21 @@ EOF
 update_config() {
   if [ -n "$server_flags" ] && [[ "$server_flags" == *":"* ]]; then
     echo -e "$server_flags" >> /etc/rancher/rke2/config.yaml
-    if [[ "$server_flags" != *"cloud-provider-name"* ]]; then
-      if [ -n "$ipv6_ip" ] && [ -n "$public_ip" ] && [ -n "$private_ip" ]; then
+  fi
+
+  if [[ "$server_flags" != *"cloud-provider-name"* ]] || [[ -z "$server_flags" ]]; then
+    if [ -n "$ipv6_ip" ] && [ -n "$public_ip" ] && [ -n "$private_ip" ]; then
         echo -e "node-external-ip: $public_ip,$ipv6_ip" >> /etc/rancher/rke2/config.yaml
         echo -e "node-ip: $private_ip,$ipv6_ip" >> /etc/rancher/rke2/config.yaml
-      elif [ -n "$ipv6_ip" ]; then
+    elif [ -n "$ipv6_ip" ]; then
         echo -e "node-external-ip: $ipv6_ip" >> /etc/rancher/rke2/config.yaml
         echo -e "node-ip: $ipv6_ip" >> /etc/rancher/rke2/config.yaml
-      else
+    else
         echo -e "node-external-ip: $public_ip" >> /etc/rancher/rke2/config.yaml
         echo -e "node-ip: $private_ip" >> /etc/rancher/rke2/config.yaml
-      fi
     fi
-    cat /etc/rancher/rke2/config.yaml
   fi
+    cat /etc/rancher/rke2/config.yaml
 }
 
 subscription_manager() {