Skip to content

Commit 19910b3

Browse files
[ci_gen_kustomize_values] Allow reject vars patches
1 parent 63f8e1b commit 19910b3

File tree

2 files changed

+19
-3
lines changed

2 files changed

+19
-3
lines changed

roles/ci_gen_kustomize_values/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ with a message.
3535
* `ci_gen_kustomize_fetch_ocp_state`: (Boolean) If true it enables generating CI templates based on the OCP state. Defaults to `true`.
3636
* `cifmw_ci_gen_kustomize_values_storage_class_prefix`: (String) Prefix for `storageClass` in generated values.yaml files. Defaults to `"lvms-"` only if `cifmw_use_lvms` is True, otherwise it defaults to `""`. The prefix is prepended to the `cifmw_ci_gen_kustomize_values_storage_class`. It is not recommended to override this value, instead set `cifmw_use_lvms` True or False.
3737
* `cifmw_ci_gen_kustomize_values_storage_class`: (String) Value for `storageClass` in generated values.yaml files. Defaults to `"lvms-local-storage"` only if `cifmw_use_lvms` is True, otherwise it defaults to `"local-storage"`.
38-
* `cifmw_ci_gen_kustomize_values_remove_keys_expressions`: (List) Remove keys matching the regular expressions from source ConfigMaps (values.yaml).
39-
Defaults to `["^nodes$", "^node(_[0-9]+)?$"]`.
38+
* `cifmw_ci_gen_kustomize_values_remove_keys_expressions*`: (List) Remove keys matching the regular expressions from source ConfigMaps (values.yaml).
39+
Defaults to `["^nodes$", "^node(_[0-9]+)?$"]`. Accepts passing additional expressions by passing variables that matches `cifmw_ci_gen_kustomize_values_remove_keys_expressions.+`.
4040

4141
### Specific parameters for edpm-values
4242
This configMap needs some more parameters in order to properly override the `architecture` provided one.

roles/ci_gen_kustomize_values/tasks/generate_snippets.yml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,22 @@
6969
cifmw_ci_gen_kustomize_values_snippets_dir_prefix ~ _datatype) |
7070
path_join
7171
}}
72+
_cifmw_gen_kustomize_values_reject_extra_expressions: >-
73+
{{
74+
hostvars[inventory_hostname] |
75+
dict2items |
76+
selectattr("key", "match", "^cifmw_ci_gen_kustomize_values_remove_keys_expressions.+") |
77+
sort(attribute='key') |
78+
map(attribute="value") |
79+
list
80+
}}
81+
_cifmw_gen_kustomize_values_reject_expressions: >-
82+
{{
83+
(
84+
_cifmw_gen_kustomize_values_reject_extra_expressions +
85+
cifmw_ci_gen_kustomize_values_remove_keys_expressions
86+
) | flatten | unique
87+
}}
7288
ansible.builtin.set_fact:
7389
values_datatype: "{{ _datatype }}"
7490
snippet_datadir: "{{ _dest_dir }}"
@@ -81,7 +97,7 @@
8197
{{
8298
_config_map_content |
8399
ansible.utils.remove_keys(
84-
target=cifmw_ci_gen_kustomize_values_remove_keys_expressions,
100+
target=_cifmw_gen_kustomize_values_reject_expressions,
85101
matching_parameter='regex')
86102
}}
87103
cacheable: false

0 commit comments

Comments
 (0)