Skip to content

Commit f54e952

Browse files
committed
Collect image for OpenStack init controller pod separately
1 parent c2e4f9f commit f54e952

File tree

1 file changed

+22
-1
lines changed

1 file changed

+22
-1
lines changed

roles/env_op_images/tasks/main.yml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,8 @@
120120
selected_pods: "{{ pod_list.resources |
121121
rejectattr('metadata.generateName', 'contains', 'openstack-operator-index-') |
122122
rejectattr('metadata.generateName', 'contains', 'rabbitmq-cluster-operator-') |
123-
rejectattr('metadata.generateName', 'contains', 'watcher-operator-index-')
123+
rejectattr('metadata.generateName', 'contains', 'watcher-operator-index-') |
124+
rejectattr('metadata.generateName', 'contains', 'openstack-operator-controller-operator-')
124125
}}"
125126

126127
- name: Add operator images to the dictionary
@@ -139,6 +140,26 @@
139140
loop_control:
140141
label: "{{ item.metadata.name }}"
141142

143+
# Special case: separately get image for OpenStack init controller manager, since it only has 1 container
144+
# and therefore cannot be collected in the task above (which would reference a non-existent second container
145+
# and throw an error)
146+
- name: Get OpenStack init operator image
147+
when:
148+
- not cifmw_env_op_images_dryrun | bool
149+
- pod_list.resources | selectattr('metadata.generateName', 'contains', 'openstack-operator-controller-operator-') | list | length != 0
150+
vars:
151+
selected_pod: "{{ pod_list.resources | selectattr('metadata.generateName', 'contains', 'openstack-operator-controller-operator-') | list | first }}"
152+
ansible.builtin.set_fact:
153+
cifmw_openstack_operator_images_content: >-
154+
{{
155+
cifmw_openstack_operator_images_content |
156+
combine(
157+
{
158+
selected_pod.metadata.labels['openstack.org/operator-name'] | upper ~ '_OP_IMG': selected_pod.status.containerStatuses[0].imageID
159+
}
160+
)
161+
}}
162+
142163
- name: Write images to file
143164
vars:
144165
_content:

0 commit comments

Comments
 (0)