Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Per-patch: Allow parsing CPS MRR results
[csit.git]
/
resources
/
libraries
/
bash
/
k8s_setup.sh
diff --git
a/resources/libraries/bash/k8s_setup.sh
b/resources/libraries/bash/k8s_setup.sh
index
4128512
..
d1d3a38
100755
(executable)
--- a/
resources/libraries/bash/k8s_setup.sh
+++ b/
resources/libraries/bash/k8s_setup.sh
@@
-1,5
+1,5
@@
#!/bin/bash
#!/bin/bash
-# Copyright (c) 20
18
Cisco and/or its affiliates.
+# Copyright (c) 20
21
Cisco and/or its affiliates.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
@@
-18,19
+18,8
@@
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
# Include
source ${SCRIPT_DIR}/config/defaults
# Include
source ${SCRIPT_DIR}/config/defaults
-source ${SCRIPT_DIR}/shell/dpdk_utils.sh
source ${SCRIPT_DIR}/shell/k8s_utils.sh
source ${SCRIPT_DIR}/shell/k8s_utils.sh
-# Read configuration
-while read line
-do
- if echo $line | grep -F = &>/dev/null
- then
- varname=$(echo "$line" | cut -d '=' -f 1)
- cfg[$varname]=$(echo "$line" | cut -d '=' -f 2-)
- fi
-done < ${SCRIPT_DIR}/config/config
-
trap "k8s_utils.destroy" ERR
case "$1" in
trap "k8s_utils.destroy" ERR
case "$1" in
@@
-44,7
+33,9
@@
case "$1" in
# Revert any changes made to this host by 'kubeadm init'
k8s_utils.destroy
# Load kernel modules uio/uio_pci_generic
# Revert any changes made to this host by 'kubeadm init'
k8s_utils.destroy
# Load kernel modules uio/uio_pci_generic
- dpdk_utils.load_modules
+ sudo modprobe uio
+ sudo modprobe uio_pci_generic
+ sudo modprobe vfio_pci
# Sets up the Kubernetes master
k8s_utils.prepare "--pod-network-cidr=192.168.0.0/16"
# Apply resources
# Sets up the Kubernetes master
k8s_utils.prepare "--pod-network-cidr=192.168.0.0/16"
# Apply resources