Skip to content

Commit 698d009

Browse files
committed
eks-prow-build: schedule controllers on stable nodes
Signed-off-by: Marko Mudrinić <[email protected]>
1 parent fcc751d commit 698d009

File tree

4 files changed

+131
-84
lines changed

4 files changed

+131
-84
lines changed

infra/aws/terraform/prow-build-cluster/.terraform.lock.hcl

Lines changed: 83 additions & 82 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

infra/aws/terraform/prow-build-cluster/eks.tf

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,27 @@ module "eks" {
5353
cluster_addons = {
5454
coredns = {
5555
most_recent = true
56+
configuration_values = jsonencode({
57+
"nodeSelector" : {
58+
"node-group" : "stable"
59+
},
60+
"tolerations" : [
61+
{
62+
"key" : "CriticalAddonsOnly",
63+
"operator" : "Exists"
64+
},
65+
{
66+
"effect" : "NoSchedule",
67+
"key" : "node-role.kubernetes.io/control-plane"
68+
},
69+
{
70+
"effect" : "NoSchedule",
71+
"key" : "node-group",
72+
"operator" : "Equal",
73+
"value" : "stable"
74+
}
75+
]
76+
})
5677
}
5778
kube-proxy = {
5879
most_recent = true
@@ -64,6 +85,26 @@ module "eks" {
6485
aws-ebs-csi-driver = {
6586
most_recent = true
6687
service_account_role_arn = module.ebs_csi_irsa.iam_role_arn
88+
configuration_values = jsonencode({
89+
"controller" : {
90+
"nodeSelector" : {
91+
"node-group" : "stable"
92+
},
93+
"tolerations" : [
94+
{
95+
"effect" : "NoExecute",
96+
"operator" : "Exists",
97+
"tolerationSeconds" : 300
98+
},
99+
{
100+
"effect" : "NoSchedule",
101+
"key" : "node-group",
102+
"operator" : "Equal",
103+
"value" : "stable"
104+
}
105+
]
106+
}
107+
})
67108
}
68109
eks-pod-identity-agent = {
69110
most_recent = true

infra/aws/terraform/prow-build-cluster/providers.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ terraform {
2222
required_providers {
2323
aws = {
2424
source = "hashicorp/aws"
25-
version = "~> 5.59"
25+
version = "~> 5.100"
2626
}
2727
kubernetes = {
2828
source = "hashicorp/kubernetes"

infra/aws/terraform/prow-build-cluster/resources/monitoring/prometheus-operator/deployment.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,12 @@ spec:
4646
- ALL
4747
readOnlyRootFilesystem: true
4848
nodeSelector:
49-
kubernetes.io/os: linux
49+
node-group: stable
50+
tolerations:
51+
- key: node-group
52+
operator: Equal
53+
value: stable
54+
effect: NoSchedule
5055
securityContext:
5156
runAsNonRoot: true
5257
runAsUser: 65534

0 commit comments

Comments
 (0)