ivampiresp/longhorn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix for issue #4216

Browse Source 
Signed-off-by: Dante Foulke <flkdnt@gmail.com>
This commit is contained in:
Dante Foulke 2022-07-12 07:55:32 -04:00 committed by David Ko
parent 0614c55fc3
commit edc1b83c5f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/environment_check.sh
View File

@ -71,9 +71,9 @@ detect_node_os()
{ {
local pod="$1" local pod="$1"
OS=`kubectl exec -it $pod -- nsenter --mount=/proc/1/ns/mnt -- bash -c 'grep -E "^ID_LIKE=" /etc/os-release | cut -d= -f2'` OS=`kubectl exec -i $pod -- nsenter --mount=/proc/1/ns/mnt -- bash -c 'grep -E "^ID_LIKE=" /etc/os-release | cut -d= -f2'`
if [[ -z "${OS}" ]]; then if [[ -z "${OS}" ]]; then
OS=`kubectl exec -it $pod -- nsenter --mount=/proc/1/ns/mnt -- bash -c 'grep -E "^ID=" /etc/os-release | cut -d= -f2'` OS=`kubectl exec -i $pod -- nsenter --mount=/proc/1/ns/mnt -- bash -c 'grep -E "^ID=" /etc/os-release | cut -d= -f2'`
fi fi
echo "$OS" echo "$OS"
} }
@ -227,7 +227,7 @@ check_package_installed() {
for ((i=0; i<${#PACKAGES[@]}; i++)); do for ((i=0; i<${#PACKAGES[@]}; i++)); do
local package=${PACKAGES[$i]} local package=${PACKAGES[$i]}
kubectl exec -it $pod -- nsenter --mount=/proc/1/ns/mnt -- timeout 30 bash -c "$CHECK_CMD $package" > /dev/null 2>&1 kubectl exec -i $pod -- nsenter --mount=/proc/1/ns/mnt -- timeout 30 bash -c "$CHECK_CMD $package" > /dev/null 2>&1
if [ $? != 0 ]; then if [ $? != 0 ]; then
allFound=false allFound=false
node=`kubectl get ${pod} --no-headers -o=custom-columns=:.spec.nodeName` node=`kubectl get ${pod} --no-headers -o=custom-columns=:.spec.nodeName`