From c0250a1fbaedc3675433fe186589f765dba8bfad Mon Sep 17 00:00:00 2001 From: Petr Horacek Date: Tue, 9 May 2023 19:45:03 +0200 Subject: [PATCH] Bump kubevirtci and OVS Signed-off-by: Petr Horacek --- automation/check-patch.e2e.sh | 2 +- cluster/cluster.sh | 4 ++-- cluster/up.sh | 11 ++++------- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/automation/check-patch.e2e.sh b/automation/check-patch.e2e.sh index 1f2b793f..c6ff0194 100755 --- a/automation/check-patch.e2e.sh +++ b/automation/check-patch.e2e.sh @@ -12,7 +12,7 @@ teardown() { } main() { - export KUBEVIRT_PROVIDER='k8s-1.23' + export KUBEVIRT_PROVIDER='k8s-1.26-centos9' source automation/setup.sh cd ${TMP_PROJECT_PATH} diff --git a/cluster/cluster.sh b/cluster/cluster.sh index da563311..d51e9dc7 100755 --- a/cluster/cluster.sh +++ b/cluster/cluster.sh @@ -12,8 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -export KUBEVIRT_PROVIDER=${KUBEVIRT_PROVIDER:-'k8s-1.23'} -export KUBEVIRTCI_TAG=2211021552-8cca8c0 +export KUBEVIRT_PROVIDER=${KUBEVIRT_PROVIDER:-'k8s-1.26-centos9'} +export KUBEVIRTCI_TAG=2305081329-48e913c KUBEVIRTCI_REPO='https://github.com/kubevirt/kubevirtci.git' # The CLUSTER_PATH var is used in cluster folder and points to the _kubevirtci where the cluster is deployed from. diff --git a/cluster/up.sh b/cluster/up.sh index fae7569c..000a91ed 100755 --- a/cluster/up.sh +++ b/cluster/up.sh @@ -23,15 +23,12 @@ $(cluster::path)/cluster-up/up.sh echo 'Installing Open vSwitch on nodes' for node in $(./cluster/kubectl.sh get nodes --no-headers | awk '{print $1}'); do - ./cluster/cli.sh ssh ${node} -- sudo dnf install -y centos-release-nfv-openvswitch - ./cluster/cli.sh ssh ${node} -- sudo dnf install -y openvswitch2.16 dpdk ./cluster/cli.sh ssh ${node} -- sudo systemctl daemon-reload + ./cluster/cli.sh ssh ${node} -- sudo systemctl enable openvswitch ./cluster/cli.sh ssh ${node} -- sudo systemctl restart openvswitch + ./cluster/cli.sh ssh ${node} -- sudo systemctl restart NetworkManager done echo 'Deploying multus' -curl https://raw.githubusercontent.com/k8snetworkplumbingwg/multus-cni/v3.9.1/deployments/multus-daemonset.yml -o cluster/multus-daemonset.yml -MULTUS_IMAGE=ghcr.io/k8snetworkplumbingwg/multus-cni:v3.9 -sed -i "s#ghcr.io/k8snetworkplumbingwg/multus-cni:stable\$#$MULTUS_IMAGE#" cluster/multus-daemonset.yml -./cluster/kubectl.sh create -f cluster/multus-daemonset.yml -./cluster/kubectl.sh -n kube-system wait --for=condition=ready -l name=multus pod --timeout=300s +./cluster/kubectl.sh apply -f https://raw.githubusercontent.com/k8snetworkplumbingwg/multus-cni/v4.0.1/deployments/multus-daemonset-thick.yml +./cluster/kubectl.sh -n kube-system rollout status daemonset kube-multus-ds --timeout 300s