Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 docs/tenant-usage/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
runs-on:
- self-hosted
- x64
- type: standard
- type:standard
```

For Kubernetes pods, use:
Expand Down
4 changes: 2 additions & 2 deletions docs/tenant-usage/renovatebot/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ jobs:
runs-on:
- self-hosted
- x64
- type: large
- env: ops-prod
- type:large
- env:ops-prod

steps:
- name: Checkout Repository
Expand Down
3 changes: 3 additions & 0 deletions modules/core/arc/scale_set/template_files/k8s.yml.tftpl
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ containerMode:

# with containerMode.type=kubernetes, we will populate the template.spec with following pod spec
template:
metadata:
annotations:
karpenter.sh/do-not-evict: "true"
spec:
securityContext:
fsGroup: 123
Expand Down
4 changes: 3 additions & 1 deletion modules/infra/eks/karpenter.tf
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,9 @@ locals {
disk_throughput = var.cluster_volume.throughput
})

node_pool_manifest = templatefile("${path.module}/templates/node_pool.yaml.tpl", {})
node_pool_manifest = templatefile("${path.module}/templates/node_pool.yaml.tpl", {
instance_type = var.cluster_size.instance_type
})
}

resource "null_resource" "apply_ec2_node_class" {
Expand Down
9 changes: 2 additions & 7 deletions modules/infra/eks/templates/node_pool.yaml.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,10 @@ spec:
template:
spec:
requirements:
- key: karpenter.k8s.aws/instance-family
- key: node.kubernetes.io/instance-type
operator: In
values:
- m6i
- m5
- c6i
- c5
- r6i
- r5
- ${instance_type}
- key: kubernetes.io/arch
operator: In
values: ["amd64"]
Expand Down