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

upgraded to 1.16.3 Added an ASG with Spot and termination handler #182

Merged
merged 4 commits into from
Jan 29, 2025
Merged

upgraded to 1.16.3 Added an ASG with Spot and termination handler #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c059808
upgraded to 1.16.3 and latest CDK. Added an ASG with Spot and termina…
shapirov103 Jan 23, 2025
035534f
changed CI from mac to ubuntu
shapirov103 Jan 23, 2025
7c1cb3a
reverted the change from ubuntu to macos due to dependency on brew
shapirov103 Jan 23, 2025
5442d45
fixed indentation to comply with rules
shapirov103 Jan 23, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
build:
runs-on: macos-12
runs-on: macos-14

strategy:
matrix:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ bootstrap:

check-lib:
ifeq ($(shell brew ls --versions $(LIB)),)
@echo Installing $(LIB) via Hombrew
@echo Installing $(LIB) via Homebrew
@brew install $(LIB)
else
@echo $(LIB) is already installed, skipping.
Expand Down
28 changes: 28 additions & 0 deletions bin/asg.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import 'source-map-support/register';
import * as cdk from 'aws-cdk-lib';
import * as blueprints from '@aws-quickstart/eks-blueprints';

import { configureApp } from "../lib/common/construct-utils";

const app = configureApp();

const spotInterruptHandlerAddOn = new blueprints.addons.AwsNodeTerminationHandlerAddOn({
version: "0.25.1",
repository: 'oci://public.ecr.aws/aws-ec2/helm/aws-node-termination-handler'
});

const clusterProvider = new blueprints.AsgClusterProvider({
version: cdk.aws_eks.KubernetesVersion.V1_30,
minSize: 1, maxSize: 1, spotPrice: "0.10",
machineImageType: cdk.aws_eks.MachineImageType.BOTTLEROCKET,
id: "asg-spot",
name: "asg-spot",
spotInterruptHandler: false
});

const blueprint = blueprints.EksBlueprint.builder()

Check warning on line 23 in bin/asg.ts

View workflow job for this annotation

GitHub Actions / build (18) 

'blueprint' is assigned a value but never used
.region("us-west-2")
.version("auto")
.clusterProvider(clusterProvider)
.addOns(spotInterruptHandlerAddOn)
.build(app, 'asg-test');
14 changes: 7 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
"typescript": "^5.3.3"
},
"dependencies": {
"@aws-quickstart/eks-blueprints": "1.16.1",
"@aws-quickstart/eks-blueprints": "1.16.3",
"@aws-sdk/client-config-service": "^3.576.0",
"@aws-sdk/client-eks": "^3.478.0",
"@claranet-ch/konveyor-eks-blueprint-addon": "^1.0.2",
"@datadog/datadog-eks-blueprints-addon": "^0.1.2",
"@dynatrace/dynatrace-eks-blueprints-addon": "^1.3.1-1 ",
"@dynatrace/dynatrace-eks-blueprints-addon": "^1.4.0-1",
"@granulate/gmaestro-eks-blueprints-addon": "^1.0.16",
"@instana/aws-eks-blueprint-addon": "^1.0.4",
"@kastenhq/kasten-eks-blueprints-addon": "^1.0.1",
Expand All @@ -40,16 +40,16 @@
"@paralus/paralus-eks-blueprints-addon": "^0.1.5",
"@rafaysystems/rafay-eks-blueprints-addon": "^0.0.2",
"@snyk-partners/snyk-monitor-eks-blueprints-addon": "^1.1.1",
"aws-cdk": "2.162.1",
"aws-cdk-lib": "2.162.1",
"aws-cdk": "2.173.4",
"aws-cdk-lib": "2.173.4",
"eks-blueprints-cdk-kubeflow-ext": "0.1.9",
"kubeshark": "^0.0.9",
"source-map-support": "^0.5.21"
},
"overrides": {
"@aws-quickstart/eks-blueprints": "1.16.1",
"aws-cdk": "2.162.1",
"aws-cdk-lib": "2.162.1",
"@aws-quickstart/eks-blueprints": "1.16.3",
"aws-cdk": "2.173.4",
"aws-cdk-lib": "2.173.4",
"xml2js": "0.5.0",
"@aws-cdk/core": "../_EXCLUDED_",
"axios": "^1.6.2"
Expand Down
Loading