Skip to content

Commit e1fbdb2

Browse files
committed
Bump kubevirtci, Multus and OVS
These dependencies were quite outdated and did not pass on CI anymore. This patch brings them up to date. Signed-off-by: Petr Horacek <[email protected]>
1 parent 4ca57aa commit e1fbdb2

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

automation/check-patch.e2e.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ teardown() {
1212
}
1313

1414
main() {
15-
export KUBEVIRT_PROVIDER='k8s-1.23'
15+
export KUBEVIRT_PROVIDER='k8s-1.26-centos9'
1616

1717
source automation/setup.sh
1818
cd ${TMP_PROJECT_PATH}

cluster/cluster.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
export KUBEVIRT_PROVIDER=${KUBEVIRT_PROVIDER:-'k8s-1.23'}
16-
export KUBEVIRTCI_TAG=2211021552-8cca8c0
15+
export KUBEVIRT_PROVIDER=${KUBEVIRT_PROVIDER:-'k8s-1.26-centos9'}
16+
export KUBEVIRTCI_TAG=2305081329-48e913c
1717

1818
KUBEVIRTCI_REPO='https://github.com/kubevirt/kubevirtci.git'
1919
# The CLUSTER_PATH var is used in cluster folder and points to the _kubevirtci where the cluster is deployed from.

cluster/up.sh

+4-7
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,12 @@ $(cluster::path)/cluster-up/up.sh
2323

2424
echo 'Installing Open vSwitch on nodes'
2525
for node in $(./cluster/kubectl.sh get nodes --no-headers | awk '{print $1}'); do
26-
./cluster/cli.sh ssh ${node} -- sudo dnf install -y centos-release-nfv-openvswitch
27-
./cluster/cli.sh ssh ${node} -- sudo dnf install -y openvswitch2.16 dpdk
2826
./cluster/cli.sh ssh ${node} -- sudo systemctl daemon-reload
27+
./cluster/cli.sh ssh ${node} -- sudo systemctl enable openvswitch
2928
./cluster/cli.sh ssh ${node} -- sudo systemctl restart openvswitch
29+
./cluster/cli.sh ssh ${node} -- sudo systemctl restart NetworkManager
3030
done
3131

3232
echo 'Deploying multus'
33-
curl https://raw.githubusercontent.com/k8snetworkplumbingwg/multus-cni/v3.9.1/deployments/multus-daemonset.yml -o cluster/multus-daemonset.yml
34-
MULTUS_IMAGE=ghcr.io/k8snetworkplumbingwg/multus-cni:v3.9
35-
sed -i "s#ghcr.io/k8snetworkplumbingwg/multus-cni:stable\$#$MULTUS_IMAGE#" cluster/multus-daemonset.yml
36-
./cluster/kubectl.sh create -f cluster/multus-daemonset.yml
37-
./cluster/kubectl.sh -n kube-system wait --for=condition=ready -l name=multus pod --timeout=300s
33+
./cluster/kubectl.sh apply -f https://raw.githubusercontent.com/k8snetworkplumbingwg/multus-cni/v4.0.1/deployments/multus-daemonset-thick.yml
34+
./cluster/kubectl.sh -n kube-system rollout status daemonset kube-multus-ds --timeout 300s

0 commit comments

Comments
 (0)