Skip to content

Commit

Permalink
chore: bump karpenter to 0.27.5
Browse files Browse the repository at this point in the history
  • Loading branch information
robertd committed May 20, 2023
1 parent 7428c41 commit c954f54
Show file tree
Hide file tree
Showing 13 changed files with 716 additions and 630 deletions.
1 change: 1 addition & 0 deletions .gitattributes

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 8 additions & 6 deletions .github/workflows/build.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .github/workflows/release.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/upgrade-main.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .projen/deps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .projen/files.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .projenrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ const project = new awscdk.AwsCdkConstructLibrary({
},
compat: true,
stability: 'experimental',
cdkVersion: '2.74.0',
workflowNodeVersion: '^18.15.0',
cdkVersion: '2.80.0',
workflowNodeVersion: '^18.16.0',
autoApproveOptions: {
allowedUsernames: ['cdk-karpenter-automation'],
secret: 'GITHUB_TOKEN',
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ More info about Karpenter at: https://karpenter.sh

Karpenter Best Practices: https://aws.github.io/aws-eks-best-practices/karpenter/

Karpenter version: v0.27.2
Karpenter version: v0.27.5

Notes:
- Karpenter no longer supports Kubernetes v1.20, but now supports Kubernetes v1.25. This change is due to the v1 PDB API, which was introduced in K8s v1.20 and subsequent removal of the v1beta1 API in K8s v1.25.
- Prior to v0.20.0, Karpenter would prioritize certain instance type categories absent of any requirements in the Provisioner. v0.20.0+ removes prioritizing these instance type categories (“m”, “c”, “r”, “a”, “t”, “i”) in code. Bare Metal and GPU instance types are still deprioritized and only used if no other instance types are compatible with the node requirements. This means that, now, you will need to explicitly define the instance types, sizes or categories you want to allow in your Provisioner; otherwise, it is possible that you receive more exotic instance types.
- As of v0.16.0 changed the default replicas from 1 to 2. See: https://github.com/aws/karpenter/blob/main/website/content/en/v0.16.1/troubleshooting.md

Upgrade Notes: https://karpenter.sh/v0.27.2/upgrade-guide/#released-upgrade-notes
Upgrade Notes: https://karpenter.sh/v0.27.5/upgrade-guide/#released-upgrade-notes

## Docs

Expand All @@ -26,7 +26,7 @@ Upgrade Notes: https://karpenter.sh/v0.27.2/upgrade-guide/#released-upgrade-note
```ts
import { InstanceClass, InstanceSize, InstanceType, EbsDeviceVolumeType, Vpc } from 'aws-cdk-lib/aws-ec2';
import { Cluster, KubernetesVersion, Nodegroup } from 'aws-cdk-lib/aws-eks';
import { KubectlV25Layer } from '@aws-cdk/lambda-layer-kubectl-v25';
import { KubectlV25Layer } from '@aws-cdk/lambda-layer-kubectl-v26';
import { Karpenter, AMIFamily } from "cdk-karpenter";

...
Expand All @@ -35,8 +35,8 @@ const vpc = new Vpc(stack, 'Vpc', { natGateways: 1 });

const cluster = new Cluster(stack, 'eks', {
vpc,
version: KubernetesVersion.V1_25,
kubectlLayer: new KubectlV24Layer(stack, 'kubectl'),
version: KubernetesVersion.V1_26,
kubectlLayer: new KubectlV26Layer(stack, 'kubectl'),
defaultCapacity: 1,
defaultCapacityInstance: InstanceType.of(InstanceClass.T3A, InstanceSize.MEDIUM),
});
Expand All @@ -49,7 +49,7 @@ const karpenter = new Karpenter(stack, 'karpenter', {
// default provisioner
karpenter.addProvisioner('default');
// Note: Default provisioner has no cpu/mem limits, nor will cleanup provisioned resources. Use with caution!!!
// see: https://karpenter.sh/v0.27.2/concepts/deprovisioning/
// see: https://karpenter.sh/v0.27.5/concepts/deprovisioning/

// custom provisoner - kitchen sink
karpenter.addProvisioner('custom', {
Expand Down
20 changes: 10 additions & 10 deletions package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 19 additions & 19 deletions src/karpenter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ export class Karpenter extends Construct {
this.karpenterHelmChart = new HelmChart(this, 'KarpenterHelmChart', {
chart: 'karpenter',
createNamespace: true,
version: 'v0.27.2',
version: 'v0.27.5',
cluster: this.cluster,
namespace: 'karpenter',
release: 'karpenter',
Expand All @@ -494,7 +494,7 @@ export class Karpenter extends Construct {
'eks.amazonaws.com/role-arn': this.karpenterControllerRole.roleArn,
},
},
// see: https://karpenter.sh/v0.27.2/concepts/settings/
// see: https://karpenter.sh/v0.27.5/concepts/settings/
settings: {
aws: {
clusterName: this.cluster.clusterName,
Expand All @@ -521,8 +521,8 @@ export class Karpenter extends Construct {
throw new Error('Parameters consolidation and ttlSecondsAfterEmpty are mutually exclusive.');
}

// see: https://karpenter.sh/v0.27.2/concepts/provisioners/
// see: https://karpenter.sh/v0.27.2/concepts/node-templates/
// see: https://karpenter.sh/v0.27.5/concepts/provisioners/
// see: https://karpenter.sh/v0.27.5/concepts/node-templates/
const awsNodeTemplateId = `${id}-awsNodeTemplate`.toLowerCase();
const awsNodeTemplate = this.cluster.addManifest(awsNodeTemplateId, {
apiVersion: 'karpenter.k8s.aws/v1alpha1',
Expand All @@ -531,43 +531,43 @@ export class Karpenter extends Construct {
name: awsNodeTemplateId,
},
spec: {
// see: https://karpenter.sh/v0.27.2/concepts/node-templates/#specsubnetselector
// see: https://karpenter.sh/v0.27.5/concepts/node-templates/#specsubnetselector
subnetSelector: {
[`karpenter.sh/discovery/${this.cluster.clusterName}`]: '*',
},
// see: https://karpenter.sh/v0.27.2/concepts/node-templates/#specsecuritygroupselector
// see: https://karpenter.sh/v0.27.5/concepts/node-templates/#specsecuritygroupselector
securityGroupSelector: {
[`kubernetes.io/cluster/${this.cluster.clusterName}`]: 'owned',
},
// see: https://karpenter.sh/v0.27.2/concepts/node-templates/#specsecuritygroupselector
// see: https://karpenter.sh/v0.27.5/concepts/node-templates/#specsecuritygroupselector
// instanceProfile is created using L1 construct (CfnInstanceProfile), thus we're referencing ref directly
// TODO: revisit this when L2 InstanceProfile construct is released
instanceProfile: this.instanceProfile.ref,
// see: https://karpenter.sh/v0.27.2/concepts/node-templates/#specamifamily
// see: https://karpenter.sh/v0.27.5/concepts/node-templates/#specamifamily
...(provisionerSpecs?.provider?.amiFamily && { amiFamily: provisionerSpecs!.provider!.amiFamily! }),
// see https://karpenter.sh/v0.27.2/concepts/node-templates/#specamiselector
// see https://karpenter.sh/v0.27.5/concepts/node-templates/#specamiselector
...(provisionerSpecs?.provider?.amiSelector && { amiSelector: { ...provisionerSpecs!.provider!.amiSelector! } }),
// see: https://karpenter.sh/v0.27.2/concepts/node-templates/#spectags
// see: https://karpenter.sh/v0.27.5/concepts/node-templates/#spectags
...(provisionerSpecs?.provider?.tags && { tags: { ...provisionerSpecs!.provider!.tags! } }),
// see: https://karpenter.sh/v0.27.2/concepts/node-templates/#specblockdevicemappings
// see: https://karpenter.sh/v0.27.5/concepts/node-templates/#specblockdevicemappings
...(provisionerSpecs?.provider?.blockDeviceMappings && { blockDeviceMappings: provisionerSpecs!.provider!.blockDeviceMappings! }),
// TODO: add userData https://karpenter.sh/v0.27.2/concepts/node-templates/#specuserdata
// TODO: add metadataOptions https://karpenter.sh/v0.27.2/concepts/node-templates/#specmetadataoptions
// TODO: add userData https://karpenter.sh/v0.27.5/concepts/node-templates/#specuserdata
// TODO: add metadataOptions https://karpenter.sh/v0.27.5/concepts/node-templates/#specmetadataoptions
},
});

// see: https://karpenter.sh/v0.27.2/concepts/provisioners/#specrequirements
// see: https://karpenter.sh/v0.27.5/concepts/provisioners/#specrequirements
const requirements = this.setRequirements(provisionerSpecs?.requirements);

// see: https://karpenter.sh/v0.27.2/concepts/provisioners/
// see: https://karpenter.sh/v0.27.5/concepts/provisioners/
const provisioner = this.cluster.addManifest(id, {
apiVersion: 'karpenter.sh/v1alpha5',
kind: 'Provisioner',
metadata: {
name: id.toLowerCase(),
},
spec: {
// see: https://karpenter.sh/v0.27.2/concepts/provisioners/#speclimitsresources
// see: https://karpenter.sh/v0.27.5/concepts/provisioners/#speclimitsresources
...(provisionerSpecs?.limits && {
limits: {
resources: {
Expand All @@ -576,15 +576,15 @@ export class Karpenter extends Construct {
},
},
}),
// see: https://karpenter.sh/v0.27.2/concepts/provisioners/#specconsolidation
// see: https://karpenter.sh/v0.27.5/concepts/provisioners/#specconsolidation
...provisionerSpecs?.consolidation && {
consolidation: {
enabled: provisionerSpecs!.consolidation,
},
},
...(provisionerSpecs?.ttlSecondsAfterEmpty && { ttlSecondsAfterEmpty: provisionerSpecs!.ttlSecondsAfterEmpty!.toSeconds() }),
...(provisionerSpecs?.ttlSecondsUntilExpired && { ttlSecondsUntilExpired: provisionerSpecs!.ttlSecondsUntilExpired!.toSeconds() }),
// see: https://karpenter.sh/v0.27.2/concepts/provisioners/#specrequirements
// see: https://karpenter.sh/v0.27.5/concepts/provisioners/#specrequirements
requirements: [
...requirements,
],
Expand All @@ -594,7 +594,7 @@ export class Karpenter extends Construct {
},
...(provisionerSpecs?.taints && { taints: provisionerSpecs!.taints! }),
...(provisionerSpecs?.startupTaints && { startupTaints: provisionerSpecs!.startupTaints! }),
// see: https://karpenter.sh/v0.27.2/concepts/provisioners/#specproviderref
// see: https://karpenter.sh/v0.27.5/concepts/provisioners/#specproviderref
providerRef: {
name: awsNodeTemplateId,
},
Expand Down

0 comments on commit c954f54

Please sign in to comment.