Skip to content

Commit

Permalink
fix typo in supported images code
Browse files Browse the repository at this point in the history
  • Loading branch information
jmazzitelli committed Nov 2, 2023
1 parent 622c13a commit 793a2ff
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion playbooks/ossmconsole-default-supported-images.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
default: {"imageName": "quay.io/kiali/ossmconsole", "imageVersion": "operator_version"}
v1.73: {"image_name": "quay.io/kiali/ossmconsole", "image_version": "v1.73"}
v1.73: {"imageName": "quay.io/kiali/ossmconsole", "imageVersion": "v1.73"}
4 changes: 2 additions & 2 deletions playbooks/ossmconsole-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

- name: Override the supported images if found in the environment
set_fact:
supported_ossmconsole_images: "{{ supported_ossmconsole_images | default({}) | combine({item.key: {'image_name': lookup('env', 'RELATED_IMAGE_ossmconsole_' + (item.key | replace('.','_'))) | regex_replace('(.+):.+', '\\1'), 'image_version': lookup('env', 'RELATED_IMAGE_ossmconsole_' + (item.key | replace('.','_'))) | regex_replace('.+:(.+)', '\\1')}}, recursive=True) }}"
supported_ossmconsole_images: "{{ supported_ossmconsole_images | default({}) | combine({item.key: {'imageName': lookup('env', 'RELATED_IMAGE_ossmconsole_' + (item.key | replace('.','_'))) | regex_replace('(.+):.+', '\\1'), 'imageVersion': lookup('env', 'RELATED_IMAGE_ossmconsole_' + (item.key | replace('.','_'))) | regex_replace('.+:(.+)', '\\1')}}, recursive=True) }}"
loop: "{{ supported_ossmconsole_images | default({}) | dict2items }}"
when:
- lookup('env', 'RELATED_IMAGE_ossmconsole_' + (item.key | replace('.','_')))
Expand All @@ -39,7 +39,7 @@
vars:
supported_image_env: "{{ lookup('env', 'RELATED_IMAGE_ossmconsole_' + (version | replace('.','_'))) }}"
set_fact:
supported_ossmconsole_images: "{{ supported_ossmconsole_images | default({}) | combine({version: {'image_name': supported_image_env | regex_replace('(.+):.+', '\\1'), 'image_version': supported_image_env | regex_replace('.+:(.+)', '\\1')}}, recursive=True) }}"
supported_ossmconsole_images: "{{ supported_ossmconsole_images | default({}) | combine({version: {'imageName': supported_image_env | regex_replace('(.+):.+', '\\1'), 'imageVersion': supported_image_env | regex_replace('.+:(.+)', '\\1')}}, recursive=True) }}"
when:
- supported_image_env is defined
- supported_image_env != ""
Expand Down

0 comments on commit 793a2ff

Please sign in to comment.