Unified Annotation Handling without Duplicates #1821
Conversation
| @@ -44,11 +44,14 @@ spec: | |||
| ] %} | |||
| checksum-secret-{{ secret }}: "{{ lookup('ansible.builtin.vars', secret, default='')["resources"][0]["data"] | default('') | sha1 }}" | |||
| {% endfor %} | |||
| {% if web_annotations %} | |||
| {{ web_annotations | indent(width=8) }} | |||
There was a problem hiding this comment.
This case was only accepting one single annotation, In our case we need multiple lines
| {% if web_annotations %} | ||
| {{ web_annotations | indent(width=8) }} | ||
| {% elif annotations %} | ||
| {{ annotations | indent(width=8) }} |
There was a problem hiding this comment.
even worse that 'elif' case was completely overided by web_annotation...
| {% endif %} | ||
| {% set combined_annotations = web_annotations + annotations %} | ||
| {% set seen = [] %} | ||
| {% for annotation in combined_annotations %} |
There was a problem hiding this comment.
very elegant way to factorize code with minimum impact
|
Could you please clarify your first issue, and provide actual AWX CR that can reproduce your issue? How you've tested this PR? |
Typo fix Update web.yaml.j2 Auteur : alexiseichst <45386670+alexiseichst@users.noreply.github.com> Date : Thu Apr 11 15:53:19 2024 +0200
…ion. Signed-off-by: Robin Segura <robin.segura-ext@pole-emploi.fr>
Ajout du task et facto de tes commit
There was a problem hiding this comment.
Thanks for the PR @alexiseichst
My only note is that it might be nice to have a note in the docs here about how the annotations will now be merged:
And also add entries for task_annotations and web_annotations in the doc.
Feel free to add this in a follow-up PR if you agree.
|
@alexiseichst I think we should add these same changes to the task deployment before merging. And CI is currently failing. This PR needs more attention before it can be merged. |
The objective here is to manage multiple entries and unify web_annotations and annotations while avoiding duplicates.
ISSUE TYPE