From 65d309c43e523963ff3a0ba2704921e59c2621a9 Mon Sep 17 00:00:00 2001 From: Jaromir Wysoglad Date: Wed, 15 Apr 2026 08:50:24 +0000 Subject: [PATCH 1/2] Add mysqld_exporter and podman-exporter image overrides Add ceilometerMysqldExporterImage and edpmPodmanExporterImage fields to the update_containers template. This allows Zuul content-provider jobs for mysqld_exporter and prometheus-podman-exporter to override the container images used in functional tests via the OpenStackVersion custom resource. Generated-By: Claude-Code claude-opus-4-6 --- roles/edpm_prepare/tasks/kustomize_and_deploy.yml | 5 ++++- roles/update_containers/templates/update_containers.j2 | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/roles/edpm_prepare/tasks/kustomize_and_deploy.yml b/roles/edpm_prepare/tasks/kustomize_and_deploy.yml index 3267e4dee..caa147c7e 100644 --- a/roles/edpm_prepare/tasks/kustomize_and_deploy.yml +++ b/roles/edpm_prepare/tasks/kustomize_and_deploy.yml @@ -38,7 +38,10 @@ (cifmw_update_containers_openstack is defined and cifmw_update_containers_openstack | bool) or (cifmw_update_containers_watcher is defined and - cifmw_update_containers_watcher | bool)) + cifmw_update_containers_watcher | bool) or + (cifmw_update_containers_ceilometersgcoreImage is defined) or + (cifmw_update_containers_ceilometermysqldexporterImage is defined) or + (cifmw_update_containers_edpmpodmanexporterImage is defined)) vars: cifmw_update_containers_metadata: "{{ _ctlplane_name }}" ansible.builtin.include_role: diff --git a/roles/update_containers/templates/update_containers.j2 b/roles/update_containers/templates/update_containers.j2 index ff71612ce..0520b2a14 100644 --- a/roles/update_containers/templates/update_containers.j2 +++ b/roles/update_containers/templates/update_containers.j2 @@ -116,6 +116,12 @@ spec: {% if cifmw_update_containers_edpmnodeexporterimage is defined %} edpmNodeExporterImage: {{ cifmw_update_containers_edpmnodeexporterimage }} {% endif %} +{% if cifmw_update_containers_ceilometermysqldexporterImage is defined %} + ceilometerMysqldExporterImage: {{ cifmw_update_containers_ceilometermysqldexporterImage }} +{% endif %} +{% if cifmw_update_containers_edpmpodmanexporterImage is defined %} + edpmPodmanExporterImage: {{ cifmw_update_containers_edpmpodmanexporterImage }} +{% endif %} {% if cifmw_update_containers_agentimage is defined %} agentImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/{{ cifmw_update_containers_name_prefix }}-baremetal-operator-agent:{{ cifmw_update_containers_tag }} {% endif %} From 98f4b2c0719b599ec81bf5ab88c2d42d1d4d3c5a Mon Sep 17 00:00:00 2001 From: Jaromir Wysoglad Date: Fri, 17 Apr 2026 09:47:40 +0000 Subject: [PATCH 2/2] Add cifmw_crc_additional_insecure_registries support Allow content-provider jobs to register additional insecure registries on the CRC node via zuul_return. This patches insecureRegistries in image.config.openshift.io/cluster and configures crio, paralleling the existing cifmw_crc_additional_allowed_registries mechanism. Generated-By: Claude-Code claude-opus-4-6 --- ci/playbooks/multinode-customizations.yml | 5 ++- .../tasks/set_crc_insecure_registry.yml | 31 ++++++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/ci/playbooks/multinode-customizations.yml b/ci/playbooks/multinode-customizations.yml index eb26396ab..6f085a230 100644 --- a/ci/playbooks/multinode-customizations.yml +++ b/ci/playbooks/multinode-customizations.yml @@ -213,7 +213,10 @@ - name: Set insecure registry on crc node ansible.builtin.include_tasks: tasks/set_crc_insecure_registry.yml - when: content_provider_registry_ip is defined or cifmw_crc_registry_mirror_content is defined + when: >- + content_provider_registry_ip is defined or + cifmw_crc_registry_mirror_content is defined or + cifmw_crc_additional_insecure_registries is defined - hosts: controller name: "Tweak Controller" diff --git a/ci/playbooks/tasks/set_crc_insecure_registry.yml b/ci/playbooks/tasks/set_crc_insecure_registry.yml index d57cefd91..fe71e4adf 100644 --- a/ci/playbooks/tasks/set_crc_insecure_registry.yml +++ b/ci/playbooks/tasks/set_crc_insecure_registry.yml @@ -38,6 +38,14 @@ image.config.openshift.io/cluster loop: "{{ cifmw_crc_additional_allowed_registries }}" +- name: Add additional insecure registries + when: cifmw_crc_additional_insecure_registries is defined + ansible.builtin.shell: | + oc patch --type=json \ + --patch='[{"op": "add", "path": "/spec/registrySources/insecureRegistries/-", "value": "{{ item }}"}]' \ + image.config.openshift.io/cluster + loop: "{{ cifmw_crc_additional_insecure_registries }}" + - name: Ensure registries.conf.d exists become: true when: cifmw_crc_registry_mirror_content is defined or content_provider_registry_ip is defined @@ -61,6 +69,24 @@ mirror-by-digest-only = false prefix = "" +- name: Set insecure registry in crio for additional registries + become: true + when: cifmw_crc_additional_insecure_registries is defined + ansible.builtin.blockinfile: + state: present + insertafter: EOF + dest: /etc/containers/registries.conf.d/99-insecure-registry.conf + create: true + marker: "# {mark} ANSIBLE MANAGED BLOCK {{ item }}" + content: |- + [[registry]] + location = "{{ item }}" + insecure = true + blocked = false + mirror-by-digest-only = false + prefix = "" + loop: "{{ cifmw_crc_additional_insecure_registries }}" + - name: Set registry mirror override when: cifmw_crc_registry_mirror_content is defined become: true @@ -72,7 +98,10 @@ content: "{{ cifmw_crc_registry_mirror_content }}" - name: Restart crio - when: cifmw_crc_registry_mirror_content is defined or content_provider_registry_ip is defined + when: >- + cifmw_crc_registry_mirror_content is defined or + content_provider_registry_ip is defined or + cifmw_crc_additional_insecure_registries is defined become: true ansible.builtin.service: name: crio