Merge pull request #106 from seungkyua/20221212_fix_servicemesh

restore coping eck-elasticsearch-es-elastic-user
openinfradev · Dec 12, 2022 · df6c9b5 · df6c9b5
2 parents 2cf4394 + fde8641
commit df6c9b5
Showing 1 changed file with 18 additions and 7 deletions.
diff --git a/templates/decapod-apps/service-mesh-wf.yaml b/templates/decapod-apps/service-mesh-wf.yaml
@@ -45,9 +45,7 @@ spec:
           - name: list
             value: |
               [
-                { "app_group": "lma", "path": "eck-operator", "namespace": "elastic-system", "target_cluster": "" },
-                { "app_group": "lma", "path": "fluent-operator-crds", "namespace": "lma", "target_cluster": "" },
-                { "app_group": "lma", "path": "fluent-operator", "namespace": "lma", "target_cluster": "" }
+                { "app_group": "lma", "path": "eck-operator", "namespace": "elastic-system", "target_cluster": "" }
               ]
 
     - - name: logging-efk
@@ -60,7 +58,6 @@ spec:
             value: |
               [
                 { "app_group": "lma", "path": "eck-resource", "namespace": "lma", "target_cluster": "" },
-                { "app_group": "lma", "path": "fluentbit", "namespace": "lma", "target_cluster": "" },
                 { "app_group": "lma", "path": "kubernetes-event-exporter", "namespace": "lma", "target_cluster": "" }
               ]
 
@@ -122,8 +119,7 @@ spec:
           - name: list
             value: |
               [
-                { "app_group": "service-mesh", "path": "istio-ingress-gateway", "namespace": "istio-ingress", "target_cluster": "" },
-                { "app_group": "service-mesh", "path": "istio-egress-gateway", "namespace": "istio-ingress", "target_cluster": "" }
+                { "app_group": "service-mesh", "path": "istio-ingress-gateway", "namespace": "istio-ingress", "target_cluster": "" }
               ]
         dependencies:
         - istiod
@@ -143,6 +139,20 @@ spec:
               ]
         dependencies:
         - istiod
+
+      - name: copy-eck-secret
+        template: copy-eck-secret
+        arguments:
+          parameters:
+          - name: secret_name
+            value: "eck-elasticsearch-es-elastic-user"
+          - name: source_namespace
+            value: "lma"
+          - name: target_namespace
+            value: "istio-system"
+        dependencies:
+        - jaeger-kiali-operator 
+
       - name: servicemesh-jaeger-kiali-resource
         templateRef:
           name: create-application
@@ -156,7 +166,8 @@ spec:
                   { "app_group": "service-mesh", "path": "servicemesh-kiali-resource", "namespace": "istio-system", "target_cluster": "" }
                 ]
         dependencies:
-        - jaeger-kiali-operator
+        - copy-eck-secret
+
       - name: grafana-prometheus-resource
         templateRef:
           name: create-application