From 45b5d108fad4aa6f79a114784cfd03b24ee762cd Mon Sep 17 00:00:00 2001 From: shapirov Date: Tue, 9 May 2023 23:55:26 -0400 Subject: [PATCH 1/2] Release prep for 1.7.3, updated CDK, helm chart versions, core addons, libraries --- README.md | 4 ++-- docs/README.md | 4 ++-- docs/getting-started.md | 4 ++-- lib/addons/cert-manager/index.ts | 2 +- lib/addons/coredns/index.ts | 2 +- lib/addons/ebs-csi-driver/index.ts | 2 +- lib/addons/efs-csi-driver/index.ts | 2 +- lib/addons/external-dns/index.ts | 2 +- lib/addons/kube-state-metrics/index.ts | 2 +- lib/addons/nginx/index.ts | 2 +- lib/addons/prometheus-node-exporter/index.ts | 2 +- lib/addons/velero/index.ts | 2 +- lib/pipelines/code-pipeline.ts | 2 +- package.json | 12 ++++++------ 14 files changed, 22 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 736b66b55..5206b858c 100644 --- 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.76.0 +npm install -g aws-cdk@2.78.0 ``` Verify the installation. ```bash cdk --version -# must output 2.76.0 +# must output 2.78.0 ``` Create a new CDK project. We use `typescript` for this example. diff --git a/docs/README.md b/docs/README.md index 8ce97bfaf..9be2650f7 100644 --- 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.76.0 +npm install -g aws-cdk@2.78.0 ``` Verify the installation. ```bash cdk --version -# must output 2.76.0 +# must output 2.78.0 ``` Create a new CDK project. We use `typescript` for this example. diff --git a/docs/getting-started.md b/docs/getting-started.md index 7d4c6aeb8..4cc7a7c6c 100644 --- 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.76.0 # may require sudo (Ubuntu) depending on configuration -cdk --version # must produce 2.76.0 +npm install -g aws-cdk@2.78.0 # may require sudo (Ubuntu) depending on configuration +cdk --version # must produce 2.78.0 mkdir my-blueprints cd my-blueprints cdk init app --language typescript diff --git a/lib/addons/cert-manager/index.ts b/lib/addons/cert-manager/index.ts index a5968461c..735e0c748 100644 --- 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.11.1", + version: "1.11.2", release: "cert-manager", repository: "https://charts.jetstack.io", values: {}, diff --git a/lib/addons/coredns/index.ts b/lib/addons/coredns/index.ts index 37a943c61..1e7a5560d 100644 --- a/lib/addons/coredns/index.ts +++ b/lib/addons/coredns/index.ts @@ -8,7 +8,7 @@ export class CoreDnsAddOn extends CoreAddOn { constructor(version?: string) { super({ addOnName: "coredns", - version: version ?? "v1.9.3-eksbuild.2", + version: version ?? "v1.9.3-eksbuild.3", saName: "coredns" }); } diff --git a/lib/addons/ebs-csi-driver/index.ts b/lib/addons/ebs-csi-driver/index.ts index 3050c0328..6d5e9bed1 100644 --- a/lib/addons/ebs-csi-driver/index.ts +++ b/lib/addons/ebs-csi-driver/index.ts @@ -23,7 +23,7 @@ interface EbsCsiDriverAddOnProps { */ const defaultProps = { addOnName: "aws-ebs-csi-driver", - version: "v1.16.1-eksbuild.1", + version: "v1.18.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 index 019cf38f8..1b057693d 100644 --- 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.1', + version: '2.4.3', namespace: "kube-system", repository: "https://kubernetes-sigs.github.io/aws-efs-csi-driver/", name: EFS_CSI_DRIVER, diff --git a/lib/addons/external-dns/index.ts b/lib/addons/external-dns/index.ts index 1a07ec582..9cb6f5c22 100644 --- a/lib/addons/external-dns/index.ts +++ b/lib/addons/external-dns/index.ts @@ -24,7 +24,7 @@ const defaultProps = { namespace: 'external-dns', repository: 'https://charts.bitnami.com/bitnami', release: 'blueprints-addon-external-dns', - version: '6.18.0', + version: '6.19.2', values: {}, }; diff --git a/lib/addons/kube-state-metrics/index.ts b/lib/addons/kube-state-metrics/index.ts index 44899d543..c980b39b6 100644 --- 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.6.0", + version: "5.6.1", release: "kube-state-metrics", repository: "https://prometheus-community.github.io/helm-charts", values: {}, diff --git a/lib/addons/nginx/index.ts b/lib/addons/nginx/index.ts index 358ebc38d..14950121b 100644 --- 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.17.0", + version: "0.17.1", repository: "https://helm.nginx.com/stable", backendProtocol: 'tcp', crossZoneEnabled: true, diff --git a/lib/addons/prometheus-node-exporter/index.ts b/lib/addons/prometheus-node-exporter/index.ts index e6f005a81..2ca3f5a96 100644 --- 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.17.0", + version: "4.17.2", release: "prometheus-node-exporter", repository: "https://prometheus-community.github.io/helm-charts", values: {}, diff --git a/lib/addons/velero/index.ts b/lib/addons/velero/index.ts index f5a6d38c8..c12a883d9 100644 --- a/lib/addons/velero/index.ts +++ b/lib/addons/velero/index.ts @@ -19,7 +19,7 @@ export interface VeleroAddOnProps extends HelmAddOnUserProps { */ const defaultProps = { name: 'velero', - version: "3.2.0", + version: "4.0.2", namespace: "velero", createNamespace: true, chart: "velero", diff --git a/lib/pipelines/code-pipeline.ts b/lib/pipelines/code-pipeline.ts index 2d00330c9..315648e33 100644 --- a/lib/pipelines/code-pipeline.ts +++ b/lib/pipelines/code-pipeline.ts @@ -357,7 +357,7 @@ class CodePipeline { input: codePipelineSource, installCommands: [ 'n stable', - 'npm install -g aws-cdk@2.76.0', + 'npm install -g aws-cdk@2.78.0', 'npm install', ], commands: ['npm run build', 'npx cdk synth'] diff --git a/package.json b/package.json index 6474d311c..289882ec8 100644 --- a/package.json +++ b/package.json @@ -16,16 +16,16 @@ "@types/dot-object": "^2.1.2", "@types/jest": "^29.5.1", "@types/js-yaml": "^4.0.5", - "@types/node": "^18.15.12", + "@types/node": "^18.16.6", "@types/semver": "^7.3.13", "@types/uuid": "^9.0.1", "@typescript-eslint/eslint-plugin": "^5.59.0", "@typescript-eslint/parser": "^5.59.0", - "aws-cdk": "^2.76.0", + "aws-cdk": "^2.78.0", "copyfiles": "^2.4.1", "eslint": "^8.38.0", "jest": "^29.5.0", - "json-schema-to-typescript": "^12.0.0", + "json-schema-to-typescript": "^13.0.1", "lint": "^1.1.2", "ts-jest": "^29.1.0", "ts-node": "^10.9.1", @@ -34,16 +34,16 @@ }, "dependencies": { "@aws-cdk/lambda-layer-kubectl-v23": "^2.0.7", - "@aws-cdk/lambda-layer-kubectl-v24": "^2.0.167", + "@aws-cdk/lambda-layer-kubectl-v24": "^2.0.168", "@aws-cdk/lambda-layer-kubectl-v25": "^2.0.3", "@aws-sdk/client-secrets-manager": "^3.316.0", "@types/assert": "^1.5.6", "@types/bcrypt": "^5.0.0", "@types/lodash.clonedeep": "^4.5.7", "@types/uuid": "^9.0.1", - "aws-cdk-lib": "2.76.0", + "aws-cdk-lib": "2.78.0", "bcrypt": "^5.1.0", - "constructs": "^10.2.1", + "constructs": "^10.2.18", "dot-object": "^2.1.4", "js-yaml": "4.1.0", "lodash": "4.17.21", From 58ef76598c655af2da7901d0abba0a4b6a6158fb Mon Sep 17 00:00:00 2001 From: shapirov Date: Wed, 10 May 2023 18:46:50 -0400 Subject: [PATCH 2/2] reverted velero version as it introduced incompatibility --- lib/addons/velero/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/addons/velero/index.ts b/lib/addons/velero/index.ts index c12a883d9..f5a6d38c8 100644 --- a/lib/addons/velero/index.ts +++ b/lib/addons/velero/index.ts @@ -19,7 +19,7 @@ export interface VeleroAddOnProps extends HelmAddOnUserProps { */ const defaultProps = { name: 'velero', - version: "4.0.2", + version: "3.2.0", namespace: "velero", createNamespace: true, chart: "velero",