Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Task/1.14.1 release prep #966

Merged
merged 2 commits into from
Mar 22, 2024
Merged

Task/1.14.1 release prep #966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
add700e
Version increment and doc updates
shapirov103 Mar 22, 2024
3e8f515
Version increment and doc updates
shapirov103 Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
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 aws-cdk@2.132.0
npm install -g aws-cdk@2.133.0
```

Verify the installation.

```bash
cdk --version
# must output 2.132.0
# must output 2.133.0
```

Create a new CDK project. We use `typescript` for this example.
Expand Down
4 changes: 2 additions & 2 deletions docs/README.md
View file
Open in desktop
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 aws-cdk@2.132.0
npm install -g aws-cdk@2.133.0
```

Verify the installation.

```bash
cdk --version
# must output 2.132.0
# must output 2.133.0
```

Create a new CDK project. We use `typescript` for this example.
Expand Down
2 changes: 1 addition & 1 deletion docs/addons/aws-node-termination-handler.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const app = new cdk.App();
const addOn = new blueprints.addons.AwsNodeTerminationHandlerAddOn();

const clusterProvider = new blueprints.AsgClusterProvider({
version: eks.KubernetesVersion.V1_25,
version: eks.KubernetesVersion.V1_29,
machineImageType: eks.MachineImageType.BOTTLEROCKET
});

Expand Down
2 changes: 1 addition & 1 deletion docs/addons/vpc-cni.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ const nodeRole = new blueprints.CreateRoleProvider("blueprint-node-role", new ia
]);

const clusterProvider = new blueprints.GenericClusterProvider({
version: KubernetesVersion.V1_25,
version: KubernetesVersion.V1_29,
managedNodeGroups: [
{
id: "mng1",
Expand Down
6 changes: 3 additions & 3 deletions docs/cluster-providers/generic-cluster-provider.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const ebsDeviceProps: ec2.EbsDeviceProps = {
volumeType: ec2.EbsDeviceVolumeType.GP2
};
const clusterProvider = new blueprints.GenericClusterProvider({
version: KubernetesVersion.V1_25,
version: KubernetesVersion.V1_29,
tags: {
"Name": "blueprints-example-cluster",
"Type": "generic-cluster"
Expand Down Expand Up @@ -142,7 +142,7 @@ All of such cases can be solved with [Resource Providers](../resource-providers/
Example:
```typescript
const clusterProvider = new blueprints.GenericClusterProvider({
version: KubernetesVersion.V1_25,
version: KubernetesVersion.V1_29,
tags: {
"Name": "blueprints-example-cluster",
"Type": "generic-cluster"
Expand Down Expand Up @@ -212,7 +212,7 @@ Upgrading Kubernetes versions via cluster configuration at present won't impact

```typescript
const clusterProvider = new blueprints.GenericClusterProvider({
version: KubernetesVersion.V1_25,
version: KubernetesVersion.V1_29,
managedNodeGroups: [
{
id: "managed-1",
Expand Down
8 changes: 4 additions & 4 deletions docs/cluster-providers/mng-cluster-provider.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const props: MngClusterProviderProps = {
instanceTypes: [new InstanceType('m5.large')],
amiType: NodegroupAmiType.AL2_X86_64,
nodeGroupCapacityType: CapacityType.ON_DEMAND,
version: KubernetesVersion.V1_25,
version: KubernetesVersion.V1_29,
amiReleaseVersion: "1.20.4-20210519" // this will upgrade kubelet to 1.20.4
}
const clusterProvider = new blueprints.MngClusterProvider(props);
Expand Down Expand Up @@ -62,7 +62,7 @@ Upgrading Kubernetes versions via cluster configuration at present won't impact

```typescript
const props: MngClusterProviderProps = {
version: KubernetesVersion.V1_25,
version: KubernetesVersion.V1_29,
amiReleaseVersion: "1.25.7-20230509" // this will upgrade kubelet to 1.25
}
```
Expand All @@ -76,7 +76,7 @@ To create clusters which leverage Spot capacity, set the `nodeGroupCapacityType`
```typescript
const props: MngClusterProviderProps = {
nodeGroupCapacityType: CapacityType.SPOT,
version: KubernetesVersion.V1_25,
version: KubernetesVersion.V1_29,
instanceTypes: [new InstanceType('t3.large'), new InstanceType('m5.large')],
amiReleaseVersion: "1.25.7-20230509" // this will upgrade kubelet to 1.25
}
Expand All @@ -94,7 +94,7 @@ userData.addCommands(`/etc/eks/bootstrap.sh ${cluster.clusterName}`);

const props: MngClusterProviderProps = {
nodeGroupCapacityType: CapacityType.ON_DEMAND,
version: KubernetesVersion.V1_25,
version: KubernetesVersion.V1_29,
instanceTypes: [new InstanceType('t3.large')],
customAmi: {
machineImage: MachineImage.genericLinux({'us-east-1': 'ami-0be34337b485b2609'}),
Expand Down
10 changes: 5 additions & 5 deletions docs/getting-started.md
View file
Open in desktop
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 aws-cdk@2.132.0 # may require sudo (Ubuntu) depending on configuration
cdk --version # must produce 2.132.0
npm install -g aws-cdk@2.133.0 # may require sudo (Ubuntu) depending on configuration
cdk --version # must produce 2.133.0
mkdir my-blueprints
cd my-blueprints
cdk init app --language typescript
Expand All @@ -53,11 +53,11 @@ npm ERR! node_modules/aws-cdk-lib
npm ERR! aws-cdk-lib@"2.130.0" from the root project
npm ERR!
npm ERR! Could not resolve dependency:
npm ERR! peer bundled aws-cdk-lib@"2.132.0" from @aws-quickstart/eks-blueprints@1.14.0
npm ERR! peer bundled aws-cdk-lib@"2.133.0" from @aws-quickstart/eks-blueprints@1.14.0
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.130.0"`, while the expected version was `2.132.0`.
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.130.0"`, while the expected version was `2.133.0`.

**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 All @@ -66,7 +66,7 @@ Example warning:
```
npm WARN
npm WARN Could not resolve dependency:
npm WARN peer bundled aws-cdk-lib@"2.132.0" from @aws-quickstart/eks-blueprints@1.14.0
npm WARN peer bundled aws-cdk-lib@"2.133.0" from @aws-quickstart/eks-blueprints@1.14.0
```

## Deploy EKS Clusters
Expand Down
2 changes: 1 addition & 1 deletion docs/internal/ci.md
View file
Open in desktop
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 aws-cdk@2.132.0
npm install -g aws-cdk@2.133.0
```

Install the dependencies for this project.
Expand Down
4 changes: 2 additions & 2 deletions docs/resource-providers/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ Example with an anonymous resource:

```typescript
const clusterProvider = new blueprints.GenericClusterProvider({
version: KubernetesVersion.V1_25,
version: KubernetesVersion.V1_29,
mastersRole: blueprints.getResource(context => { // will generate a unique name for resource. designed for cases when resource is defined once and needed in a single place.
return new iam.Role(context.scope, 'AdminRole', { assumedBy: new AccountRootPrincipal() });
}),
Expand All @@ -241,7 +241,7 @@ Example with a named resource:

```typescript
const clusterProvider = new blueprints.GenericClusterProvider({
version: KubernetesVersion.V1_25,
version: KubernetesVersion.V1_29,
mastersRole: blueprints.getNamedResource("my-role") as iam.Role,
managedNodeGroups: [
...
Expand Down
2 changes: 1 addition & 1 deletion examples/examples.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const kmsKey: kms.Key = bp.getNamedResource(KMS_RESOURCE);
const builder = () => base.clone();

const publicCluster = {
version: KubernetesVersion.V1_25,
version: KubernetesVersion.V1_29,
vpcSubnets: [{ subnetType: ec2.SubnetType.PUBLIC }]
};

Expand Down
2 changes: 1 addition & 1 deletion lib/pipelines/code-pipeline.ts
View file
Open in desktop
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 aws-cdk@2.132.0',
'npm install -g aws-cdk@2.133.0',
`cd $CODEBUILD_SRC_DIR/${path} && npm install`
],
commands: [`cd $CODEBUILD_SRC_DIR/${path}`, 'npm run build', 'npx cdk synth ' + app]
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aws-quickstart/eks-blueprints",
"version": "1.14.0",
"version": "1.14.1",
"license": "Apache-2.0",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand Down Expand Up @@ -72,7 +72,7 @@
"semver": "^7.6.0"
},
"peerDependencies": {
"aws-cdk-lib": "2.132.0",
"aws-cdk": "2.132.0"
"aws-cdk-lib": "2.133.0",
"aws-cdk": "2.133.0"
}
}
Loading