Fix upgrade install fails after partial install

replicatedhq · Sep 16, 2022 · 565bcc4 · 565bcc4
1 parent d8de811
commit 565bcc4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/addons/ekco/template/base/reboot/startup.sh b/addons/ekco/template/base/reboot/startup.sh
@@ -8,9 +8,9 @@ fi
 export KUBECONFIG=/etc/kubernetes/kubelet.conf
 
 # wait for Kubernetes API
-master=$(cat /etc/kubernetes/kubelet.conf | grep ' server:' | awk '{ print $2 }')
+master=$(grep ' server: ' /etc/kubernetes/kubelet.conf | awk '{ print $2 }' | sed 's/"//g')
 while [ "$(curl --noproxy "*" -sk $master/healthz)" != "ok" ]; do
  sleep 1
 done
 
-kubectl uncordon $(hostname | tr '[:upper:]' '[:lower:]')
+kubectl uncordon "$(hostname | tr '[:upper:]' '[:lower:]')"
diff --git a/scripts/common/kubernetes.sh b/scripts/common/kubernetes.sh
@@ -259,9 +259,9 @@ function kubernetes_has_remotes() {
  return 1
 }
 
-# Fetch the load balancer endpoint from the cluster.
+# Fetch the load balancer endpoint from the kubelet.conf.
 function existing_kubernetes_api_address() {
- kubectl get cm -n kube-system kurl-config -o jsonpath='{ .data.kubernetes_api_address }'
+ grep ' server: ' /etc/kubernetes/kubelet.conf | awk '{ print $2 }' | sed 's/"//g'
 }
 
 # During the upgrade user might change the load balancer endpoint or want to use EKCO internal load balancer. So, we