Skip to content

Commit 6ca1f85

Browse files
authored
SRIOV provider fine tunes: Logs and Missing Configurations (kubevirt#470)
* Makefile,config_sriov.sh: set curl silent Set curl silent (-s) but show errors (-S) Signed-off-by: Or Mergi <[email protected]> * kind common: use curl for downloads Remove progress bar to reduce noise on logs. If an error occures it will be reported since '-s' is specified. Signed-off-by: Or Mergi <[email protected]> * kind common: delete local registry on cluster-down Signed-off-by: Or Mergi <[email protected]> * provider.sh, sriov provider: remove rancher.io kind default storageClass Signed-off-by: Or Mergi <[email protected]>
1 parent f99d551 commit 6ca1f85

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
export KUBEVIRTCI_TAG ?= $(shell curl -L https://storage.googleapis.com/kubevirt-prow/release/kubevirt/kubevirtci/latest)
2+
export KUBEVIRTCI_TAG ?= $(shell curl -L -Ss https://storage.googleapis.com/kubevirt-prow/release/kubevirt/kubevirtci/latest)
33

44
cluster-up:
55
./cluster-up/check.sh

cluster-up/cluster/kind-k8s-sriov-1.17.0/provider.sh

+3
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,8 @@ function up() {
2222

2323
kind_up
2424

25+
# remove the rancher.io kind default storageClass
26+
_kubectl delete sc standard
27+
2528
${KUBEVIRTCI_PATH}/cluster/$KUBEVIRT_PROVIDER/config_sriov.sh
2629
}

cluster-up/cluster/kind/common.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ function _wait_containers_ready {
3535

3636
function _fetch_kind() {
3737
if [ ! -f ${KUBEVIRTCI_CONFIG_PATH}/$KUBEVIRT_PROVIDER/.kind ]; then
38-
wget https://github.com/kubernetes-sigs/kind/releases/download/v0.7.0/kind-linux-amd64 -O ${KUBEVIRTCI_CONFIG_PATH}/$KUBEVIRT_PROVIDER/.kind
38+
curl -LSs https://github.com/kubernetes-sigs/kind/releases/download/v0.7.0/kind-linux-amd64 -o ${KUBEVIRTCI_CONFIG_PATH}/$KUBEVIRT_PROVIDER/.kind
3939
chmod +x ${KUBEVIRTCI_CONFIG_PATH}/$KUBEVIRT_PROVIDER/.kind
4040
fi
4141
KIND=${KUBEVIRTCI_CONFIG_PATH}/$KUBEVIRT_PROVIDER/.kind
@@ -169,7 +169,7 @@ function setup_kind() {
169169
fi
170170

171171
for node in $(_get_nodes | awk '{print $1}'); do
172-
docker exec $node /bin/sh -c "curl -L https://github.com/containernetworking/plugins/releases/download/v0.8.5/cni-plugins-linux-amd64-v0.8.5.tgz | tar xz -C /opt/cni/bin"
172+
docker exec $node /bin/sh -c "curl -LSs https://github.com/containernetworking/plugins/releases/download/v0.8.5/cni-plugins-linux-amd64-v0.8.5.tgz | tar xz -C /opt/cni/bin"
173173
done
174174

175175
echo "Installing Calico CNI plugin"
@@ -284,5 +284,6 @@ function down() {
284284
return
285285
fi
286286
$KIND delete cluster --name=${CLUSTER_NAME}
287+
docker rm -f $REGISTRY_NAME >> /dev/null
287288
rm -f ${KUBEVIRTCI_CONFIG_PATH}/$KUBEVIRT_PROVIDER/kind.yaml
288289
}

0 commit comments

Comments
 (0)