Skip to content

Deprecation of image tag vs tags in controller EE definition #256

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
j-random-geek wants to merge 5 commits into from
Closed

Deprecation of image tag vs tags in controller EE definition #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ef040d5
Tweak controller_execution_environments variable construction to use …
j-random-geek Apr 30, 2026
3208a30
Update README for ee_create_controller_def tags handling
j-random-geek Apr 30, 2026
26afd41
Linting fix (long line)
j-random-geek Apr 30, 2026
c23bc97
Change ee_aap_version from str to float in README. Putting it in quot…
j-random-geek May 1, 2026
8cd3cef
Tweak list detection in ee_controller.yaml.j2 template
j-random-geek May 1, 2026
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
4 changes: 2 additions & 2 deletions roles/ee_builder/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Best practice is to use the default images, unless needing to pull from another
|`ee_pull_collections_from_hub`|true|no|bool|Whether or not to pull collections from a specific hub for use in building an Execution Environment. This will create entries that adds the ansible.cfg file into the EE. These can be hidden using environment variables as detailed [in this article](https://developers.redhat.com/articles/2025/01/23/strategies-eliminating-ansible-hardcoded-credentials)||
|`ee_ah_host`|`aap_hostname`|no|str|Host to use for ansible config file. Alternative default is to use variable from infra.ah_configuration. (if AAP 2.5 use gateway host and infra.aap_configuration) Required if `ee_pull_collections_from_hub` is `True`.||
|`ee_ah_token`|`aap_token`|no|str|Token to use for ansible config file. Alternative default is to use variable from infra.ah_configuration. Required if `ee_pull_collections_from_hub` is `True`.||
|`ee_aap_version`|`2.4`|no|str|Changes what API endpoint to point to depending on AAP version||
|`ee_aap_version`|`2.4`|no|float|Changes what API endpoint to point to depending on AAP version||
|`ee_create_controller_def`|false|no|bool|Option to create the 'controller_execution_environments' definition for use by the infra.controller_configuration role||

### Execution environment list
Expand All @@ -79,7 +79,7 @@ It takes variables from the following sections the list variables section.
|:---:|:---:|:---:|:---:|
|`name`||yes|Name of the ee image to create. Only the name goes here, the namespace goes in the ee_registry_dest variable|
|`tag`||no|[DEPRECATED] Tag to use when pushing the image.|
|`tags`||no|A list of tags to use when pushing the image.|
|`tags`||no|A list of tags to use when pushing the image. If `ee_create_controller_def` is `true`, the first tag in the list will be used as the tag in the Controller EE definition. |
|`dependencies`|dict|no|This section allows you to describe any dependencies that will need to be installed into the final image. Reference [builder dependencies documentation](https://ansible.readthedocs.io/projects/builder/en/stable/definition/#dependencies), examples and our examples for its structure.|
|`build_steps`|dict|no|This section enables you to specify custom build commands for any build phase. Reference [builder build_steps documentation](https://ansible.readthedocs.io/projects/builder/en/stable/definition/#additional-build-steps), examples and our examples for its structure.|
|`build_items`|list|no|This is a list of files or folders that will be copied to the working directory for use with the build files. Example below.|
Expand Down
4 changes: 3 additions & 1 deletion roles/ee_builder/tasks/00_build_ee.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@

- name: Pull base image
containers.podman.podman_image:
name: "{{ __execution_environment_definition.images.base_image.name | default(__execution_environment_definition.images.base_image) | default(__execution_environment_definition.base_image) | default(ee_base_image) }}"
name: "{{ __execution_environment_definition.images.base_image.name |
default(__execution_environment_definition.images.base_image) |
default(__execution_environment_definition.base_image) | default(ee_base_image) }}"
username: "{{ ee_base_registry_username | default(omit, true) }}"
password: "{{ ee_base_registry_password | default(omit, true) }}"
validate_certs: "{{ ee_validate_certs | default(omit) }}"
Expand Down
2 changes: 1 addition & 1 deletion roles/ee_builder/templates/ee_controller.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
controller_execution_environments:
{% for exec_env in ee_list %}
- name: {{ exec_env.alt_name | default(exec_env.name)}}
image: {{ ee_registry_dest }}/{{ exec_env.name }}{% if exec_env.tag is defined %}:{{ exec_env.tag }}{% endif %}
image: {{ ee_registry_dest }}/{{ exec_env.name }}{% if exec_env.tags is defined and exec_env.tags is iterable and (exec_env.tags is not string and exec_env.tags is not mapping) and (exec_env.tags | count) > 0 %}:{{ exec_env.tags[0] }}{% elif exec_env.tag is defined %}:{{ exec_env.tag }}{% endif %}

{% if exec_env.description is defined %}
description: {{ exec_env.description }}
Expand Down