Code Review
/
icn.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Don't touch ssh config in pod11 deploy
[icn.git]
/
deploy
/
addons
/
addons.sh
diff --git
a/deploy/addons/addons.sh
b/deploy/addons/addons.sh
index
c3fefe9
..
28337d9
100755
(executable)
--- a/
deploy/addons/addons.sh
+++ b/
deploy/addons/addons.sh
@@
-11,7
+11,7
@@
BUILDDIR=${SCRIPTDIR/deploy/build}
mkdir -p ${BUILDDIR}
function register_emco_controllers {
mkdir -p ${BUILDDIR}
function register_emco_controllers {
- local -r cluster_name=${CLUSTER_NAME:-
e2etest
}
+ local -r cluster_name=${CLUSTER_NAME:-
icn
}
local -r host=$(kubectl -n metal3 get cluster/${cluster_name} -o jsonpath='{.spec.controlPlaneEndpoint.host}')
cat <<EOF >${BUILDDIR}/${cluster_name}-config.yaml
orchestrator:
local -r host=$(kubectl -n metal3 get cluster/${cluster_name} -o jsonpath='{.spec.controlPlaneEndpoint.host}')
cat <<EOF >${BUILDDIR}/${cluster_name}-config.yaml
orchestrator:
@@
-66,13
+66,13
@@
EOF
}
function unregister_emco_controllers {
}
function unregister_emco_controllers {
- local -r cluster_name=${CLUSTER_NAME:-
e2etest
}
+ local -r cluster_name=${CLUSTER_NAME:-
icn
}
emcoctl --config ${BUILDDIR}/${cluster_name}-config.yaml delete -f ${BUILDDIR}/${cluster_name}-controllers.yaml
}
function test_addons {
# Create a temporary kubeconfig file for the tests
emcoctl --config ${BUILDDIR}/${cluster_name}-config.yaml delete -f ${BUILDDIR}/${cluster_name}-controllers.yaml
}
function test_addons {
# Create a temporary kubeconfig file for the tests
- local -r cluster_name=${CLUSTER_NAME:-
e2etest
}
+ local -r cluster_name=${CLUSTER_NAME:-
icn
}
local -r cluster_kubeconfig="${BUILDDIR}/${cluster_name}.conf"
clusterctl -n metal3 get kubeconfig ${cluster_name} >${cluster_kubeconfig}
local -r cluster_kubeconfig="${BUILDDIR}/${cluster_name}.conf"
clusterctl -n metal3 get kubeconfig ${cluster_name} >${cluster_kubeconfig}
@@
-80,11
+80,15
@@
function test_addons {
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}')
+ # TODO Temporarily remove kubevirt from kud_tests below. The
+ # kubevirt self-test needs AllowTcpForwarding yes in
+ # /etc/ssh/sshd_config which is currently disabled by the OS
+ # security hardening.
if [[ "${container_runtime}" == "containerd://1.2.13" ]]; then
# With containerd 1.2.13, the qat test container image fails to unpack.
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
kubevirt
multus ovn4nfv nfd sriov-network cmk"
+ kud_tests="topology-manager-sriov multus ovn4nfv nfd sriov-network cmk"
else
else
- kud_tests="topology-manager-sriov
kubevirt
multus ovn4nfv nfd sriov-network qat cmk"
+ kud_tests="topology-manager-sriov multus ovn4nfv nfd sriov-network qat cmk"
fi
for test in ${kud_tests}; do
KUBECONFIG=${cluster_kubeconfig} bash ${test}.sh || failed_kud_tests="${failed_kud_tests} ${test}"
fi
for test in ${kud_tests}; do
KUBECONFIG=${cluster_kubeconfig} bash ${test}.sh || failed_kud_tests="${failed_kud_tests} ${test}"
@@
-109,7
+113,7
@@
case $1 in
Usage: $(basename $0) COMMAND
The "test" command looks for the CLUSTER_NAME variable in the
Usage: $(basename $0) COMMAND
The "test" command looks for the CLUSTER_NAME variable in the
-environment (default: "
e2etest
"). This should be the name of the
+environment (default: "
icn
"). This should be the name of the
Cluster resource to execute the tests in.
Commands:
Cluster resource to execute the tests in.
Commands: