From f64a46c215f15c8f11dc318673ba78ec6995fd4f Mon Sep 17 00:00:00 2001 From: Todd Malsbary Date: Thu, 17 Mar 2022 09:54:27 -0700 Subject: [PATCH] Add additional ready check to NFD addon Signed-off-by: Todd Malsbary Change-Id: I80fd99b2cb4b11ba32272b2741bcea14951ce875 --- deploy/addons/addons.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/deploy/addons/addons.sh b/deploy/addons/addons.sh index c8a6808..f2aa57e 100755 --- a/deploy/addons/addons.sh +++ b/deploy/addons/addons.sh @@ -85,7 +85,9 @@ function is_addon_ready { local -r addon=$1 local -r cluster_name=${CLUSTER_NAME:-icn} local -r cluster_kubeconfig="${BUILDDIR}/${cluster_name}.conf" - [[ $(kubectl --kubeconfig=${cluster_kubeconfig} -n kud get Kustomization/${addon} -o jsonpath='{.status.conditions[?(@.type=="Ready")].status}') == "True" ]] + if [[ $(kubectl --kubeconfig=${cluster_kubeconfig} -n kud get Kustomization/${addon} -o jsonpath='{.status.conditions[?(@.type=="Ready")].status}') != "True" ]]; then + return 1 + fi # Additional addon specific checks case ${addon} in @@ -94,6 +96,11 @@ function is_addon_ready { kubectl --kubeconfig=${cluster_kubeconfig} get cmk-nodereport ${node} done ;; + "node-feature-discovery") + node_name=$(kubectl --kubeconfig=${cluster_kubeconfig} get nodes -o jsonpath='{range .items[*]}{.metadata.name} {.spec.taints[?(@.effect=="NoSchedule")].effect}{"\n"}{end}' | awk 'NF==1 {print $0;exit}') + kernel_version=$(kubectl --kubeconfig=${cluster_kubeconfig} get node ${node_name} -o jsonpath='{.metadata.labels.feature\.node\.kubernetes\.io/kernel-version\.major}') + [[ -n ${kernel_version} ]] + ;; esac } -- 2.16.6