Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: bump to fedora:38 in dockerized tests, because 34 is missing, bump Multus, OVS, and kubevirtci #268

Merged
merged 2 commits into from
May 10, 2023
Merged

fix: bump to fedora:38 in dockerized tests, because 34 is missing, bump Multus, OVS, and kubevirtci #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ca57aa
fix: bump to fedora:38 in dockerized tests, because 34 is missing
courtland May 5, 2023
e1fbdb2
Bump kubevirtci, Multus and OVS
phoracek May 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion automation/check-patch.e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
4 changes: 2 additions & 2 deletions cluster/cluster.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
11 changes: 4 additions & 7 deletions cluster/up.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment on lines 26 to +29
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sudo systemctl enable --now openvswitch
should be enough right ?
this what we are doing on CNAO
the cluster is recreated from scratch, so the file system is refreshed and NM is fresh started as well

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
2 changes: 1 addition & 1 deletion hack/docker-builder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/fedora/fedora:34-x86_64
FROM quay.io/fedora/fedora:38-x86_64

RUN dnf -y install make git sudo gcc rsync-daemon rsync openvswitch hostname && \
dnf -y clean all
Expand Down