Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix upgrade install fails after partial install #3469

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fix upgrade install fails after partial install #3469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions addons/ekco/template/base/reboot/startup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:]')"
6 changes: 3 additions & 3 deletions scripts/common/kubernetes.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -281,7 +281,7 @@ function kubernetes_api_address() {

addr=$(${DIR}/bin/kurl format-address ${addr})

echo "${addr}:${port}"
echo "https://${addr}:${port}"
fi
}

Expand Down
2 changes: 1 addition & 1 deletion scripts/distro/kubeadm/distro.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,6 @@ EOF
}

function kubeadm_api_is_healthy() {
curl --globoff --noproxy "*" --fail --silent --insecure "https://$(kubernetes_api_address)/healthz" >/dev/null
curl --globoff --noproxy "*" --fail --silent --insecure "$(kubernetes_api_address)/healthz" >/dev/null
}