diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b25d7ecd..ac13dfed 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -8,7 +8,7 @@ on: jobs: build: - runs-on: macos-12 + runs-on: macos-14 strategy: matrix: diff --git a/Makefile b/Makefile index 525b2420..457eaac0 100644 --- a/Makefile +++ b/Makefile @@ -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. diff --git a/bin/asg.ts b/bin/asg.ts new file mode 100644 index 00000000..7232edfe --- /dev/null +++ b/bin/asg.ts @@ -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() + .region("us-west-2") + .version("auto") + .clusterProvider(clusterProvider) + .addOns(spotInterruptHandlerAddOn) + .build(app, 'asg-test'); \ No newline at end of file diff --git a/package.json b/package.json index b9d173ea..ba348e1d 100644 --- a/package.json +++ b/package.json @@ -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", @@ -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"