Existing Cluster OSS Pattern

Author: elamaran11

cdk.json

@@ -24,6 +24,6 @@
     "nodes.dashboard.url": "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/infrastructure/nodes.json",
     "workloads.dashboard.url": "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/infrastructure/workloads.json",
     "existing.cluster.name": "single-new-eks-observability-accelerator",
-    "existing.kubectl.rolename": "YOUR_KUBECTL_ROLENAME"
+    "existing.kubectl.rolename": "single-new-eks-observabil-singleneweksobservabilit-1CDITBAY1CKM2"
   }
 }

lib/common/observability-builder.ts

@@ -5,20 +5,37 @@ import { Construct } from 'constructs';
 
 
 
-export class ObservabilityBuilder {
-
-    public static builder(): blueprints.BlueprintBuilder {
-        return new blueprints.BlueprintBuilder()
-            .addOns(
-                new blueprints.NestedStackAddOn({
-                    id: "usage-tracking-addon",
-                    builder: UsageTrackingAddOn.builder(),
-                }),
-                new blueprints.addons.VpcCniAddOn(),
-                new blueprints.addons.CoreDnsAddOn(),
-                new blueprints.addons.MetricsServerAddOn(),
-                new blueprints.addons.PrometheusNodeExporterAddOn(),
-                new blueprints.addons.KubeStateMetricsAddOn());
+export class ObservabilityBuilder extends blueprints.BlueprintBuilder {
+
+    public addNewClusterObservabilityBuilderAddOns(): ObservabilityBuilder {
+        return this.addOns(
+            new blueprints.addons.VpcCniAddOn(),
+            new blueprints.addons.CoreDnsAddOn(),
+            new blueprints.addons.MetricsServerAddOn(),
+            new blueprints.addons.PrometheusNodeExporterAddOn(),
+            new blueprints.addons.KubeStateMetricsAddOn());
+    }
+
+    public addExistingClusterObservabilityBuilderAddOns(): ObservabilityBuilder {
+        return this.addOns(
+            new blueprints.addons.AwsLoadBalancerControllerAddOn(),
+            new blueprints.addons.CertManagerAddOn());
+    }
+
+    public static builder(): ObservabilityBuilder {
+        const builder = new ObservabilityBuilder();
+        builder.addOns(
+            new blueprints.NestedStackAddOn({
+                id: "usage-tracking-addon",
+                builder: UsageTrackingAddOn.builder(),
+            }));
+        return builder;
+
+                // new blueprints.addons.VpcCniAddOn(),
+                // new blueprints.addons.CoreDnsAddOn(),
+                // new blueprints.addons.MetricsServerAddOn(),
+                // new blueprints.addons.PrometheusNodeExporterAddOn(),
+                // new blueprints.addons.KubeStateMetricsAddOn());
     }
 }
 

lib/existing-eks-opensource-observability-construct/index.ts

@@ -3,7 +3,7 @@ import { ImportClusterProvider, utils } from '@aws-quickstart/eks-blueprints';
 import * as blueprints from '@aws-quickstart/eks-blueprints';
 import { GrafanaOperatorSecretAddon } from './grafanaoperatorsecretaddon';
 import * as amp from 'aws-cdk-lib/aws-aps';
-import { ExistingClusterObservabilityBuilder } from '../common/existing-cluster-observability-builder';
+import { ObservabilityBuilder } from '../common/observability-builder';
 import * as cdk from "aws-cdk-lib";
 import * as eks from 'aws-cdk-lib/aws-eks';
 
@@ -84,9 +84,10 @@ export default class ExistingEksOpenSourceobservabilityConstruct {
             new GrafanaOperatorSecretAddon(),
         ];
 
-        ExistingClusterObservabilityBuilder.builder()
+        ObservabilityBuilder.builder()
             .account(account)
             .region(region)
+            .addExistingClusterObservabilityBuilderAddOns()
             .clusterProvider(importClusterProvider)
             .resourceProvider(blueprints.GlobalResources.Vpc, new blueprints.VpcProvider(vpcId)) // this is required with import cluster provider
             .resourceProvider(ampWorkspaceName, new blueprints.CreateAmpProvider(ampWorkspaceName, ampWorkspaceName))

lib/single-new-eks-awsnative-observability-construct/index.ts

@@ -25,6 +25,7 @@ export default class SingleNewEksClusterAWSNativeobservabilityConstruct {
         ObservabilityBuilder.builder()
             .account(account)
             .region(region)
+            .addNewClusterObservabilityBuilderAddOns()
             .addOns(...addOns)
             .build(scope, stackId);
     }

lib/single-new-eks-cluster-construct/index.ts

@@ -17,6 +17,7 @@ export default class SingleNewEksConstruct {
         ObservabilityBuilder.builder()
             .account(account)
             .region(region)
+            .addNewClusterObservabilityBuilderAddOns()
             .addOns(...addOns)
             .build(scope, stackId);
     }

lib/single-new-eks-mixed-observability-construct/index.ts

@@ -34,6 +34,7 @@ export default class SingleNewEksMixedobservabilityConstruct {
         ObservabilityBuilder.builder()
             .account(account)
             .region(region)
+            .addNewClusterObservabilityBuilderAddOns()
             .addOns(...addOns)
             .build(scope, stackId);
     }

lib/single-new-eks-opensource-observability-construct/graviton-index.ts

@@ -77,6 +77,7 @@ export default class SingleNewEksGravitonOpenSourceObservabilityConstruct {
         ObservabilityBuilder.builder()
             .account(account)
             .region(region)
+            .addNewClusterObservabilityBuilderAddOns()
             .resourceProvider(ampWorkspaceName, new blueprints.CreateAmpProvider(ampWorkspaceName, ampWorkspaceName))
             .clusterProvider(new blueprints.MngClusterProvider(mngProps))
             .addOns(...addOns)

lib/single-new-eks-opensource-observability-construct/index.ts

@@ -73,6 +73,7 @@ export default class SingleNewEksOpenSourceobservabilityConstruct {
         ObservabilityBuilder.builder()
             .account(account)
             .region(region)
+            .addNewClusterObservabilityBuilderAddOns()
             .resourceProvider(ampWorkspaceName, new blueprints.CreateAmpProvider(ampWorkspaceName, ampWorkspaceName))
             .addOns(...addOns)
             .build(scope, stackId);