Skip to content

comments for role improvement for mutli-tenant #48

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

Draft
newgoliath wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

comments for role improvement for mutli-tenant #48

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
12 changes: 9 additions & 3 deletions roles/ocp4_workload_gitops_bootstrap/tasks/workload.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
domain: "{{ openshift_cluster_ingress_domain }}"
apiUrl: "{{ openshift_api_url }}"

# TODO: validate syntax of incoming application name
# TODO: maybe use Argo to add label for all resources created for this tenant
# for cleanup purposes. Maybe name of application becomes part of a label/annotation.

- name: Debug _ocp4_workload_gitops_bootstrap_deployer_values
ansible.builtin.debug:
msg: "{{ _ocp4_workload_gitops_bootstrap_deployer_values | to_yaml }}"
Expand All @@ -19,7 +23,7 @@
kubernetes.core.k8s_info:
api_version: argoproj.io/v1alpha1
kind: Application
name: bootstrap
name: bootstrap # variable
namespace: openshift-gitops
register: argocd_bootstrap
retries: "{{ ocp4_workload_gitops_bootstrap_health_retries }}"
Expand All @@ -33,6 +37,7 @@
- argocd_bootstrap.resources[0].status.sync.status == "Synced"
ignore_errors: "{{ ocp4_workload_gitops_bootstrap_health_ignore | bool }}"

# consider removing - test without and if validation below is enough.
- name: Pause for a minute while the bootstrap app deploys
ansible.builtin.pause:
seconds: 60
Expand All @@ -43,7 +48,7 @@
api_version: argoproj.io/v1alpha1
kind: Application
label_selectors:
- "demo.redhat.com/application"
- "demo.redhat.com/application" # add extra label lookup based on what Argo creates above for bootstrap application
register: _all_apps
delay: 10
retries: "{{ ocp4_workload_gitops_bootstrap_application_health_retries }}"
Expand All @@ -56,14 +61,15 @@

#######
####### Begin processing GitOps output
####### Consider removing
#######

- name: Retrieve ConfigMaps with the demo.redhat.com/userinfo label
kubernetes.core.k8s_info:
api_version: v1
kind: ConfigMap
label_selectors:
- "demo.redhat.com/userinfo"
- "demo.redhat.com/userinfo" # as in application: add extra label lookup based on what Argo creates above for bootstrap application
register: cm_userinfo

- name: If ConfigMaps were found, process them
Expand Down