Clean up under utilised worker groups in dev

Remove and reshuffle containers for better infra utilisation in dev. Bump resources for auto-scalar to avoid OOMKilled.
ipni · Feb 27, 2024 · ed7c7cb · ed7c7cb
1 parent 4cca7e9
commit ed7c7cb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 90 deletions.
diff --git a/deploy/infrastructure/dev/us-east-2/eks.tf b/deploy/infrastructure/dev/us-east-2/eks.tf
@@ -70,71 +70,6 @@ module "eks" {
       instance_types = ["m4.xlarge"]
       subnet_ids     = [data.aws_subnet.ue2c1.id, data.aws_subnet.ue2c2.id]
     }
-
-    dev-ue2a-r5a-2xl = {
-      min_size       = 1
-      max_size       = 7
-      desired_size   = 1
-      instance_types = ["r5a.2xlarge"]
-      subnet_ids     = [data.aws_subnet.ue2a1.id, data.aws_subnet.ue2a2.id, data.aws_subnet.ue2a3.id]
-    }
-    # Used by foundation db
-    dev-ue2-r5a-2xl = {
-      min_size       = 0
-      max_size       = 15
-      desired_size   = 1
-      instance_types = ["r5a.2xlarge"]
-      subnet_ids = [
-        data.aws_subnet.ue2a1.id, data.aws_subnet.ue2a2.id, data.aws_subnet.ue2a3.id,
-        data.aws_subnet.ue2b1.id, data.aws_subnet.ue2b2.id, data.aws_subnet.ue2b3.id,
-        data.aws_subnet.ue2c1.id, data.aws_subnet.ue2c2.id, data.aws_subnet.ue2c3.id,
-      ]
-    }
-
-    # Memory optimised node groups primarily used to run indexer nodes.
-    dev-ue2a-r5n-2xl = {
-      min_size       = 1
-      max_size       = 5
-      desired_size   = 1
-      instance_types = ["r5n.2xlarge"]
-      subnet_ids     = [data.aws_subnet.ue2a2.id]
-      taints = {
-        dedicated = {
-          key    = "dedicated"
-          value  = "r5n-2xl"
-          effect = "NO_SCHEDULE"
-        }
-      }
-    }
-    dev-ue2b-r5n-2xl = {
-      min_size       = 1
-      max_size       = 5
-      desired_size   = 1
-      instance_types = ["r5n.2xlarge"]
-      subnet_ids     = [data.aws_subnet.ue2b2.id]
-      taints = {
-        dedicated = {
-          key    = "dedicated"
-          value  = "r5n-2xl"
-          effect = "NO_SCHEDULE"
-        }
-      }
-    }
-    dev-ue2c-r5n-2xl = {
-      min_size       = 1
-      max_size       = 5
-      desired_size   = 1
-      instance_types = ["r5n.2xlarge"]
-      subnet_ids     = [data.aws_subnet.ue2c2.id]
-      taints = {
-        dedicated = {
-          key    = "dedicated"
-          value  = "r5n-2xl"
-          effect = "NO_SCHEDULE"
-        }
-      }
-    }
   }
-
   tags = local.tags
 }
diff --git a/deploy/manifests/dev/us-east-2/cluster/cluster-autoscaler/patch.yaml b/deploy/manifests/dev/us-east-2/cluster/cluster-autoscaler/patch.yaml
@@ -27,3 +27,10 @@ spec:
             - --balance-similar-node-groups
             - --scale-down-delay-after-add=90m
             - --node-group-auto-discovery=asg:tag=k8s.io/cluster-autoscaler/enabled,k8s.io/cluster-autoscaler/dev
+          resources:
+            limits:
+              cpu: 100m
+              memory: 1Gi
+            requests:
+              cpu: 100m
+              memory: 1Gi
diff --git a/deploy/manifests/dev/us-east-2/cluster/kube-system/aws-auth.yaml b/deploy/manifests/dev/us-east-2/cluster/kube-system/aws-auth.yaml
@@ -39,31 +39,6 @@ data:
       - system:nodes
       rolearn: arn:aws:iam::407967248065:role/dev-ue2c-r6a-xl-eks-node-group
       username: system:node:{{EC2PrivateDNSName}}
-    - groups:
-      - system:bootstrappers
-      - system:nodes
-      rolearn: arn:aws:iam::407967248065:role/dev-ue2-r5a-2xl-eks-node-group
-      username: system:node:{{EC2PrivateDNSName}}
-    - groups:
-      - system:bootstrappers
-      - system:nodes
-      rolearn: arn:aws:iam::407967248065:role/dev-ue2a-r5a-2xl-eks-node-group
-      username: system:node:{{EC2PrivateDNSName}}
-    - groups:
-      - system:bootstrappers
-      - system:nodes
-      rolearn: arn:aws:iam::407967248065:role/dev-ue2a-r5n-2xl-eks-node-group
-      username: system:node:{{EC2PrivateDNSName}}
-    - groups:
-      - system:bootstrappers
-      - system:nodes
-      rolearn: arn:aws:iam::407967248065:role/dev-ue2b-r5n-2xl-eks-node-group
-      username: system:node:{{EC2PrivateDNSName}}
-    - groups:
-      - system:bootstrappers
-      - system:nodes
-      rolearn: arn:aws:iam::407967248065:role/dev-ue2c-r5n-2xl-eks-node-group
-      username: system:node:{{EC2PrivateDNSName}}
   mapUsers: |
     - userarn: arn:aws:iam::407967248065:user/masih
       username: masih