update missing change during rebase

openinfradev · Dec 21, 2021 · 8c258af · 8c258af
1 parent 896ff14
commit 8c258af
Showing 1 changed file with 20 additions and 7 deletions.
diff --git a/templates/decapod-apps/lma-uniformed-wftpl.yaml b/templates/decapod-apps/lma-uniformed-wftpl.yaml
@@ -53,7 +53,20 @@ spec:
   - name: deploy
     dag:
       tasks:
-      - name: operator
+      - name: prometheus-operator
+        templateRef:
+          name: create-application
+          template: installApps
+        arguments:
+          parameters: 
+          - name: list
+            value: |
+              [
+                { "app_group": "lma", "path": "prometheus-operator", "namespace": "lma" }
+              ]
+        dependencies: []
+
+      - name: eck-operator
         templateRef:
           name: create-application
           template: installApps
@@ -62,10 +75,10 @@ spec:
           - name: list
             value: |
               [
-                { "app_group": "lma", "path": "prometheus-operator", "namespace": "lma"  },
                 { "app_group": "lma", "path": "eck-operator", "namespace": "elastic-system" },
                 { "app_group": "lma", "path": "fluentbit-operator", "namespace": "lma" }
               ]
+        when: "{{workflow.parameters.logging_component}} == 'efk'"
         dependencies: []
 
       - name: logging-efk
@@ -82,7 +95,7 @@ spec:
                 { "app_group": "lma", "path": "kubernetes-event-exporter", "namespace": "lma" }
               ]
         when: "{{workflow.parameters.logging_component}} == 'efk'"
-        dependencies: [operator]
+        dependencies: [eck-operator]
 
       - name: logging-loki
         templateRef:
@@ -93,9 +106,9 @@ spec:
           - name: list
             value: |
               [
-                { "path": "loki", "namespace": "lma" },
-                { "path": "promtail", "namespace": "lma" },
-                { "path": "kubernetes-event-exporter", "namespace": "lma" }
+                { "app_group": "lma", "path": "loki", "namespace": "lma" },
+                { "app_group": "lma", "path": "promtail", "namespace": "lma" },
+                { "app_group": "lma", "path": "kubernetes-event-exporter", "namespace": "lma" }
               ]
         when: "{{workflow.parameters.logging_component}} == 'loki'"
         dependencies: []
@@ -112,7 +125,7 @@ spec:
                 { "app_group": "lma", "path": "thanos-config", "namespace": "lma" },
                 { "app_group": "lma", "path": "prepare-etcd-secret", "namespace": "lma" }
               ]
-        dependencies: [operator]
+        dependencies: [prometheus-operator]
 
       - name: prometheus
         templateRef: