From bb63926e6a642da36c749dc66db0dedf1132f4b1 Mon Sep 17 00:00:00 2001 From: Elamaran Shanmugam Date: Tue, 19 Sep 2023 16:03:16 -0400 Subject: [PATCH 1/4] Adding Doc change for nginx mon --- lib/single-new-eks-cluster-pattern/index.ts | 6 ++++-- mkdocs.yml | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/single-new-eks-cluster-pattern/index.ts b/lib/single-new-eks-cluster-pattern/index.ts index bf66c1be..e3a2b2af 100644 --- a/lib/single-new-eks-cluster-pattern/index.ts +++ b/lib/single-new-eks-cluster-pattern/index.ts @@ -1,4 +1,5 @@ import { Construct } from 'constructs'; +import * as eks from "aws-cdk-lib/aws-eks"; import * as blueprints from '@aws-quickstart/eks-blueprints'; import { ObservabilityBuilder } from '@aws-quickstart/eks-blueprints'; @@ -10,13 +11,14 @@ export default class SingleNewEksPattern { const region = process.env.COA_AWS_REGION! || process.env.CDK_DEFAULT_REGION!; const addOns: Array = [ - new blueprints.addons.ClusterAutoScalerAddOn() + new blueprints.addons.ClusterAutoScalerAddOn(), + new blueprints.addons.AwsLoadBalancerControllerAddOn() ]; ObservabilityBuilder.builder() .account(account) .region(region) - .version('auto') + .version(eks.KubernetesVersion.V1_26) .addOns(...addOns) .build(scope, stackId); } diff --git a/mkdocs.yml b/mkdocs.yml index 4cc53742..f4d5b42b 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -28,11 +28,13 @@ nav: - Existing Cluster: - AWS Native : patterns/existing-eks-observability-accelerators/existing-eks-awsnative-observability.md - OSS : patterns/existing-eks-observability-accelerators/existing-eks-opensource-observability.md + - OSS nginx Mon : patterns/existing-eks-observability-accelerators/existing-eks-nginx-observability.md - Mixed : patterns/existing-eks-observability-accelerators/existing-eks-mixed-observability.md - New Cluster: - AWS Native : patterns/single-new-eks-observability-accelerators/single-new-eks-awsnative-observability.md - OSS : patterns/single-new-eks-observability-accelerators/single-new-eks-opensource-observability.md - OSS Java Mon : patterns/single-new-eks-observability-accelerators/single-new-eks-java-opensource-observability.md + - OSS nginx Mon : patterns/single-new-eks-observability-accelerators/single-new-eks-nginx-opensource-observability.md - Mixed : patterns/single-new-eks-observability-accelerators/single-new-eks-mixed-observability.md - Graviton OSS : patterns/single-new-eks-observability-accelerators/single-new-eks-graviton-opensource-observability.md - Logs: logs.md From e00b53b6b4965b3f0aa4c4da7a820ee419e56152 Mon Sep 17 00:00:00 2001 From: Elamaran Shanmugam Date: Tue, 19 Sep 2023 16:04:31 -0400 Subject: [PATCH 2/4] Adding Doc change for nginx mon --- lib/single-new-eks-cluster-pattern/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/single-new-eks-cluster-pattern/index.ts b/lib/single-new-eks-cluster-pattern/index.ts index e3a2b2af..51213c04 100644 --- a/lib/single-new-eks-cluster-pattern/index.ts +++ b/lib/single-new-eks-cluster-pattern/index.ts @@ -18,7 +18,7 @@ export default class SingleNewEksPattern { ObservabilityBuilder.builder() .account(account) .region(region) - .version(eks.KubernetesVersion.V1_26) + .version('auto') .addOns(...addOns) .build(scope, stackId); } From cd0bff216b823a9796ab06635f19a28b00642200 Mon Sep 17 00:00:00 2001 From: Elamaran Shanmugam Date: Tue, 19 Sep 2023 16:05:07 -0400 Subject: [PATCH 3/4] Adding Doc change for nginx mon --- lib/single-new-eks-cluster-pattern/index.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/single-new-eks-cluster-pattern/index.ts b/lib/single-new-eks-cluster-pattern/index.ts index 51213c04..b36025b0 100644 --- a/lib/single-new-eks-cluster-pattern/index.ts +++ b/lib/single-new-eks-cluster-pattern/index.ts @@ -11,8 +11,7 @@ export default class SingleNewEksPattern { const region = process.env.COA_AWS_REGION! || process.env.CDK_DEFAULT_REGION!; const addOns: Array = [ - new blueprints.addons.ClusterAutoScalerAddOn(), - new blueprints.addons.AwsLoadBalancerControllerAddOn() + new blueprints.addons.ClusterAutoScalerAddOn() ]; ObservabilityBuilder.builder() From 540180cd19e1625e7c67090fbb4d9512c37d15ac Mon Sep 17 00:00:00 2001 From: Elamaran Shanmugam Date: Tue, 19 Sep 2023 16:05:40 -0400 Subject: [PATCH 4/4] Adding Doc change for nginx mon --- lib/single-new-eks-cluster-pattern/index.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/single-new-eks-cluster-pattern/index.ts b/lib/single-new-eks-cluster-pattern/index.ts index b36025b0..bf66c1be 100644 --- a/lib/single-new-eks-cluster-pattern/index.ts +++ b/lib/single-new-eks-cluster-pattern/index.ts @@ -1,5 +1,4 @@ import { Construct } from 'constructs'; -import * as eks from "aws-cdk-lib/aws-eks"; import * as blueprints from '@aws-quickstart/eks-blueprints'; import { ObservabilityBuilder } from '@aws-quickstart/eks-blueprints';