openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Pin setuptools in CNI to 53.0.0-10.el9 

Looks like RDO repos upgrade setuptools to version that creates a
problem when we attempt to upgrade it through pip. This commit pins
RPM setuptools to a version available in baseos repos.

This isn't really a great solution, we should probably just start
running in a virtualenv, but let's try to unblock the gates with this
thing.

Change-Id: I0b9e02ef1e9227497082a4a3cd803c52ad2789fb
This commit is contained in:
Michał Dulko 2022-06-08 14:47:45 +02:00
parent 846f158724
commit be428a5b4b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cni.Dockerfile
View File

@ -13,7 +13,7 @@ ARG OSLO_LOCK_PATH=/var/kuryr-lock
ARG RDO_REPO=https://repos.fedorapeople.org/repos/openstack/openstack-yoga/rdo-release-yoga-1.el9s.noarch.rpm
RUN dnf upgrade -y && dnf install -y epel-release $RDO_REPO \
&& dnf install -y --setopt=tsflags=nodocs python3-pip openvswitch sudo iproute libstdc++ pciutils kmod-libs \
&& dnf install -y --setopt=tsflags=nodocs python3-pip python3-setuptools-53.0.0-10.el9 openvswitch sudo iproute pciutils kmod-libs \
&& dnf install -y --setopt=tsflags=nodocs gcc gcc-c++ python3-devel git
COPY . /opt/kuryr-kubernetes