Upgrade CDK to 1.81+

aws-samples · Jan 6, 2021 · 6cef496 · 6cef496
1 parent ecc7a82
commit 6cef496
Show file tree

Hide file tree

Showing 14 changed files with 1,993 additions and 1,536 deletions.
diff --git a/pipelines/package-lock.json b/pipelines/package-lock.json
diff --git a/pipelines/package.json b/pipelines/package.json
@@ -21,13 +21,13 @@
     "aws-cdk": "^1.81.0"
   },
   "dependencies": {
-    "@aws-cdk/aws-codebuild": "^1.56.0",
-    "@aws-cdk/aws-codecommit": "^1.56.0",
-    "@aws-cdk/aws-codepipeline": "^1.56.0",
-    "@aws-cdk/aws-codepipeline-actions": "^1.56.0",
-    "@aws-cdk/aws-codestarnotifications": "^1.56.0",
-    "@aws-cdk/aws-ecr": "^1.56.0",
-    "@aws-cdk/aws-iam": "^1.56.0",
-    "@aws-cdk/core": "^1.56.0"
+    "@aws-cdk/aws-codebuild": "^1.81.0",
+    "@aws-cdk/aws-codecommit": "^1.81.0",
+    "@aws-cdk/aws-codepipeline": "^1.81.0",
+    "@aws-cdk/aws-codepipeline-actions": "^1.81.0",
+    "@aws-cdk/aws-codestarnotifications": "^1.81.0",
+    "@aws-cdk/aws-ecr": "^1.81.0",
+    "@aws-cdk/aws-iam": "^1.81.0",
+    "@aws-cdk/core": "^1.81.0"
   }
 }
diff --git a/pipelines/tsconfig.json b/pipelines/tsconfig.json
@@ -5,7 +5,7 @@
         "lib": ["es2016", "es2017.object", "es2017.string"],
         "declaration": true,
         "strict": true,
-        "noImplicitAny": true,
+        "noImplicitAny": false,
         "strictNullChecks": true,
         "noImplicitThis": true,
         "alwaysStrict": true,

diff --git a/static-site/cdk/package-lock.json b/static-site/cdk/package-lock.json
diff --git a/static-site/cdk/package.json b/static-site/cdk/package.json
@@ -18,12 +18,12 @@
     "typescript": "^4.1.3"
   },
   "dependencies": {
-    "@aws-cdk/aws-certificatemanager": "^1.56.0",
-    "@aws-cdk/aws-cloudfront": "^1.56.0",
-    "@aws-cdk/aws-route53": "^1.56.0",
-    "@aws-cdk/aws-route53-targets": "^1.56.0",
-    "@aws-cdk/aws-s3": "^1.56.0",
-    "@aws-cdk/aws-s3-deployment": "^1.56.0",
-    "@aws-cdk/core": "^1.56.0"
+    "@aws-cdk/aws-certificatemanager": "^1.81.0",
+    "@aws-cdk/aws-cloudfront": "^1.81.0",
+    "@aws-cdk/aws-route53": "^1.81.0",
+    "@aws-cdk/aws-route53-targets": "^1.81.0",
+    "@aws-cdk/aws-s3": "^1.81.0",
+    "@aws-cdk/aws-s3-deployment": "^1.81.0",
+    "@aws-cdk/core": "^1.81.0"
   }
 }
diff --git a/static-site/cdk/tsconfig.json b/static-site/cdk/tsconfig.json
@@ -5,7 +5,7 @@
         "lib": ["es2016", "es2017.object", "es2017.string"],
         "declaration": true,
         "strict": true,
-        "noImplicitAny": true,
+        "noImplicitAny": false,
         "strictNullChecks": true,
         "noImplicitThis": true,
         "alwaysStrict": true,
@@ -19,4 +19,3 @@
         "strictPropertyInitialization":false
     }
 }
-
diff --git a/trivia-backend/infra/cdk/eks-service.ts b/trivia-backend/infra/cdk/eks-service.ts
@@ -3,7 +3,7 @@ import * as cdk from '@aws-cdk/core';
 import {Certificate} from '@aws-cdk/aws-certificatemanager';
 import {Vpc} from '@aws-cdk/aws-ec2';
 import {Repository} from '@aws-cdk/aws-ecr';
-import {FargateCluster, KubernetesResource, KubernetesVersion} from '@aws-cdk/aws-eks';
+import {FargateCluster, KubernetesManifest, KubernetesVersion} from '@aws-cdk/aws-eks';
 import {ContainerImage} from '@aws-cdk/aws-ecs';
 import {AccountRootPrincipal, Effect, FederatedPrincipal, ManagedPolicy, PolicyStatement, Role} from '@aws-cdk/aws-iam';
 import {StringParameter} from '@aws-cdk/aws-ssm';
@@ -64,7 +64,7 @@ class TriviaBackendStack extends cdk.Stack {
     });
     reinventTrivia.node.addDependency(fargateProfile);
 
-    const metricsServerChart = cluster.addChart('MetricsServer', {
+    const metricsServerChart = cluster.addHelmChart('MetricsServer', {
       chart: 'metrics-server',
       release: 'metrics-server-rt',
       repository: 'https://kubernetes-charts.storage.googleapis.com',
@@ -102,7 +102,7 @@ class TriviaBackendStack extends cdk.Stack {
             ]
           });
 
-          const albIngressChart = cluster.addChart('AlbIngress', {
+          const albIngressChart = cluster.addHelmChart('AlbIngress', {
             chart: 'aws-alb-ingress-controller',
             release: 'alb-ingress-controller-rt',
             repository: 'https://kubernetes-charts-incubator.storage.googleapis.com',
@@ -126,7 +126,7 @@ class TriviaBackendStack extends cdk.Stack {
           });
           albIngressChart.node.addDependency(metricsServerChart);
 
-          new KubernetesResource(this, 'HorizontalPodAutoscaler', {
+          new KubernetesManifest(this, 'HorizontalPodAutoscaler', {
             cluster,
             manifest: [{
               apiVersion: 'autoscaling/v1',
@@ -184,7 +184,7 @@ class TriviaBackendStack extends cdk.Stack {
                 })
               ]
             });
-            const externalDnsChart = cluster.addChart('ExternalDns', {
+            const externalDnsChart = cluster.addHelmChart('ExternalDns', {
               chart: 'external-dns',
               release: 'external-dns-rt',
               repository: 'https://kubernetes-charts.storage.googleapis.com',

diff --git a/trivia-backend/infra/cdk/eks/kubernetes-resources/reinvent-trivia.ts b/trivia-backend/infra/cdk/eks/kubernetes-resources/reinvent-trivia.ts
@@ -1,5 +1,5 @@
 import {Construct} from '@aws-cdk/core';
-import {Cluster, KubernetesResource} from '@aws-cdk/aws-eks';
+import {Cluster, KubernetesManifest} from '@aws-cdk/aws-eks';
 import {ICertificate} from '@aws-cdk/aws-certificatemanager';
 import {EcrImage} from '@aws-cdk/aws-ecs';
 /**
@@ -26,7 +26,7 @@ export interface ReinventTriviaResourceProps {
   readonly image: EcrImage;
 }
 
-export class ReinventTriviaResource extends KubernetesResource {
+export class ReinventTriviaResource extends KubernetesManifest {
   constructor(parent: Construct, id: string, props: ReinventTriviaResourceProps) {
     const manifest = [
       {