Skip to content

[release-4.19] CORENET-5975: Dockerfile: Unpin OVS and consume the latest from FDP. #2548

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

Open
wants to merge 1 commit into
base: release-4.19
Choose a base branch
from
Open

[release-4.19] CORENET-5975: Dockerfile: Unpin OVS and consume the latest from FDP. #2548

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions Dockerfile.base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,28 @@ RUN dnf --setopt=retries=2 --setopt=timeout=2 install -y --nodocs \
selinux-policy procps-ng && \
dnf clean all

ARG ovsver=3.5.0-0.9.el9fdp
# NOTE: OVS is not pinned to a particular patch version in order to stay in
# sync with the OVS running on the host (it is not strictly necessary, but
# reduces the number of variables in the system) and receive all the CVE and
# bug fixes automatically.
ARG ovsver=3.5
ARG ovnver=24.09.2-41.el9fdp
# NOTE: Ensure that the versions of OVS and OVN are overriden for OKD in each of the subsequent layers.
# Centos and RHEL releases for ovn are built out of sync, so please make sure to bump for OKD with
# the corresponding Centos version when updating the OCP version.
ARG ovsver_okd=3.5.0-10.el9s
ARG ovsver_okd=3.5
# We are not bumping the OVN version for OKD since the FDP release is not done yet.
ARG ovnver_okd=24.09.1-10.el9s

RUN INSTALL_PKGS="iptables nftables" && \
source /etc/os-release && \
[ "${ID}" == "centos" ] && ovsver=$ovsver_okd && ovnver=$ovnver_okd; \
ovsver_short=$(echo "$ovsver" | cut -d'.' -f1,2) && \
ovnver_short=$(echo "$ovnver" | cut -d'.' -f1,2) && \
dnf --setopt=retries=2 --setopt=timeout=2 install -y --nodocs $INSTALL_PKGS && \
dnf --setopt=retries=2 --setopt=timeout=2 install -y --nodocs "openvswitch$ovsver_short = $ovsver" "python3-openvswitch$ovsver_short = $ovsver" && \
dnf --setopt=retries=2 --setopt=timeout=2 install -y --nodocs "openvswitch$ovsver" "python3-openvswitch$ovsver" && \
dnf --setopt=retries=2 --setopt=timeout=2 install -y --nodocs "ovn$ovnver_short = $ovnver" "ovn$ovnver_short-central = $ovnver" "ovn$ovnver_short-host = $ovnver" && \
dnf clean all && rm -rf /var/cache/* && \
sed 's/%/"/g' <<<"%openvswitch$ovsver_short-devel = $ovsver% %openvswitch$ovsver_short-ipsec = $ovsver% %ovn$ovnver_short-vtep = $ovnver%" > /more-pkgs
sed 's/%/"/g' <<<"%openvswitch$ovsver-devel% %openvswitch$ovsver-ipsec% %ovn$ovnver_short-vtep = $ovnver%" > /more-pkgs

RUN mkdir -p /var/run/openvswitch && \
mkdir -p /var/run/ovn && \
Expand Down