Skip to content

Commit 482e94d

Browse files
committed
[edpm_deploy_baremetal] 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 Signed-off-by: Jaromir Wysoglad <jwysogla@redhat.com>
1 parent 240c126 commit 482e94d

4 files changed

Lines changed: 50 additions & 6 deletions

File tree

ci/playbooks/multinode-customizations.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,10 @@
213213

214214
- name: Set insecure registry on crc node
215215
ansible.builtin.include_tasks: tasks/set_crc_insecure_registry.yml
216-
when: content_provider_registry_ip is defined or cifmw_crc_registry_mirror_content is defined
216+
when: >-
217+
content_provider_registry_ip is defined or
218+
cifmw_crc_registry_mirror_content is defined or
219+
cifmw_crc_additional_insecure_registries is defined
217220
218221
- hosts: controller
219222
name: "Tweak Controller"

ci/playbooks/tasks/set_crc_insecure_registry.yml

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,14 @@
3838
image.config.openshift.io/cluster
3939
loop: "{{ cifmw_crc_additional_allowed_registries }}"
4040

41+
- name: Add additional insecure registries
42+
when: cifmw_crc_additional_insecure_registries is defined
43+
ansible.builtin.shell: |
44+
oc patch --type=json \
45+
--patch='[{"op": "add", "path": "/spec/registrySources/insecureRegistries/-", "value": "{{ item }}"}]' \
46+
image.config.openshift.io/cluster
47+
loop: "{{ cifmw_crc_additional_insecure_registries }}"
48+
4149
- name: Ensure registries.conf.d exists
4250
become: true
4351
when: cifmw_crc_registry_mirror_content is defined or content_provider_registry_ip is defined
@@ -61,6 +69,24 @@
6169
mirror-by-digest-only = false
6270
prefix = ""
6371
72+
- name: Set insecure registry in crio for additional registries
73+
become: true
74+
when: cifmw_crc_additional_insecure_registries is defined
75+
ansible.builtin.blockinfile:
76+
state: present
77+
insertafter: EOF
78+
marker: "# ANSIBLE MANAGED BLOCK - additional insecure registry: {{ item }}"
79+
dest: /etc/containers/registries.conf.d/99-insecure-registry.conf
80+
create: true
81+
content: |-
82+
[[registry]]
83+
location = "{{ item }}"
84+
insecure = true
85+
blocked = false
86+
mirror-by-digest-only = false
87+
prefix = ""
88+
loop: "{{ cifmw_crc_additional_insecure_registries }}"
89+
6490
- name: Set registry mirror override
6591
when: cifmw_crc_registry_mirror_content is defined
6692
become: true
@@ -72,7 +98,10 @@
7298
content: "{{ cifmw_crc_registry_mirror_content }}"
7399

74100
- name: Restart crio
75-
when: cifmw_crc_registry_mirror_content is defined or content_provider_registry_ip is defined
101+
when: >-
102+
cifmw_crc_registry_mirror_content is defined or
103+
content_provider_registry_ip is defined or
104+
cifmw_crc_additional_insecure_registries is defined
76105
become: true
77106
ansible.builtin.service:
78107
name: crio

hooks/playbooks/fetch_compute_facts.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,10 +256,16 @@
256256
- "{{ dns_server }}"
257257
{% endfor %}
258258
259-
{% if content_provider_registry_ip is defined %}
259+
{% if content_provider_registry_ip is defined or cifmw_crc_additional_insecure_registries is defined %}
260260
- op: add
261261
path: /spec/nodeTemplate/ansible/ansibleVars/edpm_container_registry_insecure_registries
262-
value: ["{{ content_provider_registry_ip }}:5001"]
262+
value:
263+
{% if content_provider_registry_ip is defined %}
264+
- "{{ content_provider_registry_ip }}:5001"
265+
{% endif %}
266+
{% for reg in cifmw_crc_additional_insecure_registries | default([]) %}
267+
- "{{ reg }}"
268+
{% endfor %}
263269
{% endif %}
264270
265271
- op: add

roles/edpm_deploy_baremetal/tasks/main.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,16 @@
127127
- target:
128128
kind: OpenStackDataPlaneNodeSet
129129
patch: |-
130-
{% if content_provider_registry_ip is defined %}
130+
{% if content_provider_registry_ip is defined or cifmw_crc_additional_insecure_registries is defined %}
131131
- op: add
132132
path: /spec/nodeTemplate/ansible/ansibleVars/edpm_container_registry_insecure_registries
133-
value: ["{{ content_provider_registry_ip }}:5001"]
133+
value:
134+
{% if content_provider_registry_ip is defined %}
135+
- "{{ content_provider_registry_ip }}:5001"
136+
{% endif %}
137+
{% for reg in cifmw_crc_additional_insecure_registries | default([]) %}
138+
- "{{ reg }}"
139+
{% endfor %}
134140
{% endif %}
135141
136142
{% if not cifmw_edpm_deploy_baremetal_bootc and not cifmw_edpm_deploy_baremetal_custom_bootstrap %}

0 commit comments

Comments
 (0)