Merge pull request #1 from cruxstack/dev

feat: handle node termination gracefully

Author: sgtoj

.devcontainer/Dockerfile

@@ -25,6 +25,14 @@ RUN curl -s https://raw.githubusercontent.com/terraform-linters/tflint/master/in
 # install docker
 COPY --from=docker:dind /usr/local/bin/docker /usr/local/bin/
 
+# install node.js
+ENV NODE_VERSION=18.x
+RUN curl -sL https://deb.nodesource.com/setup_${NODE_VERSION} | bash - && \
+    apt-get install -y nodejs
+
+# install typescript
+RUN npm install -g typescript
+
 # install pip
 RUN apt-get update
 RUN apt-get install -y \

.devcontainer/devcontainer.json

@@ -32,6 +32,7 @@
       },
       "extensions": [
         "darkriszty.markdown-table-prettify",
+        "dbaeumer.vscode-eslint",
         "editorconfig.editorconfig",
         "github.copilot",
         "github.copilot-chat",

.gitignore

@@ -59,6 +59,3 @@ tmp/
 
 # opa
 bundle.tar.gz
-
-# lifecycle
-**/lifecycle*

main.tf

@@ -3,11 +3,12 @@ locals {
   enabled             = module.this.enabled
   self_hosted_enabled = local.enabled && var.self_hosted
 
-  cluster_node_types = toset(local.self_hosted_enabled ? ["spot", "ondemand"] : [])
-
   aws_account_id   = var.aws_account_id != "" ? var.aws_account_id : try(data.aws_caller_identity.current[0].account_id, "")
   aws_region_name  = var.aws_region_name != "" ? var.aws_region_name : try(data.aws_region.current[0].name, "")
   aws_kv_namespace = trim(coalesce(var.aws_kv_namespace, "ecs-cluster/${module.cluster_label.id}"), "/")
+
+  cluster_node_types        = local.self_hosted_enabled ? ["spot", "ondemand"] : []
+  tag_name_ecs_cluster_name = "${local.aws_kv_namespace}/cluster-name"
 }
 
 data "aws_caller_identity" "current" {
@@ -50,15 +51,15 @@ resource "aws_ecs_cluster" "this" {
 module "cluster_node_label" {
   source   = "cloudposse/label/null"
   version  = "0.25.0"
-  for_each = local.cluster_node_types
+  for_each = toset(local.cluster_node_types)
 
   attributes = [each.key]
   tags       = { ("${local.aws_kv_namespace}/node-type") : each.key }
   context    = module.cluster_label.context
 }
 
 resource "aws_autoscaling_group" "this" {
-  for_each = local.cluster_node_types
+  for_each = toset(local.cluster_node_types)
 
   name                  = module.cluster_node_label[each.key].id
   vpc_zone_identifier   = var.vpc_subnet_ids
@@ -105,7 +106,10 @@ resource "aws_autoscaling_group" "this" {
   }
 
   dynamic "tag" {
-    for_each = merge(module.cluster_node_label[each.key].tags, { Name = module.cluster_node_label[each.key].id })
+    for_each = merge(
+      module.cluster_node_label[each.key].tags,
+      { Name = module.cluster_node_label[each.key].id },
+    )
 
     content {
       key                 = tag.key
@@ -324,7 +328,7 @@ data "aws_iam_policy_document" "cluster_instance_access" {
 module "capacity_provider_label" {
   source   = "cloudposse/label/null"
   version  = "0.25.0"
-  for_each = local.cluster_node_types
+  for_each = toset(local.cluster_node_types)
 
   delimiter      = "_"
   label_order    = ["name", "attributes"]
@@ -347,7 +351,7 @@ resource "aws_ecs_cluster_capacity_providers" "this" {
 }
 
 resource "aws_ecs_capacity_provider" "this" {
-  for_each = local.cluster_node_types
+  for_each = toset(local.cluster_node_types)
 
   name = replace(upper(module.capacity_provider_label[each.key].id), "-", "_")
 
@@ -364,6 +368,18 @@ resource "aws_ecs_capacity_provider" "this" {
   }
 }
 
+# ======================================================== lifecycle-manager ===
+
+module "lifecycle_manager" {
+  source = "./modules/lifecycle-manager"
+
+  enabled                   = local.self_hosted_enabled
+  asg_names                 = [for x in local.cluster_node_types : aws_autoscaling_group.this[x].name]
+  tag_name_ecs_cluster_name = local.tag_name_ecs_cluster_name
+
+  context = module.cluster_label.context
+}
+
 # ================================================================== lookups ===
 
 data "aws_ssm_parameter" "ecs_optimized_ami_id" {

modules/lifecycle-manager/assets/lifecycle-manager/.dockerignore

@@ -0,0 +1,11 @@
+.gitignore
+.git
+
+*Dockerfile*
+*docker-compose*
+.dockerignore
+
+.vscode/
+node_modules/
+
+*.env

modules/lifecycle-manager/assets/lifecycle-manager/.eslintrc.js

@@ -0,0 +1,35 @@
+module.exports = {
+  plugins: [
+    'import',
+    'jest',
+  ],
+  rules: {
+    'func-style': 'error',
+  },
+  overrides: [
+    {
+      files: [
+        '**/*.{ts,tsx}',
+      ],
+      parser: '@typescript-eslint/parser',
+      parserOptions: {
+        ecmaVersion: 2019,
+        sourceType: 'module',
+        tsconfigRootDir: __dirname,
+        project: [
+          './tsconfig.json',
+        ],
+      },
+      plugins: [
+        '@typescript-eslint',
+      ],
+      extends: [
+        'airbnb-typescript/base',
+      ],
+      rules: {
+        '@typescript-eslint/no-unused-vars': 'warn',
+        '@typescript-eslint/no-floating-promises': 'error',
+      },
+    },
+  ],
+};

modules/lifecycle-manager/assets/lifecycle-manager/Dockerfile

@@ -0,0 +1,37 @@
+# ------------------------------------------------------------------- base ---
+
+FROM node:18 as base
+
+RUN mkdir -p /opt/app
+WORKDIR /opt/app
+
+ENV NODE_ENV development
+
+ADD package*.json /opt/
+RUN npm ci
+
+ADD ./ ./
+
+# -------------------------------------------------------------------- test ---
+
+FROM base as test
+
+RUN npm run lint
+
+# -------------------------------------------------------------------- build ---
+
+FROM test as build
+
+RUN npm run build
+
+# ----------------------------------------------------------------- package ---
+
+FROM alpine:latest as package
+
+COPY --from=build /opt/app/dist /opt/app/dist
+COPY --from=build /opt/package-lock.json /opt/app/dist/
+
+RUN apk add zip \
+    && cd /opt/app/dist \
+    && zip -r /tmp/package.zip .
+