Skip to content

Commit

Permalink
chore: bump karpenter to v0.23.0
Browse files Browse the repository at this point in the history
  • Loading branch information
robertd committed Feb 5, 2023
1 parent 891b388 commit ce36230
Show file tree
Hide file tree
Showing 7 changed files with 260 additions and 272 deletions.
4 changes: 0 additions & 4 deletions .projen/deps.json

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

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ More info about Karpenter at: https://karpenter.sh

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

Karpenter version: v0.22.1
Karpenter version: v0.23.0

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.
Expand Down Expand Up @@ -43,7 +43,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.22.1/concepts/deprovisioning/
// see: https://karpenter.sh/v0.23.0/concepts/deprovisioning/

// custom provisoner - kitchen sink
karpenter.addProvisioner('custom', {
Expand Down
19 changes: 9 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 @@ -472,7 +472,7 @@ export class Karpenter extends Construct {
this.karpenterHelmChart = new HelmChart(this, 'KarpenterHelmChart', {
chart: 'karpenter',
createNamespace: true,
version: 'v0.22.1',
version: 'v0.23.0',
cluster: this.cluster,
namespace: 'karpenter',
release: 'karpenter',
Expand Down Expand Up @@ -512,8 +512,8 @@ export class Karpenter extends Construct {
throw new Error('Parameters consolidation and ttlSecondsAfterEmpty are mutually exclusive.');
}

// see: https://karpenter.sh/v0.22.1/concepts/provisioners/
// see: https://karpenter.sh/v0.22.1/concepts/node-templates/
// see: https://karpenter.sh/v0.23.0/concepts/provisioners/
// see: https://karpenter.sh/v0.23.0/concepts/node-templates/
const awsNodeTemplateId = `${id}-awsNodeTemplate`.toLowerCase();
const awsNodeTemplate = this.cluster.addManifest(awsNodeTemplateId, {
apiVersion: 'karpenter.k8s.aws/v1alpha1',
Expand All @@ -522,43 +522,43 @@ export class Karpenter extends Construct {
name: awsNodeTemplateId,
},
spec: {
// see: https://karpenter.sh/v0.22.1/concepts/node-templates/#specsubnetselector
// see: https://karpenter.sh/v0.23.0/concepts/node-templates/#specsubnetselector
subnetSelector: {
[`karpenter.sh/discovery/${this.cluster.clusterName}`]: '*',
},
// see: https://karpenter.sh/v0.22.1/concepts/node-templates/#specsecuritygroupselector
// see: https://karpenter.sh/v0.23.0/concepts/node-templates/#specsecuritygroupselector
securityGroupSelector: {
[`kubernetes.io/cluster/${this.cluster.clusterName}`]: 'owned',
},
// see: https://karpenter.sh/v0.22.1/concepts/node-templates/#specsecuritygroupselector
// see: https://karpenter.sh/v0.23.0/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.22.1/concepts/node-templates/#specamifamily
// see: https://karpenter.sh/v0.23.0/concepts/node-templates/#specamifamily
...(provisionerSpecs?.provider?.amiFamily && { amiFamily: provisionerSpecs!.provider!.amiFamily! }),
// see https://karpenter.sh/v0.22.1/concepts/node-templates/#specamiselector
// see https://karpenter.sh/v0.23.0/concepts/node-templates/#specamiselector
...(provisionerSpecs?.provider?.amiSelector && { amiSelector: { ...provisionerSpecs!.provider!.amiSelector! } }),
// see: https://karpenter.sh/v0.22.1/aws/provisioning/#tags
// see: https://karpenter.sh/v0.23.0/aws/provisioning/#tags
...(provisionerSpecs?.provider?.tags && { tags: { ...provisionerSpecs!.provider!.tags! } }),
// see: https://karpenter.sh/v0.22.1/aws/provisioning/#block-device-mappings
// see: https://karpenter.sh/v0.23.0/aws/provisioning/#block-device-mappings
...(provisionerSpecs?.provider?.blockDeviceMappings && { blockDeviceMappings: provisionerSpecs!.provider!.blockDeviceMappings! }),
// TODO: add userData https://karpenter.sh/v0.22.1/aws/provisioning/#userdata
// TODO: add metadataOptions https://karpenter.sh/v0.22.1/aws/provisioning/#metadata-options
// TODO: add userData https://karpenter.sh/v0.23.0/aws/provisioning/#userdata
// TODO: add metadataOptions https://karpenter.sh/v0.23.0/aws/provisioning/#metadata-options
},
});

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

// see: https://karpenter.sh/v0.22.1/concepts/provisioners/
// see: https://karpenter.sh/v0.23.0/concepts/provisioners/
const provisioner = this.cluster.addManifest(id, {
apiVersion: 'karpenter.sh/v1alpha5',
kind: 'Provisioner',
metadata: {
name: id.toLowerCase(),
},
spec: {
// see: https://karpenter.sh/v0.22.1/concepts/provisioners/#speclimitsresources
// see: https://karpenter.sh/v0.23.0/concepts/provisioners/#speclimitsresources
...(provisionerSpecs?.limits && {
limits: {
resources: {
Expand All @@ -567,15 +567,15 @@ export class Karpenter extends Construct {
},
},
}),
// see: https://karpenter.sh/v0.22.1/concepts/provisioners/#specconsolidation
// see: https://karpenter.sh/v0.23.0/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.22.1/provisioner/#specrequirements
// see: https://karpenter.sh/v0.23.0/provisioner/#specrequirements
requirements: [
...requirements,
],
Expand All @@ -585,11 +585,11 @@ export class Karpenter extends Construct {
},
...(provisionerSpecs?.taints && { taints: provisionerSpecs!.taints! }),
...(provisionerSpecs?.startupTaints && { startupTaints: provisionerSpecs!.startupTaints! }),
// see: https://karpenter.sh/v0.22.1/concepts/provisioners/#specproviderref
// see: https://karpenter.sh/v0.23.0/concepts/provisioners/#specproviderref
providerRef: {
name: awsNodeTemplateId,
},
// see: https://karpenter.sh/v0.22.1/concepts/provisioners/#specproviderref
// see: https://karpenter.sh/v0.23.0/concepts/provisioners/#specproviderref

},
});
Expand Down
16 changes: 8 additions & 8 deletions test/__snapshots__/snapshot.test.ts.snap

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

4 changes: 2 additions & 2 deletions tsconfig.dev.json

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

0 comments on commit ce36230

Please sign in to comment.