Skip to content

Commit 85e11c6

Browse files
fix TestAccContainerCluster_withNodeConfigKubeletConfigSettingsInNodePool (#15067) (#10679)
[upstream:983a15d9edb637381bead542f940edccd0d13581] Signed-off-by: Modular Magician <[email protected]>
1 parent 48173fe commit 85e11c6

File tree

1 file changed

+33
-32
lines changed

1 file changed

+33
-32
lines changed

google-beta/services/container/resource_container_cluster_test.go

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8516,50 +8516,51 @@ resource "google_container_cluster" "with_node_config_kubelet_config_settings_in
85168516
node_pool {
85178517
name = "%s"
85188518
initial_node_count = 1
8519-
machine_type = "n1-standard-1"
8519+
85208520
node_config {
8521+
machine_type = "n1-standard-1"
85218522
kubelet_config {
85228523
max_parallel_image_pulls = 5
8523-
eviction_max_pod_grace_period_seconds = 200
8524-
eviction_soft {
8525-
memory_available = "200Mi"
8526-
nodefs_available = "10%%"
8527-
nodefs_inodes_free = "20%%"
8528-
imagefs_available = "30%%"
8529-
imagefs_inodes_free = "40%%"
8530-
pid_available = "50%%"
8531-
}
8532-
eviction_soft_grace_period {
8533-
memory_available = "1m"
8534-
nodefs_available = "2s"
8535-
nodefs_inodes_free = "3m"
8536-
imagefs_available = "100s"
8537-
imagefs_inodes_free = "2m"
8538-
pid_available = "3m2.6s"
8539-
}
8540-
eviction_minimum_reclaim {
8541-
memory_available = "10%%"
8542-
nodefs_available = "8.5%%"
8543-
nodefs_inodes_free = "5.0%%"
8544-
imagefs_available = "3%%"
8545-
imagefs_inodes_free = "9%%"
8546-
pid_available = "5%%"
8547-
}
8524+
eviction_max_pod_grace_period_seconds = 200
8525+
eviction_soft {
8526+
memory_available = "200Mi"
8527+
nodefs_available = "10%%"
8528+
nodefs_inodes_free = "20%%"
8529+
imagefs_available = "30%%"
8530+
imagefs_inodes_free = "40%%"
8531+
pid_available = "50%%"
8532+
}
8533+
eviction_soft_grace_period {
8534+
memory_available = "1m"
8535+
nodefs_available = "2s"
8536+
nodefs_inodes_free = "3m"
8537+
imagefs_available = "100s"
8538+
imagefs_inodes_free = "2m"
8539+
pid_available = "3m2.6s"
8540+
}
8541+
eviction_minimum_reclaim {
8542+
memory_available = "10%%"
8543+
nodefs_available = "8.5%%"
8544+
nodefs_inodes_free = "5.0%%"
8545+
imagefs_available = "3%%"
8546+
imagefs_inodes_free = "9%%"
8547+
pid_available = "5%%"
8548+
}
85488549
}
85498550
disk_size_gb = 15
85508551
disk_type = "pd-ssd"
85518552
node_group = google_compute_node_group.group.name
85528553
sole_tenant_config {
85538554
node_affinity {
8554-
key = "compute.googleapis.com/node-group-name"
8555-
operator = "IN"
8556-
values = [google_compute_node_group.group.name]
8557-
}
8558-
min_node_cpus = 1
8555+
key = "compute.googleapis.com/node-group-name"
8556+
operator = "IN"
8557+
values = [google_compute_node_group.group.name]
8558+
}
8559+
min_node_cpus = 1
85598560
}
85608561
linux_node_config {
85618562
transparent_hugepage_defrag = "%s"
8562-
transparent_hugepage_enabled = "%s"
8563+
transparent_hugepage_enabled = "%s"
85638564
}
85648565
}
85658566
}

0 commit comments

Comments
 (0)