From 22910423d6da9253a95242fe35e4d963948d57a6 Mon Sep 17 00:00:00 2001 From: Adam Saleh Date: Wed, 10 Mar 2021 21:25:18 +0100 Subject: [PATCH] Using tasks instead of roles in AMO installation. --- .../openshift-apps/application-monitoring.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/playbooks/openshift-apps/application-monitoring.yml b/playbooks/openshift-apps/application-monitoring.yml index 93d7ce9c24..a7c44dde9a 100644 --- a/playbooks/openshift-apps/application-monitoring.yml +++ b/playbooks/openshift-apps/application-monitoring.yml @@ -14,18 +14,17 @@ app: application-monitoring description: Hosts the application monitoring operator appowners: - - cverna + - cverNegronina - pingou - asaleh + post_tasks: - name: Apply node labels command: oc label namespace application-monitoring monitoring-key=middleware - - role: openshift/object - app: application-monitoring - file: application-monitoring/deploy/crds/applicationmonitoring.integreatly.org_applicationmonitorings_crd.yaml - objectname: applicationmonitoring.integreatly.org_applicationmonitorings_crd.yaml - + - name: AMO CRD + command: oc -n application-monitoring apply -f {{roles_path}}/openshift-apps/{{app}}/files/application-monitoring-operator/deploy/crds/applicationmonitoring.integreatly.org_applicationmonitorings_crd.yaml + - name: AMO Cluster Roles & RoleBindings command: oc -n application-monitoring apply -f {{roles_path}}/openshift-apps/{{app}}/files/application-monitoring-operator/deploy/cluster-roles @@ -41,10 +40,8 @@ - name: AMO Cluster Roles & RoleBindings - role_binding.yaml command: oc -n application-monitoring apply -f {{roles_path}}/openshift-apps/{{app}}/files/application-monitorin-operatorg/deploy/role_binding.yaml - - role: openshift/object - app: application-monitoring - file: application-monitoring/deploy/crds/applicationmonitoring.integreatly.org_blackboxtargets_crd.yaml - objectname: applicationmonitoring.integreatly.org_blackboxtargets_crd.yaml + - name: AMO CRD - BLACKBOX + command: oc -n application-monitoring apply -f {{roles_path}}/openshift-apps/{{app}}/files/application-monitoring-operator/deploy/crds/applicationmonitoring.integreatly.org_blackboxtargets_crd.yaml - name: Grafana CRDs - Grafana.yml command: oc -n application-monitoring apply -f {{roles_path}}/openshift-apps/{{app}}/files/grafana-operator/deploy/crds/Grafana.yaml