Skip to content

add single process oom kill kubeletconfig to GKE nodes #8600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

add single process oom kill kubeletconfig to GKE nodes #8600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions infra/gcp/terraform/k8s-infra-prow-build/iam.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,19 @@ module "iam" {
"serviceAccount:[email protected]",
"serviceAccount:prow-deployer@k8s-infra-prow-build-trusted.iam.gserviceaccount.com"
]
"roles/owner" = [
"group:[email protected]"
]
"organizations/758905017065/roles/prow.viewer" = [
"group:[email protected]"
]
"roles/viewer" = [
"group:[email protected]"
]
"roles/secretmanager.secretAccessor" = [
"serviceAccount:kubernetes-external-secrets@k8s-infra-prow-build.iam.gserviceaccount.com",
"principal://iam.googleapis.com/projects/${module.project.project_number}/locations/global/workloadIdentityPools/${module.project.project_id}.svc.id.goog/subject/ns/external-secrets/sa/external-secrets",
"principal://iam.googleapis.com/projects/180382678033/locations/global/workloadIdentityPools/k8s-infra-prow-build-trusted.svc.id.goog/subject/ns/external-secrets/sa/external-secrets",
]
}
}
Expand Down
199 changes: 104 additions & 95 deletions infra/gcp/terraform/k8s-infra-prow-build/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,41 +31,32 @@ locals {
pod_namespace = "test-pods" // MUST match whatever prow is configured to use when it schedules to this cluster
}

data "google_organization" "org" {
domain = "kubernetes.io"
}

module "project" {
source = "../modules/gke-project"
project_id = local.project_id
project_name = local.project_id
}

// Ensure [email protected] has owner access to this project
resource "google_project_iam_member" "k8s_infra_prow_oncall" {
project = module.project.project_id
role = "roles/owner"
member = "group:[email protected]"
}

// Role created by ensure-organization.sh, use a data source to ensure it exists
data "google_iam_role" "prow_viewer" {
name = "${data.google_organization.org.name}/roles/prow.viewer"
}

// Ensure [email protected] has prow.viewer access to this project
resource "google_project_iam_member" "k8s_infra_prow_viewers" {
project = module.project.project_id
role = data.google_iam_role.prow_viewer.name
member = "group:[email protected]"
}

// Allow prow-deployer service account in k8s-infra-prow-build-trusted to deploy
// to the cluster defined in here
resource "google_project_iam_member" "prow_deployer_for_prow_build" {
project = module.project.project_id
role = "roles/container.admin"
member = "serviceAccount:prow-deployer@k8s-infra-prow-build-trusted.iam.gserviceaccount.com"
source = "terraform-google-modules/project-factory/google"
version = "~> 18.0"

name = "k8s-infra-prow-build"
project_id = "k8s-infra-prow-build"
folder_id = "411137699919"
billing_account = "018801-93540E-22A20E"

# Sane project defaults
default_service_account = "keep"
disable_services_on_destroy = false
create_project_sa = false
random_project_id = false
auto_create_network = true
activate_apis = [
"secretmanager.googleapis.com",
"cloudasset.googleapis.com",
"compute.googleapis.com",
"container.googleapis.com",
"cloudkms.googleapis.com",
"artifactregistry.googleapis.com",
"secretmanager.googleapis.com",
"cloudbuild.googleapis.com",
"bigquery.googleapis.com"
]
}

module "prow_build_cluster" {
Expand All @@ -80,47 +71,6 @@ module "prow_build_cluster" {
cloud_shell_access = false
}

module "prow_build_nodepool_c4_highmem_8_localssd" {
source = "../modules/gke-nodepool"
project_name = module.project.project_id
cluster_name = module.prow_build_cluster.cluster.name
location = module.prow_build_cluster.cluster.location
node_locations = [
"us-central1-b",
"us-central1-c",
"us-central1-f",
]
name = "pool6"
initial_count = 1
min_count = 1
max_count = 80
machine_type = "c4-highmem-8"
disk_size_gb = 500
disk_type = "hyperdisk-balanced"
service_account = module.prow_build_cluster.cluster_node_sa.email
}

module "prow_build_nodepool_c4d_highmem_8_localssd" {
source = "../modules/gke-nodepool"
project_name = module.project.project_id
cluster_name = module.prow_build_cluster.cluster.name
location = module.prow_build_cluster.cluster.location
node_locations = [
"us-central1-a",
"us-central1-b",
"us-central1-c",
]
name = "pool7"
initial_count = 1
min_count = 10
max_count = 80
machine_type = "c4d-highmem-8-lssd" # has 2 local ssd disks attached
disk_size_gb = 100
disk_type = "hyperdisk-balanced"
service_account = module.prow_build_cluster.cluster_node_sa.email
}


module "sig_node_node_pool_1_n4_highmem_8" {

source = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/gke-nodepool?ref=v39.0.0&depth=1"
Expand Down Expand Up @@ -160,24 +110,83 @@ module "sig_node_node_pool_1_n4_highmem_8" {
taints = { dedicated = { value = "sig-node", effect = "NO_SCHEDULE" } }
}

module "prow_build_nodepool_c4a_highmem_8_localssd" {
source = "../modules/gke-nodepool"
project_name = module.project.project_id
cluster_name = module.prow_build_cluster.cluster.name
location = module.prow_build_cluster.cluster.location
node_locations = [
"us-central1-a",
"us-central1-b",
"us-central1-c",
]
name = "pool7-arm64"
initial_count = 1
min_count = 1
max_count = 10
machine_type = "c4a-highmem-8-lssd" # has 2 local ssd disks attached
disk_size_gb = 100
disk_type = "hyperdisk-balanced"
// GKE automatically taints arm64 nodes
// https://cloud.google.com/kubernetes-engine/docs/how-to/prepare-arm-workloads-for-deployment#overview
service_account = module.prow_build_cluster.cluster_node_sa.email
module "prod_intel_pool" {
source = "terraform-google-modules/kubernetes-engine/google//modules/gke-node-pool"
version = "~> 40.0"
project_id = module.project.project_id
name = "pool8-intel"
cluster = module.prow_build_cluster.cluster.name
node_locations = ["us-central1-b", "us-central1-c", "us-central1-f"]

autoscaling = {
max_node_count = 100
min_node_count = 1
}

node_config = {
service_account = module.prow_build_cluster.cluster_node_sa.email
machine_type = "c4-highmem-8-lssd"
disk_type = "hyperdisk-balanced"
image_type = "COS_CONTAINERD"
kubelet_config = {
single_process_oom_kill = false # https://github.com/kubernetes-sigs/prow/issues/210
}
shielded_instance_config = {
enable_secure_boot = true
}
}
}

module "prod_amd_pool" {
source = "terraform-google-modules/kubernetes-engine/google//modules/gke-node-pool"
version = "~> 40.0"
project_id = module.project.project_id
name = "pool8-amd"
cluster = module.prow_build_cluster.cluster.name
node_locations = ["us-central1-b", "us-central1-c", "us-central1-f"]

autoscaling = {
max_node_count = 100
min_node_count = 1
}

node_config = {
service_account = module.prow_build_cluster.cluster_node_sa.email
machine_type = "c4d-highmem-8-lssd"
disk_type = "hyperdisk-balanced"
image_type = "COS_CONTAINERD"
kubelet_config = {
single_process_oom_kill = false # https://github.com/kubernetes-sigs/prow/issues/210
}
shielded_instance_config = {
enable_secure_boot = true
}
}
}

module "prod_arm_pool" {
source = "terraform-google-modules/kubernetes-engine/google//modules/gke-node-pool"
version = "~> 40.0"
project_id = module.project.project_id
name = "pool8-arm"
cluster = module.prow_build_cluster.cluster.name
node_locations = ["us-central1-b", "us-central1-c", "us-central1-f"]

autoscaling = {
max_node_count = 100
min_node_count = 1
}

node_config = {
service_account = module.prow_build_cluster.cluster_node_sa.email
machine_type = "c4a-highmem-8-lssd"
disk_type = "hyperdisk-balanced"
image_type = "COS_CONTAINERD"
kubelet_config = {
single_process_oom_kill = false # https://github.com/kubernetes-sigs/prow/issues/210
}
shielded_instance_config = {
enable_secure_boot = true
}
}
}
8 changes: 4 additions & 4 deletions ...aform/k8s-infra-prow-build/00-provider.tf → ...erraform/k8s-infra-prow-build/provider.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,18 @@ This file defines:
terraform {

backend "gcs" {
bucket = "k8s-infra-tf-prow-clusters"
prefix = "k8s-infra-prow-build/prow-build" // $project_name/$cluster_name
bucket = "k8s-infra-terraform"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a state bucket in the k8s-infra-seed project instead of the kubernetes-public

prefix = "k8s-infra-prow-build"
}

required_providers {
google = {
source = "hashicorp/google"
version = "~> 6.31.0"
version = "~> 6.50.0"
}
google-beta = {
source = "hashicorp/google-beta"
version = "~> 6.31.0"
version = "~> 6.50.0"
}
}
}
4 changes: 2 additions & 2 deletions infra/gcp/terraform/modules/gke-cluster/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = "~> 6.31.0"
version = "~> 6.50.0"
}
google-beta = {
source = "hashicorp/google-beta"
version = "~> 6.31.0"
version = "~> 6.50.0"
}
}
}
4 changes: 2 additions & 2 deletions infra/gcp/terraform/modules/gke-nodepool/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = "~> 6.31.0"
version = "~> 6.50.0"
}
google-beta = {
source = "hashicorp/google-beta"
version = "~> 6.31.0"
version = "~> 6.50.0"
}
}
}
4 changes: 2 additions & 2 deletions infra/gcp/terraform/modules/gke-project/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = "~> 6.31.0"
version = "~> 6.50.0"
}
google-beta = {
source = "hashicorp/google-beta"
version = "~> 6.31.0"
version = "~> 6.50.0"
}
}
}
4 changes: 2 additions & 2 deletions infra/gcp/terraform/modules/workload-identity-service-account/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = "~> 6.31.0"
version = "~>6.50.0"
}
google-beta = {
source = "hashicorp/google-beta"
version = "~> 6.31.0"
version = "~> 6.50.0"
}
}
}