diff options
author | Akhila Kishore <akhila.kishore@intel.com> | 2019-08-30 16:39:00 -0700 |
---|---|---|
committer | Akhila Kishore <akhila.kishore@intel.com> | 2019-09-11 13:53:16 -0700 |
commit | 9837132fd9360f7d88d650b2ec6a318662e43d5c (patch) | |
tree | 7321ce4df7f5fbe99f475c4737d7df4241763801 /kud/tests/nfd.sh | |
parent | 4655f550c8c03a6384fa90746f1af021348ec6ef (diff) |
Integrating NFD Daemonset with KuD
Current NFD code in KuD is unused and obsolete.
Integrating NFD as DaemonSet and updating test case for NFD.
Added comments. Addressed comments and changed the
matchExpression to kernel features. Changed operator from "In" to Gt,
and values 4 to 3 better fit broader spectrum of O.S's.
Adding exit conditon in case there's an error status.
Signed-off-by: Akhila Kishore <akhila.kishore@intel.com>
Issue-ID: MULTICLOUD-797
Change-Id: I454fb1998fc84e5f0d566f32b7dcfd85872c5183
Diffstat (limited to 'kud/tests/nfd.sh')
-rwxr-xr-x | kud/tests/nfd.sh | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/kud/tests/nfd.sh b/kud/tests/nfd.sh index b7e1f3e8..abf9f92b 100755 --- a/kud/tests/nfd.sh +++ b/kud/tests/nfd.sh @@ -15,40 +15,40 @@ set -o pipefail source _common_test.sh rm -f $HOME/*.yaml - pod_name=nfd-pod install_deps cat << POD > $HOME/$pod_name.yaml -apiVersion: - v1 +apiVersion: v1 kind: Pod metadata: name: $pod_name - labels: - env: test spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: "feature.node.kubernetes.io/kernel-version.major" + operator: Gt + values: + - '3' containers: - - name: nginx - image: nginx -nodeSelector: - node.alpha.kubernetes-incubator.io/nfd-network-SRIOV: true + - name: with-node-affinity + image: gcr.io/google_containers/pause:2.0 POD - if $(kubectl version &>/dev/null); then labels=$(kubectl get nodes -o json | jq .items[].metadata.labels) echo $labels - if [[ $labels != *"node.alpha.kubernetes-incubator.io"* ]]; then + if [[ $labels != *"kubernetes.io"* ]]; then exit 1 fi - kubectl delete pod $pod_name --ignore-not-found=true --now while kubectl get pod $pod_name &>/dev/null; do sleep 5 done kubectl create -f $HOME/$pod_name.yaml --validate=false - for pod in $pod_name; do status_phase="" while [[ $status_phase != "Running" ]]; do @@ -57,9 +57,17 @@ if $(kubectl version &>/dev/null); then echo "$(date +%H:%M:%S) - $pod : $new_phase" status_phase=$new_phase fi + + if [[ $new_phase == "Running" ]]; then + echo " Test is complete.." + fi if [[ $new_phase == "Err"* ]]; then exit 1 fi done done + kubectl delete pod $pod_name + while kubectl get pod $pod_name &>/dev/null; do + sleep 5 + done fi |