Skip to content

Revert "build(deps): bump ansible from 2.9.15 to 2.10.0 #4735

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

Closed
wants to merge 1 commit into from
Closed

Revert "build(deps): bump ansible from 2.9.15 to 2.10.0 #4735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions changelog/fragments/ansible-2.10.7.yaml
View file
Open in desktop

This file was deleted.

6 changes: 1 addition & 5 deletions images/ansible-operator/Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,8 @@ ansible-runner = "==1.4.6"
ansible-runner-http = "==1.0.0"
ipaddress = "==1.0.23"
openshift = "==0.11.2"
ansible = "==2.10.7"
ansible = "==2.9.15"
jmespath = "==0.10.0"
# cryptography needs to be pinned to 3.3.2 as this is the last version
# before its setup requires rust, which is not available via RPM in the
# base image. This pin should be re-evaluated once the base image is updated.
cryptography = "==3.3.2"

[dev-packages]

Expand Down
85 changes: 11 additions & 74 deletions images/ansible-operator/Pipfile.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions images/ansible-operator/base.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ RUN mkdir -p /etc/ansible \
&& echo 'roles_path = /opt/ansible/roles' >> /etc/ansible/ansible.cfg \
&& echo 'library = /usr/share/ansible/openshift' >> /etc/ansible/ansible.cfg

# Install python dependencies
# Ensure fresh metadata rather than cached metadata in the base by running
# yum clean all && rm -rf /var/yum/cache/* first
# Copy python dependencies specs to be installed using Pipenv
COPY Pipfile* ./
# Instruct pip(env) not to keep a cache of installed packages,
Expand All @@ -19,10 +22,10 @@ COPY Pipfile* ./
ENV PIP_NO_CACHE_DIR=1 \
PIPENV_SYSTEM=1 \
PIPENV_CLEAR=1
# Ensure fresh metadata rather than cached metadata, install system and pip python deps,
# and remove those not needed at runtime.
# Ensure fresh metadata rather than cached metadata in the base by running
# yum clean all && rm -rf /var/yum/cache/* first
RUN yum clean all && rm -rf /var/cache/yum/* \
&& yum update -y \
&& yum -y update \
&& yum install -y libffi-devel openssl-devel python38-devel gcc python38-pip python38-setuptools \
&& pip3 install pipenv==2020.11.15 \
&& pipenv install --deploy \
Expand Down