sriov provider.sh, move kind config changes to kind/common.sh

Make use of 'kind_up' Signed-off-by: Or Mergi <[email protected]> Conflicts: cluster-up/cluster/kind/common.sh
ormergi · Nov 17, 2020 · 8727fb4 · 8727fb4
1 parent 0416277
commit 8727fb4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/cluster-up/cluster/kind-k8s-sriov-1.17.0/provider.sh b/cluster-up/cluster/kind-k8s-sriov-1.17.0/provider.sh
@@ -18,18 +18,8 @@ function up() {
     docker run --rm --cap-add=SYS_RAWIO quay.io/phoracek/lspci@sha256:0f3cacf7098202ef284308c64e3fc0ba441871a846022bb87d65ff130c79adb1 sh -c "lspci | egrep -i 'network|ethernet'"
 
     cp $KIND_MANIFESTS_DIR/kind.yaml ${KUBEVIRTCI_CONFIG_PATH}/$KUBEVIRT_PROVIDER/kind.yaml
-    _fetch_kind
-    prepare_workers
-    # adding mounts to control plane, need them for sriov
-    cat >> ${KUBEVIRTCI_CONFIG_PATH}/$KUBEVIRT_PROVIDER/kind.yaml << EOF 
-  extraMounts:
-  - containerPath: /lib/modules
-    hostPath: /lib/modules
-    readOnly: true
-  - containerPath: /dev/vfio/
-    hostPath: /dev/vfio/
-EOF
-
-    setup_kind
+
+    kind_up
+
     ${KUBEVIRTCI_PATH}/cluster/$KUBEVIRT_PROVIDER/config_sriov.sh
 }
diff --git a/cluster-up/cluster/kind/common.sh b/cluster-up/cluster/kind/common.sh
@@ -192,6 +192,19 @@ function setup_kind() {
     prepare_config
 }
 
+function _add_worker_extra_mounts() {
+    if [[ "$KUBEVIRT_PROVIDER" =~ sriov.* ]]; then
+        cat <<EOF >> ${KUBEVIRTCI_CONFIG_PATH}/$KUBEVIRT_PROVIDER/kind.yaml
+  extraMounts:
+  - containerPath: /lib/modules
+    hostPath: /lib/modules
+    readOnly: true
+  - containerPath: /dev/vfio/
+    hostPath: /dev/vfio/
+EOF
+  fi
+}
+
 function _add_worker_kubeadm_config_patch() {
     cat << EOF >> ${KUBEVIRTCI_CONFIG_PATH}/$KUBEVIRT_PROVIDER/kind.yaml
   kubeadmConfigPatches:
@@ -213,6 +226,7 @@ function _add_workers() {
 - role: worker
 EOF
     _add_worker_kubeadm_config_patch
+    _add_worker_extra_mounts
     done
 }