move kubeproxy addon, rename graviton pattern, and add blurb to docs

Author: zjaco13

bin/single-new-eks-opensource-observability-graviton.ts renamed to bin/single-new-eks-graviton-opensource-observability.ts

@@ -1,6 +1,6 @@
 import { configureApp } from '../lib/common/construct-utils';
-import SingleNewEksOpenSourceGravitonObservabilityConstruct from '../lib/single-new-eks-opensource-observability-construct/graviton-index';
+import SingleNewEksGravitonOpenSourceObservabilityConstruct from '../lib/single-new-eks-opensource-observability-construct/graviton-index';
 
 const app = configureApp();
 
-new SingleNewEksOpenSourceGravitonObservabilityConstruct(app, 'single-new-eks-opensource-graviton');
+new SingleNewEksGravitonOpenSourceObservabilityConstruct(app, 'single-new-eks-graviton-opensource');

docs/patterns/single-new-eks-observability-accelerators/single-new-eks-opensource-observability-graviton.md renamed to docs/patterns/single-new-eks-observability-accelerators/single-new-eks-graviton-opensource-observability.md

@@ -1,4 +1,4 @@
-# Single New EKS Cluster Open Source Observability Accelerator on Graviton
+# Single New EKS Graviton Cluster Open Source Observability Accelerator
 
 ## Architecture
 
@@ -12,6 +12,10 @@ The Amazon EKS control plane consists of control plane nodes that run the Kubern
 such as etcd and the Kubernetes API server. To read more on the components of an Amazon EKS cluster,
 please read the [service documentation](https://docs.aws.amazon.com/eks/latest/userguide/clusters.html).
 
+### Graviton
+
+[AWS Graviton](https://aws.amazon.com/ec2/graviton/) Processors are designed by AWS to deliver the best price to performance for your cloud workloads running in Amazon EC2.  These processors are ARM chips running on aarch64 architecture. These processors feature key capabilities, such as the [AWS Nitro System](https://aws.amazon.com/ec2/nitro/), that allow you to securely run cloud native applications at scale.
+
 ## Objective
 
 - Deploys one production grade Amazon EKS cluster running on a Graviton3 Processor
@@ -105,15 +109,15 @@ Example settings: Update the context in `cdk.json` file located in `cdk-eks-blue
 
 ```bash
 make build
-make pattern single-new-eks-opensource-observability-graviton deploy
+make pattern single-new-eks-graviton-opensource-observability deploy
 ```
 
 ## Verify the resources
 
 Run update-kubeconfig command. You should be able to get the command from CDK output message.
 
 ```bash
-aws eks update-kubeconfig --name single-new-eks-opensource-graviton-observability-accelerator --region <your region> --role-arn arn:aws:iam::xxxxxxxxx:role/single-new-eks-opensource-singleneweksopensourceob-82N8N3BMJYYI
+aws eks update-kubeconfig --name single-new-eks-graviton-opensource-observability-accelerator --region <your region> --role-arn arn:aws:iam::xxxxxxxxx:role/single-new-eks-gravitonop-singleneweksgravitonopens-82N8N3BMJYYI
 ```
 
 Let’s verify the resources created by steps above.

lib/common/observability-builder.ts

@@ -1,5 +1,6 @@
 import * as blueprints from '@aws-quickstart/eks-blueprints';
 import * as utils from '@aws-quickstart/eks-blueprints/dist/utils';
+import * as eks from 'aws-cdk-lib/aws-eks'
 import { NestedStack, NestedStackProps } from 'aws-cdk-lib';
 import { Construct } from 'constructs';
 
@@ -17,7 +18,6 @@ export class ObservabilityBuilder {
                 new blueprints.addons.AwsLoadBalancerControllerAddOn(),
                 new blueprints.addons.VpcCniAddOn(),
                 new blueprints.addons.CoreDnsAddOn(),
-                new blueprints.addons.KubeProxyAddOn(),
                 new blueprints.addons.MetricsServerAddOn(),
                 new blueprints.addons.ExternalsSecretsAddOn(),
                 new blueprints.addons.CertManagerAddOn(),
@@ -44,4 +44,4 @@ export class UsageTrackingAddOn extends NestedStack {
     constructor(scope: Construct, id: string, props: NestedStackProps) {
         super(scope, id, utils.withUsageTracking(UsageTrackingAddOn.USAGE_ID, props));
     }
-}
+}

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

@@ -11,6 +11,7 @@ export default class SingleNewEksClusterAWSNativeobservabilityConstruct {
         const region = process.env.COA_AWS_REGION! || process.env.CDK_DEFAULT_REGION!;
 
         const addOns: Array<blueprints.ClusterAddOn> = [
+            new blueprints.addons.KubeProxyAddOn(),
             new blueprints.addons.CloudWatchLogsAddon({
                 logGroupPrefix: `/aws/eks/${stackId}`,
                 logRetentionDays: 30

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

@@ -19,6 +19,7 @@ export default class SingleNewEksMixedobservabilityConstruct {
         });
 
         const addOns: Array<blueprints.ClusterAddOn> = [
+            new blueprints.addons.KubeProxyAddOn(),
             new blueprints.addons.CloudWatchLogsAddon({
                 logGroupPrefix: `/aws/eks/${stackId}`,
                 logRetentionDays: 30

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

@@ -5,9 +5,9 @@ import { GrafanaOperatorSecretAddon } from './grafanaoperatorsecretaddon';
 import * as amp from 'aws-cdk-lib/aws-aps';
 import * as eks from 'aws-cdk-lib/aws-eks';
 import * as ec2 from 'aws-cdk-lib/aws-ec2';
-import * as assert from "assert";
+import { ObservabilityBuilder } from '../common/observability-builder';
 
-export default class SingleNewEksOpenSourceGravitonObservabilityConstruct {
+export default class SingleNewEksGravitonOpenSourceObservabilityConstruct {
     constructor(scope: Construct, id: string) {
         // AddOns for the cluster
         const stackId = `${id}-observability-accelerator`;
@@ -29,14 +29,7 @@ export default class SingleNewEksOpenSourceGravitonObservabilityConstruct {
 
         Reflect.defineMetadata("ordered", true, blueprints.addons.GrafanaOperatorAddon);
         const addOns: Array<blueprints.ClusterAddOn> = [
-            new blueprints.addons.AwsLoadBalancerControllerAddOn(),
-            new blueprints.addons.VpcCniAddOn(),
-            new blueprints.addons.CoreDnsAddOn(),
             new blueprints.addons.KubeProxyAddOn("v1.27.1-eksbuild.1"),
-            new blueprints.addons.CertManagerAddOn(),
-            new blueprints.addons.ExternalsSecretsAddOn(),
-            new blueprints.addons.PrometheusNodeExporterAddOn(),
-            new blueprints.addons.KubeStateMetricsAddOn(),
             new blueprints.addons.CloudWatchLogsAddon({
                 logGroupPrefix: `/aws/eks/${stackId}`,
                 logRetentionDays: 30
@@ -78,7 +71,7 @@ export default class SingleNewEksOpenSourceGravitonObservabilityConstruct {
             amiType: eks.NodegroupAmiType.AL2_ARM_64,
         };
 
-        EksBlueprint.builder()
+        ObservabilityBuilder.builder()
             .account(account)
             .region(region)
             .resourceProvider(ampWorkspaceName, new blueprints.CreateAmpProvider(ampWorkspaceName, ampWorkspaceName))

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

@@ -4,6 +4,7 @@ import * as blueprints from '@aws-quickstart/eks-blueprints';
 import { GrafanaOperatorSecretAddon } from './grafanaoperatorsecretaddon';
 import * as amp from 'aws-cdk-lib/aws-aps';
 import { ObservabilityBuilder } from '../common/observability-builder';
+import * as eks from 'aws-cdk-lib/aws-eks';
 import * as assert from "assert";
 
 
@@ -32,6 +33,7 @@ export default class SingleNewEksOpenSourceobservabilityConstruct {
 
         Reflect.defineMetadata("ordered", true, blueprints.addons.GrafanaOperatorAddon);
         const addOns: Array<blueprints.ClusterAddOn> = [
+            new blueprints.addons.KubeProxyAddOn(),
             new blueprints.addons.CloudWatchLogsAddon({
                 logGroupPrefix: `/aws/eks/${stackId}`,
                 logRetentionDays: 30