Skip to content

Commit

Permalink
Merge pull request #164 from infrawatch/STF-1274/bump-openshift-ansib…
Browse files Browse the repository at this point in the history
…le-operator-v4.17

Use openshift-ansible-operator 4.17 in SGO
  • Loading branch information
vkmc authored Nov 5, 2024
2 parents bcdd74d + 6643b5a commit 82d5b8b
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 1 deletion.
6 changes: 5 additions & 1 deletion build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/openshift/origin-ansible-operator:4.14
FROM quay.io/operator-framework/ansible-operator:v1.35.0

# temporarily switch to root user to adjust image layers
USER 0
Expand All @@ -8,6 +8,10 @@ USER 0
# -- cleans up the cached data from dnf to keep the image as small as possible
RUN dnf update -y --exclude=ansible* && dnf clean all && rm -rf /var/cache/dnf

COPY requirements.yml ${HOME}/requirements.yml
RUN ansible-galaxy collection install -r ${HOME}/requirements.yml \
&& chmod -R ug+rwx ${HOME}/.ansible

# switch back to user 1001 when running the base image (non-root)
USER 1001

Expand Down
41 changes: 41 additions & 0 deletions requirements.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# NOTE(vkmc) Great docs from https://github.com/jmazzitelli/kiali-operator/blob/master/requirements.yml
#
# This is the Ansible Galaxy requirements that need to be installed locally to be able to run
# the operator Ansible playbook locally.
#
# To install these into your local Ansible environment:
# ansible-galaxy collection install -r requirements.yml --force-with-deps
#
# Make sure these collections match that which is inside the Ansible Operator SDK base image.
# You can determine what collections are installed by looking in the base image like this:
#
# podman run \
# -it --rm --entrypoint '' \
# quay.io/openshift/origin-ansible-operator:4.13 \
# ls /opt/ansible/.ansible/collections/ansible_collections
#
# To determine the version of a specific collection, look at the MANIFEST.json:
#
# podman run \
# -it --rm --entrypoint '' \
# quay.io/openshift/origin-ansible-operator:4.13 \
# cat /opt/ansible/.ansible/collections/ansible_collections/kubernetes/core/MANIFEST.json | grep version
#
# It is best if you have the same version of Ansible installed locally as found in the base image. You can determine
# the version of Ansible in the base image via:
#
# podman run \
# -it --rm --entrypoint '' \
# quay.io/openshift/origin-ansible-operator:4.13 \
# ansible --version
#
# To install that version locally, you can git clone the source via:
# git clone -b v<ansible version> --depth 1 https://github.com/ansible/ansible.git
# and then set up your environment via:
# source ./ansible/hacking/env-setup -q

collections:
- name: kubernetes.core
version: 2.2.3
- name: operator_sdk.util
version: 0.4.0

0 comments on commit 82d5b8b

Please sign in to comment.