revi-archive/llvm-premerge-checks
1
0
Fork 0
Code Activity

updated grace period 1h->1m for pods

Browse source 
some formatting in TF
This commit is contained in:
Mikhail Goncharov 2023-06-02 15:47:16 +02:00
parent 7034885209
commit 61db923844
3 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
terraform/cluster.tf
View file

@ -145,7 +145,14 @@ resource "kubernetes_manifest" "buildkite_conduit_api_token_secret" {
} }
resource "kubernetes_manifest" "buildkite_linux_agent" { resource "kubernetes_manifest" "buildkite_linux_agent" {
manifest = yamldecode(templatefile("kubernetes/linux-agents.yaml", { project-id = var.project-id, gke-nodepool = google_container_node_pool.linux_agents_nodepool.name, build-queue = var.linux-agents-build-queue, cpu-request = var.linux-agents-cpu-request, mem-request = var.linux-agents-mem-request, replicas-count = var.linux-agents-count })) manifest = yamldecode(templatefile("kubernetes/linux-agents.yaml", {
project-id = var.project-id,
gke-nodepool = google_container_node_pool.linux_agents_nodepool.name,
build-queue = var.linux-agents-build-queue,
cpu-request = var.linux-agents-cpu-request,
mem-request = var.linux-agents-mem-request,
replicas-count = var.linux-agents-count,
}))
depends_on = [kubernetes_manifest.buildkite_namespace] depends_on = [kubernetes_manifest.buildkite_namespace]
# wait { # wait {
# fields = { # fields = {
@ -155,11 +162,18 @@ resource "kubernetes_manifest" "buildkite_linux_agent" {
} }
resource "kubernetes_manifest" "buildkite_windows_agent" { resource "kubernetes_manifest" "buildkite_windows_agent" {
manifest = yamldecode(templatefile("kubernetes/windows-agents.yaml", { project-id = var.project-id, gke-nodepool = google_container_node_pool.windows_agents_nodepool.name, build-queue = var.windows-agents-build-queue, cpu-request = var.windows-agents-cpu-request, mem-request = var.windows-agents-mem-request, replicas-count = var.windows-agents-count })) manifest = yamldecode(templatefile("kubernetes/windows-agents.yaml", {
project-id = var.project-id,
gke-nodepool = google_container_node_pool.windows_agents_nodepool.name,
build-queue = var.windows-agents-build-queue,
cpu-request = var.windows-agents-cpu-request,
mem-request = var.windows-agents-mem-request,
replicas-count = var.windows-agents-count,
}))
depends_on = [kubernetes_manifest.buildkite_namespace] depends_on = [kubernetes_manifest.buildkite_namespace]
# wait { # wait {
# fields = { # fields = {
# "status.phase" = "Running" # "status.phase" = "Running"
# } # }
# } # }
} }

2
terraform/kubernetes/linux-agents.yaml
View file

@ -79,4 +79,4 @@ spec:
emptyDir: {} emptyDir: {}
nodeSelector: nodeSelector:
cloud.google.com/gke-nodepool: ${gke-nodepool} cloud.google.com/gke-nodepool: ${gke-nodepool}
terminationGracePeriodSeconds: 3600 terminationGracePeriodSeconds: 60

2
terraform/kubernetes/windows-agents.yaml
View file

@ -79,4 +79,4 @@ spec:
operator: "Equal" operator: "Equal"
value: "windows" value: "windows"
effect: "NoSchedule" effect: "NoSchedule"
terminationGracePeriodSeconds: 3600 terminationGracePeriodSeconds: 60