fixed undefined assumerole with monitoringEnv

aws-observability · Sep 29, 2023 · a9c782d · a9c782d
1 parent e3b15fe
commit a9c782d
Showing 1 changed file with 27 additions and 27 deletions.
diff --git a/lib/multi-acc-new-eks-mixed-observability-pattern/pipeline.ts b/lib/multi-acc-new-eks-mixed-observability-pattern/pipeline.ts
@@ -129,33 +129,6 @@ export class PipelineMultiEnvMonitoring {
             })
             .enableCrossAccountKeys();
 
-        // ArgoCD configuration for monitoringEnv
-        // CHANGE ME FINALLY HERE AS WELL AS IN APP'S VALUES.YAML
-        // const grafanaOperatorArgoAddonConfig = createGOArgoAddonConfig(
-        //     'https://github.com/aws-observability/aws-observability-accelerator.git',
-        //     'artifacts/sample-apps/grafana-operator-app',
-        //     'main',
-        //     'private'
-        // );
-        const grafanaOperatorArgoAddonConfig = createGOArgoAddonConfig(
-            'https://github.com/iamprakkie/aws-observability-accelerator.git',
-            'artifacts/sample-apps/grafana-operator-app',
-            'artifacts',
-            'private'
-        );
-
-        const monStage: blueprints.StackStage = {
-            id: MON_ENV_ID,
-            stackBuilder: blueprintAmg
-                .name(MON_ENV_ID)
-                .clone(context.monitoringEnv.region, context.monitoringEnv.account)
-                .addOns(new blueprints.NestedStackAddOn({
-                    builder: AmgIamSetupStack.builder(AmgIamSetupStackProps),
-                    id: "amg-iam-nested-stack"
-                }))
-                .addOns(grafanaOperatorArgoAddonConfig)
-        };
-
         // Argo configuration for prod1 and prod2
         // CHANGE ME FINALLY HERE AS WELL AS IN APP'S VALUES.YAML
         // const prodArgoAddonConfig = createArgoAddonConfig(
@@ -217,6 +190,33 @@ export class PipelineMultiEnvMonitoring {
             stages: [ampStage, cwStage]
         });
 
+        // ArgoCD configuration for monitoringEnv
+        // CHANGE ME FINALLY HERE AS WELL AS IN APP'S VALUES.YAML
+        // const grafanaOperatorArgoAddonConfig = createGOArgoAddonConfig(
+        //     'https://github.com/aws-observability/aws-observability-accelerator.git',
+        //     'artifacts/sample-apps/grafana-operator-app',
+        //     'main',
+        //     'private'
+        // );
+        const grafanaOperatorArgoAddonConfig = createGOArgoAddonConfig(
+            'https://github.com/iamprakkie/aws-observability-accelerator.git',
+            'artifacts/sample-apps/grafana-operator-app',
+            'artifacts',
+            'private'
+        );
+
+        const monStage: blueprints.StackStage = {
+            id: MON_ENV_ID,
+            stackBuilder: blueprintAmg
+                .name(MON_ENV_ID)
+                .clone(context.monitoringEnv.region, context.monitoringEnv.account)
+                .addOns(new blueprints.NestedStackAddOn({
+                    builder: AmgIamSetupStack.builder(AmgIamSetupStackProps),
+                    id: "amg-iam-nested-stack"
+                }))
+                .addOns(grafanaOperatorArgoAddonConfig)
+        };
+
         // adding monitoring env setup as separate stage
         pipeline.stage(monStage);