Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WiP: ocp4_workload_gitops_bootstrap: if desired, combine user_data with deployer_values #9037

Draft
wants to merge 1 commit into
base: development
Choose a base branch
from
+27 −0
Draft

WiP: ocp4_workload_gitops_bootstrap: if desired, combine user_data with deployer_values #9037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ansible/roles_ocp_workloads/ocp4_workload_gitops_bootstrap/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ ocp4_workload_gitops_bootstrap_namespace: openshift-gitops
# Helm values to override in the ArgoCD bootstrap application.
ocp4_workload_gitops_bootstrap_helm_values: []

# WiP tasks to send all the user_data to the bootstrap application
# so it can be used in an app to be passed onto addon/showroom
ocp4_workload_gitops_bootstrap_include_user_data: false
ocp4_workload_gitops_bootstrap_passthrough_user_data: false

ocp4_workload_gitops_bootstrap_health_retries: 60
ocp4_workload_gitops_bootstrap_health_ignore: true

Expand Down
17 changes: 17 additions & 0 deletions ...oles_ocp_workloads/ocp4_workload_gitops_bootstrap/tasks/prepare_multi_user_variables.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
- name: Set passthrough variables into per-user data, if desired
when:
- agnosticd_passthrough_user_data is defined
- ocp4_workload_gitops_bootstrap_passthrough_user_data is true | default(false) | bool
agnosticd_user_info:
data: "{{ agnosticd_passthrough_user_data | default('', true) }}"
user: "user{{ n }}"
loop: "{{ range(1, num_users | int + 1) | list }}"
loop_control:
loop_var: n

- name: Combine with all user_data
ansible.builtin.set_fact:
_ocp4_workload_gitops_bootstrap_deployer_values: |
{{ _ocp4_workload_gitops_bootstrap_deployer_values |
combine( _gitops_user_lookup('agnosticd_user_data', '*') )}}"
5 changes: 5 additions & 0 deletions ansible/roles_ocp_workloads/ocp4_workload_gitops_bootstrap/tasks/workload.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@
domain: "{{ r_ingress.resources[0].status.domain }}"
apiUrl: "{{ r_infra.resources[0].status.apiServerURL }}"

- name: Prepare multi-user variables
when: ocp4_workload_gitops_bootstrap_include_user_data | bool
ansible.bulitin.include_tasks:
file: prepare_multi_user_variables.yaml

- name: print _ocp4_workload_gitops_bootstrap_deployer_values
ansible.builtin.debug:
msg: "{{ _ocp4_workload_gitops_bootstrap_deployer_values | to_yaml }}"
Expand Down
Loading