Code Review
/
icn.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Update versions of addons"
[icn.git]
/
deploy
/
addons
/
addons.sh
diff --git
a/deploy/addons/addons.sh
b/deploy/addons/addons.sh
index
5b45e72
..
30bf53d
100755
(executable)
--- a/
deploy/addons/addons.sh
+++ b/
deploy/addons/addons.sh
@@
-85,7
+85,7
@@
function is_addon_ready {
local -r addon=$1
local -r cluster_name=${CLUSTER_NAME:-icn}
local -r cluster_kubeconfig="${BUILDDIR}/${cluster_name}.conf"
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
HelmRelease
/${addon} -o jsonpath='{.status.conditions[?(@.type=="Ready")].status}') == "True" ]]
+ [[ $(kubectl --kubeconfig=${cluster_kubeconfig} -n kud get
Kustomization
/${addon} -o jsonpath='{.status.conditions[?(@.type=="Ready")].status}') == "True" ]]
}
function test_addons {
}
function test_addons {
@@
-97,6
+97,12
@@
function test_addons {
clusterctl -n metal3 get kubeconfig ${cluster_name} >${cluster_kubeconfig}
clone_kud_repository
clusterctl -n metal3 get kubeconfig ${cluster_name} >${cluster_kubeconfig}
clone_kud_repository
+ # The vFW test in EMCO v21.12 does not use KubeVirt, so patch the
+ # KuD test and continue to use it
+ pushd ${KUDPATH}
+ patch -p1 --forward <${SCRIPTDIR}/plugin_fw_v2.patch || true
+ popd
+
pushd ${KUDPATH}/kud/tests
failed_kud_tests=""
container_runtime=$(KUBECONFIG=${cluster_kubeconfig} kubectl get nodes -o jsonpath='{.items[].status.nodeInfo.containerRuntimeVersion}')
pushd ${KUDPATH}/kud/tests
failed_kud_tests=""
container_runtime=$(KUBECONFIG=${cluster_kubeconfig} kubectl get nodes -o jsonpath='{.items[].status.nodeInfo.containerRuntimeVersion}')
@@
-106,9
+112,9
@@
function test_addons {
# security hardening.
if [[ "${container_runtime}" == "containerd://1.2.13" ]]; then
# With containerd 1.2.13, the qat test container image fails to unpack.
# security hardening.
if [[ "${container_runtime}" == "containerd://1.2.13" ]]; then
# With containerd 1.2.13, the qat test container image fails to unpack.
- kud_tests="topology-manager-sriov:sriov-network multus:multus-cni ovn4nfv:
ovn4nfv
-network nfd:node-feature-discovery sriov-network:sriov-network cmk:cpu-manager"
+ kud_tests="topology-manager-sriov:sriov-network multus:multus-cni ovn4nfv:
nodus
-network nfd:node-feature-discovery sriov-network:sriov-network cmk:cpu-manager"
else
else
- kud_tests="topology-manager-sriov:sriov-network multus:multus-cni ovn4nfv:
ovn4nfv-network nfd:node-feature-discovery sriov-network:sriov-network qat:qat-device
-plugin cmk:cpu-manager"
+ kud_tests="topology-manager-sriov:sriov-network multus:multus-cni ovn4nfv:
nodus-network nfd:node-feature-discovery sriov-network:sriov-network qat:qat
-plugin cmk:cpu-manager"
fi
for kud_test in ${kud_tests}; do
addon="${kud_test#*:}"
fi
for kud_test in ${kud_tests}; do
addon="${kud_test#*:}"