Skip to content

Commit

Permalink
[operator] bump operator base image to 4.17 / 1.35.0 (#835)
Browse files Browse the repository at this point in the history
* [operator] bump operator base image to 4.17 / 1.35.0
fixes: kiali/kiali#7856

* callback_whitelist is obsolete in the Ansible that is included in the ansible operator base image

* the profile_tasks is now in a non-core collection that we have to add
  • Loading branch information
jmazzitelli authored Oct 28, 2024
1 parent c90aaec commit 24f5deb
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 13 deletions.
7 changes: 1 addition & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,9 @@ OPERATOR_QUAY_TAG ?= ${OPERATOR_QUAY_NAME}:${OPERATOR_CONTAINER_VERSION}
DORP ?= docker

# The version of the SDK this Makefile will download if needed, and the corresponding base image
OPERATOR_SDK_VERSION ?= 1.31.0
OPERATOR_SDK_VERSION ?= 1.35.0
OPERATOR_BASE_IMAGE_VERSION ?= v${OPERATOR_SDK_VERSION}
OPERATOR_BASE_IMAGE_REPO ?= quay.io/operator-framework/ansible-operator
# These are what we really want - but origin-ansible-operator does not support multiarch today.
# When that is fixed, we want to use this image instead of the image above.
# See: https://issues.redhat.com/browse/DPTP-2946
#OPERATOR_BASE_IMAGE_VERSION ?= 4.15
#OPERATOR_BASE_IMAGE_REPO ?= quay.io/openshift/origin-ansible-operator

.PHONY: help
help: Makefile
Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ COPY requirements.yml ${HOME}/requirements.yml
RUN ansible-galaxy collection install -r ${HOME}/requirements.yml \
&& chmod -R ug+rwx ${HOME}/.ansible

RUN cp /etc/ansible/ansible.cfg ${HOME}/ansible-profiler.cfg && echo "callbacks_enabled = profile_tasks" >> ${HOME}/ansible-profiler.cfg && echo "callback_whitelist = profile_tasks" >> ${HOME}/ansible-profiler.cfg
RUN cp /etc/ansible/ansible.cfg ${HOME}/ansible-profiler.cfg && echo "callbacks_enabled = profile_tasks" >> ${HOME}/ansible-profiler.cfg
14 changes: 8 additions & 6 deletions requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,33 @@
# 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.
# Make sure these collections match that which is inside the downstream 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.15 \
# registry.redhat.io/openshift4/ose-ansible-rhel9-operator:v4.17 \
# ansible-galaxy collection list
#
# NOTE: for older base images, there is no "collection list" command; instead, run the command:
# NOTE: for older base images, ansible-galaxy had no "collection list" command; instead, run the command:
# ls /opt/ansible/.ansible/collections/ansible_collections
#
# To determine the version of a specific collection
#
# podman run \
# -it --rm --entrypoint '' \
# quay.io/openshift/origin-ansible-operator:4.15 \
# registry.redhat.io/openshift4/ose-ansible-rhel9-operator:v4.17 \
# ansible-galaxy collection list kubernetes.core
#
# NOTE: for older base images, there is no "collection list" command; instead, look at the MANIFEST.json:
# NOTE: for older base images, ansible-galaxy had no "collection list" command; instead, look at the MANIFEST.json:
# 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.15 \
# registry.redhat.io/openshift4/ose-ansible-rhel9-operator:v4.17 \
# ansible --version
#
# To install that version locally, you can git clone the source via:
Expand All @@ -46,4 +46,6 @@ collections:
version: 4.0.0
- name: operator_sdk.util
version: 0.5.0
- name: ansible.posix
version: 1.6.2

0 comments on commit 24f5deb

Please sign in to comment.