Merge pull request #887 from aws-quickstart/task/1.13.0-release-prep

Upgrade CDK, Libraries, HELM, ACK and Others for Release Prep

.github/workflows/ci.yaml

@@ -12,13 +12,13 @@ jobs:
 
  strategy:
  matrix:
- node-version: [18.12.1]
+ node-version: [20.10.0]
 
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
 
  - name: Use Node.js ${{ matrix.node-version }}
- uses: actions/setup-node@v1
+ uses: actions/setup-node@v4
  with:
  node-version: ${{ matrix.node-version }}
 

.github/workflows/linkcheck.json

@@ -22,6 +22,8 @@
  { "pattern": "rsa-2048.example.com" },
  { "pattern": "https://ingress-red-saas.instana.io" },
  { "pattern": "http://console-eks.yourdomain.com" },
- { "pattern": "https://p191.p3.n0.cdn.getcloudapp.com"}
+ { "pattern": "http://console-eks.yourdomain.com" },
+ { "pattern": "https://p191.p3.n0.cdn.getcloudapp.com"},
+ { "pattern": "https://grafana-operator.github.io/grafana-operator/docs/installation/helm"}
  ]
 }

README.md

@@ -44,14 +44,14 @@ aws --version
 Install CDK matching the current version of the Blueprints QuickStart (which can be found in package.json).
 
 ```bash
-npm install -g aws-cdk@2.99.1
+npm install -g aws-cdk@2.115.0
 ```
 
 Verify the installation.
 
 ```bash
 cdk --version
-# must output 2.99.1
+# must output 2.115.0
 ```
 
 Create a new CDK project. We use `typescript` for this example.

ci/buildspec.yml

@@ -7,7 +7,7 @@ phases:
  runtime-versions:
  nodejs: 14
  commands:
- - n 18.12.1
+ - n 20.10.0
  - |
  if [ ! -z "${COMMIT_ID}" ]; then 
  git fetch origin pull/${PR_NUMBER}/head:pr

docs/README.md

@@ -44,14 +44,14 @@ aws --version
 Install CDK matching the current version of the Blueprints QuickStart (which can be found in package.json).
 
 ```bash
-npm install -g aws-cdk@2.99.1
+npm install -g aws-cdk@2.115.0
 ```
 
 Verify the installation.
 
 ```bash
 cdk --version
-# must output 2.99.1
+# must output 2.115.0
 ```
 
 Create a new CDK project. We use `typescript` for this example.

docs/builders/gpu-builder.md

@@ -41,7 +41,7 @@ export default class GpuConstruct {
  const stackID = `${id}-eks-blueprint`;
 
  const options: GpuOptions = {
- kubernetesVersion: eks.KubernetesVersion.of("1.27"),
+ kubernetesVersion: eks.KubernetesVersion.of("1.28"),
  instanceClass: ec2.InstanceClass.G5,
  instanceSize: ec2.InstanceSize.XLARGE
  };

docs/builders/graviton-builder.md

@@ -37,7 +37,7 @@ export default class GravitonConstruct {
  blueprints.getNamedResource(ampWorkspaceName);
 
  const options: Partial<blueprints.MngClusterProviderProps> = {
- version: eks.KubernetesVersion.of("1.27"),
+ version: eks.KubernetesVersion.of("1.28"),
  instanceTypes: [ec2.InstanceType.of(ec2.InstanceClass.M7G, ec2.InstanceSize.XLARGE)],
  desiredSize: 3,
  minSize: 2,

docs/builders/windows-builder.md

@@ -53,7 +53,7 @@ export default class WindowsConstruct {
  ]);
 
  const options: WindowsOptions = {
- kubernetesVersion: eks.KubernetesVersion.of("1.27"),
+ kubernetesVersion: eks.KubernetesVersion.of("1.28"),
  instanceClass: ec2.InstanceClass.M5,
  instanceSize: ec2.InstanceSize.XLARGE4
  };

docs/cluster-providers/fargate-cluster-provider.md

@@ -27,7 +27,7 @@ const tags = {
  "Type": "fargate-cluster"
 }
 const clusterProvider = new blueprints.FargateClusterProvider({
- version: KubernetesVersion.V1_27,
+ version: KubernetesVersion.V1_28,
  fargateProfiles,
  tags
 });

docs/getting-started.md

@@ -26,8 +26,8 @@ Create a directory that represents you project (e.g. `my-blueprints`) and then c
 ```bash
 npm install -g n # may require sudo
 n stable # may require sudo 
-npm install -g aws-cdk@2.99.1 # may require sudo (Ubuntu) depending on configuration
-cdk --version # must produce 2.99.1
+npm install -g aws-cdk@2.115.0 # may require sudo (Ubuntu) depending on configuration
+cdk --version # must produce 2.115.0
 mkdir my-blueprints
 cd my-blueprints
 cdk init app --language typescript

docs/internal/ci.md

@@ -19,7 +19,7 @@ cd cdk-eks-blueprints
 Install CDK (please review and install any missing [pre-requisites](https://docs.aws.amazon.com/cdk/latest/guide/getting_started.html) for your environment)
 
 ```sh
-npm install -g aws-cdk@2.99.1
+npm install -g aws-cdk@2.115.0
 ```
 
 Install the dependencies for this project.

examples/blueprint-construct/index.ts

@@ -62,7 +62,7 @@ export default class BlueprintConstruct {
  new blueprints.addons.PrometheusNodeExporterAddOn(),
  new blueprints.addons.AdotCollectorAddOn({
  namespace:'adot',
- version: 'v0.80.0-eksbuild.2'
+ version: 'v0.88.0-eksbuild.2'
  }),
  new blueprints.addons.AmpAddOn({
  ampPrometheusEndpoint: ampWorkspace.attrPrometheusEndpoint,
@@ -228,7 +228,7 @@ export default class BlueprintConstruct {
  });
 
  const clusterProvider = new blueprints.GenericClusterProvider({
- version: KubernetesVersion.V1_27,
+ version: KubernetesVersion.V1_28,
  tags: {
  "Name": "blueprints-example-cluster",
  "Type": "generic-cluster"

lib/addons/ack/serviceMappings.ts

@@ -37,7 +37,13 @@ export enum AckServiceName {
  ROUTE53 = "route53",
  SQS = "sqs",
  SAGEMAKER = "sagemaker",
- EVENTBRIDGE = "eventbridge"
+ EVENTBRIDGE = "eventbridge",
+ PIPES = "pipes",
+ SECRETSMANAGER = "secretsmanager",
+ ROUTE53RESOLVER = "route53resolver",
+ CLOUDWATCH = "cloudwatch",
+ ACMPCA = "acmpca",
+ CLOUDWATCHLOGS = "cloudwatchlogs"
 }
 
 /**
@@ -47,52 +53,52 @@ export enum AckServiceName {
 export const serviceMappings : {[key in AckServiceName]?: AckChartMapping } = {
  [AckServiceName.IAM]: {
  chart: "iam-chart",
- version: "1.2.2",
+ version: "1.3.1",
  managedPolicyName: "IAMFullAccess"
  },
  [AckServiceName.RDS]: {
  chart: "rds-chart",
- version: "1.1.5",
+ version: "1.1.8",
  managedPolicyName: "AmazonRDSFullAccess"
  },
  [AckServiceName.EC2]: {
  chart: "ec2-chart",
- version: "1.0.3",
+ version: "1.1.0",
  managedPolicyName: "AmazonRDSFullAccess"
  },
  [AckServiceName.S3]: {
  chart: "s3-chart",
- version: "1.0.4",
+ version: "1.0.6",
  managedPolicyName: "AmazonS3FullAccess"
  },
  [AckServiceName.DYNAMODB]: {
  chart: "dynamodb-chart",
- version: "1.1.2",
+ version: "1.2.5",
  managedPolicyName: "AmazonDynamoDBFullAccess"
  },
  [AckServiceName.ECR]: {
  chart: "ecr-chart",
- version: "1.0.5",
+ version: "1.0.9",
  managedPolicyName: "AmazonEC2ContainerRegistryFullAccess"
  },
  [AckServiceName.SNS]: {
  chart: "sns-chart",
- version: "1.0.2",
+ version: "1.0.5",
  managedPolicyName: "AmazonSNSFullAccess"
  },
  [AckServiceName.APIGATEWAYV2]: {
  chart: "apigatewayv2-chart",
- version: "1.0.4",
+ version: "1.0.6",
  managedPolicyName: "AmazonAPIGatewayAdministrator"
  },
  [AckServiceName.ELASTICACHE]: {
  chart: "elasticache-chart",
- version: "0.0.26",
+ version: "0.0.28",
  managedPolicyName: "AmazonElastiCacheFullAccess"
  },
  [AckServiceName.OPENSEARCHSERVICE]: {
  chart: "opensearchservice-chart",
- version: "0.0.16",
+ version: "0.0.18",
  managedPolicyName: "AmazonOpenSearchServiceFullAccess"
  },
  [AckServiceName.MQ]: {
@@ -102,27 +108,27 @@ export const serviceMappings : {[key in AckServiceName]?: AckChartMapping } = {
  },
  [AckServiceName.LAMBDA]: {
  chart: "lambda-chart",
- version: "1.1.0",
+ version: "1.3.4",
  managedPolicyName: "AWSLambda_FullAccess"
  },
  [AckServiceName.KMS]: {
  chart: "kms-chart",
- version: "1.0.5",
+ version: "1.0.7",
  managedPolicyName: "AWSKeyManagementServicePowerUser"
  },
  [AckServiceName.MEMORYDB]: {
  chart: "memorydb-chart",
- version: "1.0.1",
+ version: "1.0.2",
  managedPolicyName: "AmazonMemoryDBFullAccess"
  },
  [AckServiceName.EKS]: {
  chart: "eks-chart",
- version: "1.0.3",
+ version: "1.0.5",
  managedPolicyName: "AmazonEKSClusterPolicy"
  },
  [AckServiceName.APPLICATIONAUTOSCALING]: {
  chart: "applicationautoscaling-chart",
- version: "1.0.5",
+ version: "1.0.8",
  managedPolicyName: "AutoScalingFullAccess"
  },
  [AckServiceName.ELASTICSEARCHSERVICE]: {
@@ -132,52 +138,82 @@ export const serviceMappings : {[key in AckServiceName]?: AckChartMapping } = {
  },
  [AckServiceName.PROMETHEUSSERVICE]: {
  chart: "prometheusservice-chart",
- version: "1.2.3",
+ version: "1.2.5",
  managedPolicyName: "AmazonPrometheusFullAccess"
  },
  [AckServiceName.EMRCONTAINERS]: {
  chart: "emrcontainers-chart",
- version: "1.0.2",
+ version: "1.0.4",
  managedPolicyName: "AmazonEMRContainersServiceRolePolicy"
  },
  [AckServiceName.SFN]: {
  chart: "sfn-chart",
- version: "1.0.3",
+ version: "1.0.5",
  managedPolicyName: "AWSStepFunctionsFullAccess"
  },
  [AckServiceName.KINESIS]: {
  chart: "kinesis-chart",
- version: "0.0.7",
+ version: "0.0.9",
  managedPolicyName: "AmazonKinesisFullAccess"
  },
  [AckServiceName.CLOUDTRAIL]: {
  chart: "cloudtrail-chart",
- version: "1.0.3",
+ version: "1.0.5",
  managedPolicyName: "AWSCloudTrail_FullAccess"
  },
  [AckServiceName.ACM]: {
  chart: "acm-chart",
- version: "0.0.7",
+ version: "0.0.9",
  managedPolicyName: "AWSCertificateManagerFullAccess"
  },
  [AckServiceName.ROUTE53]: {
  chart: "route53-chart",
- version: "0.0.5",
+ version: "0.0.8",
  managedPolicyName: "AmazonRoute53FullAccess"
  },
  [AckServiceName.SQS]: {
  chart: "sqs-chart",
- version: "1.0.4",
+ version: "1.0.6",
  managedPolicyName: "AmazonSQSFullAccess"
  },
  [AckServiceName.SAGEMAKER]: {
  chart: "sagemaker-chart",
- version: "1.2.2",
+ version: "1.2.4",
  managedPolicyName: "AmazonSageMakerFullAccess"
  },
  [AckServiceName.EVENTBRIDGE]: {
  chart: "eventbridge-chart",
- version: "1.0.2",
+ version: "1.0.4",
  managedPolicyName: "AmazonEventBridgeFullAccess"
+ },
+ [AckServiceName.PIPES]: {
+ chart: "pipes-chart",
+ version: "1.0.2",
+ managedPolicyName: "AmazonEventBridgePipesFullAccess"
+ },
+ [AckServiceName.SECRETSMANAGER]: {
+ chart: "secretsmanager-chart",
+ version: "0.0.1",
+ managedPolicyName: "SecretsManagerReadWrite"
+ },
+ [AckServiceName.CLOUDWATCH]: {
+ chart: "cloudwatch-chart",
+ version: "0.0.2",
+ managedPolicyName: "CloudWatchFullAccess"
+ },
+ [AckServiceName.ROUTE53RESOLVER]: {
+ chart: "route53resolver-chart",
+ version: "0.0.2",
+ managedPolicyName: "AmazonRoute53ResolverFullAccess"
+ },
+ [AckServiceName.ACMPCA]: {
+ chart: "acmpca-chart",
+ version: "0.0.2",
+ managedPolicyName: "AWSCertificateManagerPrivateCAFullAccess"
+ },
+ [AckServiceName.CLOUDWATCHLOGS]: {
+ chart: "cloudwatchlogs-chart",
+ version: "0.0.1",
+ managedPolicyName: "CloudWatchLogsFullAccess"
  }
 };

lib/addons/adot/index.ts

@@ -5,6 +5,7 @@ import { createNamespace, dependable, loadYaml, readYamlDocument, supportsALL }
 import { CertManagerAddOn } from "../cert-manager";
 import { CoreAddOn, CoreAddOnProps } from "../core-addon";
 import { getAdotCollectorPolicyDocument } from "./iam-policy";
+import { semverComparator } from "../helm-addon/helm-version-checker";
 
 /**
  * Configuration options for the Adot add-on.
@@ -15,10 +16,11 @@ export type AdotCollectorAddOnProps = Omit<CoreAddOnProps, "saName" | "addOnName
 
 const defaultProps = {
  addOnName: 'adot',
- version: 'v0.80.0-eksbuild.2',
+ version: 'v0.88.0-eksbuild.2',
  saName: 'adot-collector',
  policyDocumentProvider: getAdotCollectorPolicyDocument,
- namespace: 'default'
+ namespace: 'default',
+ configurationValues: {}
 };
 
  /**
@@ -40,6 +42,13 @@ export class AdotCollectorAddOn extends CoreAddOn {
 
  const cluster = clusterInfo.cluster;
 
+ if (semverComparator("0.88",this.coreAddOnProps.version)) {
+ console.log("Used Adot Addon Version is Valid");
+ } 
+ else {
+ throw new Error(`Adot Addon Version is not Valid and greater than 0.88.0`);
+ }
+
  // Create namespace if not default
  const ns = createNamespace(this.coreAddOnProps.namespace!, cluster, true, true);
 
@@ -60,3 +69,5 @@ export class AdotCollectorAddOn extends CoreAddOn {
  return addOnPromise;
  }
 }
+
+

lib/addons/appmesh/index.ts

@@ -45,7 +45,7 @@ const defaultProps = {
  name: "appmesh-controller",
  namespace: "appmesh-system",
  chart: "appmesh-controller",
- version: "1.12.3",
+ version: "1.12.7",
  release: "appmesh-release",
  repository: "https://aws.github.io/eks-charts"
 };