Skip to content

Commit

Permalink
Merge pull request #1035 from aws-quickstart/task/1.15.1-release-prep
Browse files Browse the repository at this point in the history
1.15.1 Patch Release
  • Loading branch information
shapirov103 authored Jul 2, 2024
2 parents cf23438 + 39616d9 commit bb17fdb
Show file tree
Hide file tree
Showing 12 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected].2
npm install -g [email protected].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.
Expand Down
4 changes: 2 additions & 2 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected].2
npm install -g [email protected].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.
Expand Down
6 changes: 3 additions & 3 deletions docs/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected].2 # may require sudo (Ubuntu) depending on configuration
cdk --version # must produce 2.147.2
npm install -g [email protected].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
Expand Down Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion docs/internal/ci.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected].2
npm install -g [email protected].3
```

Install the dependencies for this project.
Expand Down
2 changes: 1 addition & 1 deletion lib/addons/argocd/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/addons/efs-csi-driver/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion lib/addons/ingress-nginx/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion lib/addons/kube-state-metrics/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: {},
Expand Down
2 changes: 1 addition & 1 deletion lib/addons/prometheus-node-exporter/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: {},
Expand Down
2 changes: 1 addition & 1 deletion lib/pipelines/code-pipeline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ class CodePipeline {
primaryOutputDirectory: `${path}/cdk.out`,
installCommands: [
'n stable',
'npm install -g [email protected].2',
'npm install -g [email protected].3',
`cd $CODEBUILD_SRC_DIR/${path} && npm install`
],
commands: [`cd $CODEBUILD_SRC_DIR/${path}`, 'npm run build', 'npx cdk synth ' + app]
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}

0 comments on commit bb17fdb

Please sign in to comment.