Merge pull request #826 from aws-quickstart/task/1.11.0-release-prep

upgraded add-on versions, CDK moved to 2.92, NPM lib updates, kubectl layer for 1.27
aws-quickstart · Aug 21, 2023 · 8420eb7 · 8420eb7
2 parents 4d8cb61 + 53dfd99
commit 8420eb7
Show file tree

Hide file tree

Showing 32 changed files with 57 additions and 56 deletions.
diff --git a/README.md b/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.88.0
+npm install -g aws-cdk@2.91.0
 ```
 
 Verify the installation.
 
 ```bash
 cdk --version
-# must output 2.88.0
+# must output 2.91.0
 ```
 
 Create a new CDK project. We use `typescript` for this example.

diff --git a/docs/README.md b/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.88.0
+npm install -g aws-cdk@2.91.0
 ```
 
 Verify the installation.
 
 ```bash
 cdk --version
-# must output 2.88.0
+# must output 2.91.0
 ```
 
 Create a new CDK project. We use `typescript` for this example.

diff --git a/docs/getting-started.md b/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.88.0 # may require sudo (Ubuntu) depending on configuration
-cdk --version # must produce 2.88.0
+npm install -g aws-cdk@2.91.0 # may require sudo (Ubuntu) depending on configuration
+cdk --version # must produce 2.91.0
 mkdir my-blueprints
 cd my-blueprints
 cdk init app --language typescript
@@ -43,7 +43,6 @@ npm i @aws-quickstart/eks-blueprints
 Replace the contents of `bin/<your-main-file>.ts` (where `your-main-file` by default is the name of the root project directory) with the following code. This code will deploy a new EKS Cluster and install the `ArgoCD` addon.
 
 ```typescript
-import 'source-map-support/register';
 import * as cdk from 'aws-cdk-lib';
 import * as blueprints from '@aws-quickstart/eks-blueprints';
 

diff --git a/docs/internal/ci.md b/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.88.0
+npm install -g aws-cdk@2.91.0
 ```
 
 Install the dependencies for this project.

diff --git a/examples/blueprint-construct/index.ts b/examples/blueprint-construct/index.ts
@@ -193,7 +193,7 @@ export default class BlueprintConstruct {
         });
 
         const clusterProvider = new blueprints.GenericClusterProvider({
-            version: KubernetesVersion.V1_26,
+            version: KubernetesVersion.V1_27,
             tags: {
                 "Name": "blueprints-example-cluster",
                 "Type": "generic-cluster"

diff --git a/lib/addons/adot/index.ts b/lib/addons/adot/index.ts
@@ -13,7 +13,7 @@ type AdotCollectorAddOnProps = CoreAddOnProps;
 
 const defaultProps = {
     addOnName: 'adot',
-    version: 'v0.76.1-eksbuild.1',
+    version: 'v0.78.0-eksbuild.1',
     saName: 'adot-collector',
     policyDocumentProvider: getAdotCollectorPolicyDocument,
     namespace: 'default'

diff --git a/lib/addons/appmesh/index.ts b/lib/addons/appmesh/index.ts
@@ -44,7 +44,7 @@ const defaultProps = {
     name: "appmesh-controller",
     namespace: "appmesh-system",
     chart: "appmesh-controller",
-    version: "1.12.1",
+    version: "1.12.2",
     release: "appmesh-release",
     repository: "https://aws.github.io/eks-charts"
 };

diff --git a/lib/addons/argocd/index.ts b/lib/addons/argocd/index.ts
@@ -72,7 +72,7 @@ export interface ArgoCDAddOnProps extends HelmAddOnUserProps {
  */
 const defaultProps = {
     namespace: "argocd",
-    version: '5.41.1',
+    version: '5.43.4',
     chart: "argo-cd",
     release: "blueprints-addon-argocd",
     repository: "https://argoproj.github.io/argo-helm"

diff --git a/lib/addons/aws-for-fluent-bit/index.ts b/lib/addons/aws-for-fluent-bit/index.ts
@@ -26,7 +26,7 @@ const defaultProps: AwsForFluentBitAddOnProps = {
     name: 'fluent-bit',
     chart: 'aws-for-fluent-bit',
     release: "blueprints-addon-aws-for-fluent-bit",
-    version: '0.1.27',
+    version: '0.1.28',
     repository: 'https://aws.github.io/eks-charts',
     namespace: 'kube-system',
     createNamespace: false,

diff --git a/lib/addons/aws-loadbalancer-controller/index.ts b/lib/addons/aws-loadbalancer-controller/index.ts
@@ -56,7 +56,7 @@ const defaultProps: AwsLoadBalancerControllerProps = {
     chart: AWS_LOAD_BALANCER_CONTROLLER,
     repository: 'https://aws.github.io/eks-charts',
     release: AWS_LOAD_BALANCER_CONTROLLER,
-    version: '1.5.5',
+    version: '1.6.0',
     enableShield: false,
     enableWaf: false,
     enableWafv2: false,

diff --git a/lib/addons/cert-manager/index.ts b/lib/addons/cert-manager/index.ts
@@ -27,7 +27,7 @@ const defaultProps: HelmAddOnProps & CertManagerAddOnProps = {
   name: "blueprints-cert-manager-addon",
   namespace: "cert-manager",
   chart: "cert-manager",
-  version: "1.12.2",
+  version: "1.12.3",
   release: "cert-manager",
   repository:  "https://charts.jetstack.io",
   values: {},

diff --git a/lib/addons/cloudwatch-logs/index.ts b/lib/addons/cloudwatch-logs/index.ts
@@ -38,7 +38,7 @@ const defaultProps: CloudWatchLogsAddonProps = {
     name: 'aws-for-fluent-bit',
     chart: 'aws-for-fluent-bit',
     release: "blueprints-addon-aws-fluent-bit-for-cw",
-    version: '0.1.27',
+    version: '0.1.28',
     repository: 'https://aws.github.io/eks-charts',
     namespace: 'aws-for-fluent-bit',
     createNamespace: true,

diff --git a/lib/addons/coredns/index.ts b/lib/addons/coredns/index.ts
@@ -7,7 +7,7 @@ type coreDnsAddOnProps = Omit<CoreAddOnProps, "saName" | "addOnName">;
 
 const defaultProps = {
     addOnName: 'coredns',
-    version: 'v1.9.3-eksbuild.5',
+    version: 'v1.10.1-eksbuild.2',
     saName: 'coredns',
     configurationValues: {}
 };

diff --git a/lib/addons/ebs-csi-driver/index.ts b/lib/addons/ebs-csi-driver/index.ts
@@ -23,7 +23,7 @@ export interface EbsCsiDriverAddOnProps {
  */
 const defaultProps = {
     addOnName: "aws-ebs-csi-driver",
-    version: "v1.20.0-eksbuild.1",
+    version: "v1.21.0-eksbuild.1",
     saName: "ebs-csi-controller-sa",
 };
 

diff --git a/lib/addons/efs-csi-driver/index.ts b/lib/addons/efs-csi-driver/index.ts
@@ -37,7 +37,7 @@ export interface EfsCsiDriverProps extends HelmAddOnUserProps {
  * Defaults options for the add-on
  */
 const defaultProps: EfsCsiDriverProps = {
-    version: '2.4.7',
+    version: '2.4.9',
     namespace: "kube-system",
     repository: "https://kubernetes-sigs.github.io/aws-efs-csi-driver/",
     name: EFS_CSI_DRIVER,

diff --git a/lib/addons/external-secrets/index.ts b/lib/addons/external-secrets/index.ts
@@ -23,7 +23,7 @@ const defaultProps: ExternalsSecretsAddOnProps = {
   name: "external-secrets",
   chart: "external-secrets",
   release: "blueprints-addon-external-secrets",
-  version: "0.9.1",
+  version: "0.9.3",
   repository: "https://charts.external-secrets.io",
   namespace: "external-secrets",
   values: {},

diff --git a/lib/addons/fluxcd/index.ts b/lib/addons/fluxcd/index.ts
@@ -95,7 +95,7 @@ const defaultProps: HelmAddOnProps & FluxCDAddOnProps = {
   name: "fluxcd-addon",
   namespace: "flux-system",
   chart: "flux2",
-  version: "2.9.0",
+  version: "2.9.2",
   release: "blueprints-fluxcd-addon",
   repository: "https://fluxcd-community.github.io/helm-charts",
   values: {},

diff --git a/lib/addons/istio-base/index.ts b/lib/addons/istio-base/index.ts
@@ -55,7 +55,7 @@ const defaultProps = {
     release: "istio-base",
     namespace: "istio-system",
     chart: "base",
-    version: "1.18.1",
+    version: "1.18.2",
     repository: "https://istio-release.storage.googleapis.com/charts"
 };
 

diff --git a/lib/addons/istio-control-plane/index.ts b/lib/addons/istio-control-plane/index.ts
@@ -14,7 +14,7 @@ const defaultProps = {
     release: "istiod",
     namespace: "istio-system",
     chart: "istiod",
-    version: "1.18.1",
+    version: "1.18.2",
     repository: "https://istio-release.storage.googleapis.com/charts"
 };
 

diff --git a/lib/addons/karpenter/index.ts b/lib/addons/karpenter/index.ts
@@ -142,7 +142,7 @@ const RELEASE = 'blueprints-addon-karpenter';
 const defaultProps: HelmAddOnProps = {
     name: KARPENTER,
     namespace: KARPENTER,
-    version: 'v0.28.0',
+    version: 'v0.29.2',
     chart: KARPENTER,
     release: KARPENTER,
     repository: 'oci://public.ecr.aws/karpenter/karpenter',

diff --git a/lib/addons/keda/index.ts b/lib/addons/keda/index.ts
@@ -52,7 +52,7 @@ const defaultProps: HelmAddOnProps & KedaAddOnProps = {
   name: "blueprints-keda-addon",
   chart: "keda",
   namespace:"keda",
-  version: "2.11.1",
+  version: "2.11.2",
   release: "keda",
   repository:  "https://kedacore.github.io/charts",
   values: {},

diff --git a/lib/addons/kube-proxy/index.ts b/lib/addons/kube-proxy/index.ts
@@ -2,7 +2,7 @@ import { KubernetesVersion } from "aws-cdk-lib/aws-eks";
 import { CoreAddOn } from "../core-addon";
 
 const versionMap: Map<KubernetesVersion, string> = new Map([
-    [KubernetesVersion.of("1.27"), "v1.27.1-eksbuild.1"],
+    [KubernetesVersion.V1_27, "v1.27.1-eksbuild.1"],
     [KubernetesVersion.V1_26, "v1.26.2-eksbuild.1"],
     [KubernetesVersion.V1_25, "v1.25.6-eksbuild.1"],
     [KubernetesVersion.V1_24, "v1.24.7-eksbuild.2"],

diff --git a/lib/addons/kube-state-metrics/index.ts b/lib/addons/kube-state-metrics/index.ts
@@ -21,7 +21,7 @@ const defaultProps: HelmAddOnProps & KubeStateMetricsAddOnProps = {
   name: "kube-state-metrics",
   namespace: "kube-system",
   chart: "kube-state-metrics",
-  version: "5.10.0",
+  version: "5.10.1",
   release: "kube-state-metrics",
   repository:  "https://prometheus-community.github.io/helm-charts",
   values: {},

diff --git a/lib/addons/metrics-server/index.ts b/lib/addons/metrics-server/index.ts
@@ -21,7 +21,7 @@ export interface MetricsServerAddOnProps extends HelmAddOnUserProps {
 const defaultProps: HelmAddOnProps & MetricsServerAddOnProps = {
     chart: 'metrics-server',
     repository: 'https://kubernetes-sigs.github.io/metrics-server',
-    version: '3.10.0',
+    version: '3.11.0',
     release: 'blueprints-addon-metrics-server',
     name: 'metrics-server',
     namespace: 'kube-system',

diff --git a/lib/addons/nginx/index.ts b/lib/addons/nginx/index.ts
@@ -61,7 +61,7 @@ const defaultProps: NginxAddOnProps = {
     name: "nginx-ingress",
     chart: "nginx-ingress",
     release: "blueprints-addon-nginx",
-    version: "0.18.0",
+    version: "0.18.1",
     repository: "https://helm.nginx.com/stable",
     backendProtocol: 'tcp',
     crossZoneEnabled: true,

diff --git a/lib/addons/opa-gatekeeper/index.ts b/lib/addons/opa-gatekeeper/index.ts
@@ -19,7 +19,7 @@ const defaultProps: HelmAddOnProps = {
     namespace: 'gatekeeper-system',
     chart: 'gatekeeper',
     repository: "https://open-policy-agent.github.io/gatekeeper/charts",
-    version: '3.12.0'
+    version: '3.13.0'
 };
 
 export class OpaGatekeeperAddOn extends HelmAddOn implements ClusterPostDeploy {

diff --git a/lib/addons/prometheus-node-exporter/index.ts b/lib/addons/prometheus-node-exporter/index.ts
@@ -21,7 +21,7 @@ const defaultProps: HelmAddOnProps & PrometheusNodeExporterAddOnProps = {
   name: "prometheus-node-exporter",
   namespace: "prometheus-node-exporter",
   chart: "prometheus-node-exporter",
-  version: "4.20.0",
+  version: "4.22.0",
   release: "prometheus-node-exporter",
   repository:  "https://prometheus-community.github.io/helm-charts",
   values: {},

diff --git a/lib/addons/vpc-cni/index.ts b/lib/addons/vpc-cni/index.ts
@@ -292,7 +292,7 @@ export interface CustomNetworkingConfig {
 
 const defaultProps: CoreAddOnProps = {
   addOnName: 'vpc-cni',
-  version: 'v1.13.2-eksbuild.1',
+  version: 'v1.13.4-eksbuild.1',
   saName: 'aws-node',
   namespace: 'kube-system',
   controlPlaneAddOn: false,

diff --git a/lib/cluster-providers/generic-cluster-provider.ts b/lib/cluster-providers/generic-cluster-provider.ts
@@ -2,7 +2,8 @@
 import { KubectlV23Layer } from "@aws-cdk/lambda-layer-kubectl-v23";
 import { KubectlV24Layer } from "@aws-cdk/lambda-layer-kubectl-v24";
 import { KubectlV25Layer } from "@aws-cdk/lambda-layer-kubectl-v25";
-// import {KubectlV27Layer} from "@aws-cdk/lambda-layer-kubectl-v27";
+import { KubectlV26Layer } from "@aws-cdk/lambda-layer-kubectl-v26";
+import { KubectlV27Layer } from "@aws-cdk/lambda-layer-kubectl-v27";
 import { Tags } from "aws-cdk-lib";
 import * as autoscaling from 'aws-cdk-lib/aws-autoscaling';
 import * as ec2 from "aws-cdk-lib/aws-ec2";
@@ -16,7 +17,6 @@ import * as utils from "../utils";
 import * as constants from './constants';
 import { AutoscalingNodeGroup, ManagedNodeGroup } from "./types";
 import assert = require('assert');
-import { KubectlV26Layer } from "@aws-cdk/lambda-layer-kubectl-v26";
 
 export function clusterBuilder() {
     return new ClusterBuilder();
@@ -38,14 +38,14 @@ export function selectKubectlLayer(scope: Construct, version: eks.KubernetesVers
             return new KubectlV25Layer(scope, "kubectllayer25");
         case "1.26":
             return new KubectlV26Layer(scope, "kubectllayer26");
-        //case "1.27":
-            //return new KubectlV27Layer(scope, "kubectllayer27");
+        case "1.27":
+            return new KubectlV27Layer(scope, "kubectllayer27");
     }
 
     const minor = version.version.split('.')[1];
 
-    if(minor && parseInt(minor, 10) > 26) {
-        return new KubectlV26Layer(scope, "kubectllayer26"); // for all versions above 1.25 use 1.25 kubectl (unless explicitly supported in CDK)
+    if(minor && parseInt(minor, 10) > 27) {
+        return new KubectlV27Layer(scope, "kubectllayer27"); // for all versions above 1.27 use 1.27 kubectl (unless explicitly supported in CDK)
     }
     return undefined;
 }

diff --git a/lib/pipelines/code-pipeline.ts b/lib/pipelines/code-pipeline.ts
@@ -439,7 +439,7 @@ class CodePipeline {
               input: codePipelineSource,
               installCommands: [
                 'n stable',
-                'npm install -g aws-cdk@2.88.0',
+                'npm install -g aws-cdk@2.91.0',
                 'npm install',
               ],
               commands: ['npm run build', 'npx cdk synth ' + app]

diff --git a/lib/teams/aws-batch/aws-batch-on-eks-team.ts b/lib/teams/aws-batch/aws-batch-on-eks-team.ts
@@ -143,14 +143,14 @@ export class BatchEksTeam extends ApplicationTeam {
 
     jobQueue.node.addDependency(computeEnv);
   }
+
   /**
    * method to to apply k8s RBAC to the service account used by Batch service role
    * @param ClusterInfo EKS cluster where to apply the RBAC
    * @param namespace Namespace where the RBAC are applied
    * @param createNamespace flag to create namespace if not already created
    * @returns 
    */
-
   private setBatchEksResources(clusterInfo: ClusterInfo, namespace: string): Construct {
 
     let doc = readYamlDocument(`${__dirname}/aws-batch-rbac-config.ytpl`);
@@ -193,7 +193,7 @@ export class BatchEksTeam extends ApplicationTeam {
       instanceProfileName: ngRole,
       roles: [ngRole]
     });
-
+  
     const batchComputeEnv = new batch.CfnComputeEnvironment(cluster, "batch-eks-compute-environment", {
       type: 'MANAGED',
       computeEnvironmentName: this.batchTeamProps.envName,
@@ -215,7 +215,6 @@ export class BatchEksTeam extends ApplicationTeam {
     });
 
     batchComputeEnv.node.addDependency(instanceProfile);
-
     return batchComputeEnv;
   }
 }