From 39616d9b8e5a78ee426d5807e195ef8e38dbb823 Mon Sep 17 00:00:00 2001 From: shapirov Date: Tue, 2 Jul 2024 11:20:45 -0400 Subject: [PATCH] version updates, CDK moved to 2.147.3 --- .devcontainer/devcontainer.json | 2 +- README.md | 4 ++-- docs/README.md | 4 ++-- docs/getting-started.md | 6 +++--- docs/internal/ci.md | 2 +- lib/addons/argocd/index.ts | 2 +- lib/addons/efs-csi-driver/index.ts | 2 +- lib/addons/ingress-nginx/index.ts | 2 +- lib/addons/kube-state-metrics/index.ts | 2 +- lib/addons/prometheus-node-exporter/index.ts | 2 +- lib/pipelines/code-pipeline.ts | 2 +- package.json | 4 ++-- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 85f7cadf5..19bde9413 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -6,7 +6,7 @@ }, "ghcr.io/devcontainers/features/aws-cli:1": {}, "ghcr.io/devcontainers-contrib/features/aws-cdk:2": { - "version": "2.147.2" + "version": "2.147.3" } }, "postCreateCommand": ".devcontainer/postCreateCommand.sh", diff --git a/README.md b/README.md index bdf861c87..456299c5a 100644 --- a/README.md +++ b/README.md @@ -48,14 +48,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.147.2 +npm install -g aws-cdk@2.147.3 ``` Verify the installation. ```bash cdk --version -# must output 2.147.2 +# must output 2.147.3 ``` Create a new CDK project. We use `typescript` for this example. diff --git a/docs/README.md b/docs/README.md index a946f7557..0f00a779e 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.147.2 +npm install -g aws-cdk@2.147.3 ``` Verify the installation. ```bash cdk --version -# must output 2.147.2 +# must output 2.147.3 ``` Create a new CDK project. We use `typescript` for this example. diff --git a/docs/getting-started.md b/docs/getting-started.md index ebd7fe7f6..b17d58ce8 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.147.2 # may require sudo (Ubuntu) depending on configuration -cdk --version # must produce 2.147.2 +npm install -g aws-cdk@2.147.3 # may require sudo (Ubuntu) depending on configuration +cdk --version # must produce 2.147.3 mkdir my-blueprints cd my-blueprints cdk init app --language typescript @@ -57,7 +57,7 @@ npm ERR! peer bundled aws-cdk-lib@"2.133.0" from @aws-quickstart/eks-blueprints@ npm ERR! node_modules/@aws-quickstart/eks-blueprint ``` -This message means that the version of CDK that the customer is using is different from the version of CDK used in EKS Blueprints. Locate the line `peer bundled` and check the expected version of the CDK. Make sure that in your `package.json` the version is set to the expected. In this example, `package.json` contained `"aws-cdk-lib": "2.133.0"`, while the expected version was `2.147.2`. +This message means that the version of CDK that the customer is using is different from the version of CDK used in EKS Blueprints. Locate the line `peer bundled` and check the expected version of the CDK. Make sure that in your `package.json` the version is set to the expected. In this example, `package.json` contained `"aws-cdk-lib": "2.133.0"`, while the expected version was `2.147.3`. **Note**: after the initial installation, upgrading the version of CDK to an incompatible higher/lower version will produce a warning, but will succeed. For community support (submitting GitHub issues) please make sure you have a matching version configured. diff --git a/docs/internal/ci.md b/docs/internal/ci.md index af8d2238b..f7956e525 100644 --- 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.147.2 +npm install -g aws-cdk@2.147.3 ``` Install the dependencies for this project. diff --git a/lib/addons/argocd/index.ts b/lib/addons/argocd/index.ts index 5e5df7a42..d3f966556 100644 --- 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: '7.3.2', + version: '7.3.3', chart: "argo-cd", release: "blueprints-addon-argocd", repository: "https://argoproj.github.io/argo-helm" diff --git a/lib/addons/efs-csi-driver/index.ts b/lib/addons/efs-csi-driver/index.ts index 39452164b..8209284b8 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: '3.0.5', + version: '3.0.6', namespace: "kube-system", repository: "https://kubernetes-sigs.github.io/aws-efs-csi-driver/", name: EFS_CSI_DRIVER, diff --git a/lib/addons/ingress-nginx/index.ts b/lib/addons/ingress-nginx/index.ts index 89ad3bdc9..0250ca46d 100644 --- a/lib/addons/ingress-nginx/index.ts +++ b/lib/addons/ingress-nginx/index.ts @@ -163,7 +163,7 @@ const defaultProps: IngressNginxAddOnProps = { name: "kubernetes-ingress", chart: "ingress-nginx", release: "k8s-ingress", - version: "4.10.0", + version: "4.10.1", repository: "https://kubernetes.github.io/ingress-nginx", backendProtocol: 'http', crossZoneEnabled: true, diff --git a/lib/addons/kube-state-metrics/index.ts b/lib/addons/kube-state-metrics/index.ts index af9c91405..ce684a817 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.20.1", + version: "5.21.0", release: "kube-state-metrics", repository: "https://prometheus-community.github.io/helm-charts", values: {}, diff --git a/lib/addons/prometheus-node-exporter/index.ts b/lib/addons/prometheus-node-exporter/index.ts index 39e7c24ad..7fd960a0a 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.36.0", + version: "4.37.0", release: "prometheus-node-exporter", repository: "https://prometheus-community.github.io/helm-charts", values: {}, diff --git a/lib/pipelines/code-pipeline.ts b/lib/pipelines/code-pipeline.ts index 0aff78a05..7737af504 100644 --- a/lib/pipelines/code-pipeline.ts +++ b/lib/pipelines/code-pipeline.ts @@ -457,7 +457,7 @@ class CodePipeline { primaryOutputDirectory: `${path}/cdk.out`, installCommands: [ 'n stable', - 'npm install -g aws-cdk@2.147.2', + 'npm install -g aws-cdk@2.147.3', `cd $CODEBUILD_SRC_DIR/${path} && npm install` ], commands: [`cd $CODEBUILD_SRC_DIR/${path}`, 'npm run build', 'npx cdk synth ' + app] diff --git a/package.json b/package.json index 129190b7f..1e6fe6e8c 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,7 @@ "semver": "^7.6.0" }, "peerDependencies": { - "aws-cdk-lib": "2.147.2", - "aws-cdk": "2.147.2" + "aws-cdk-lib": "2.147.3", + "aws-cdk": "2.147.3" } }