Skip to content
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

Add support for new flags in node_kubelet_config. #12686

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Add support for new flags in node_kubelet_config. #12686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4bab165
Add support for new flags in node_kubelet_config.
VeraQin Jan 4, 2025
6ff5aff
Merge branch 'GoogleCloudPlatform:main' into main
VeraQin Jan 14, 2025
fe05961
Merge branch 'GoogleCloudPlatform:main' into main
VeraQin Feb 3, 2025
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
69 changes: 68 additions & 1 deletion mmv1/third_party/terraform/services/container/node_config.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,10 +624,45 @@ func schemaNodeConfig() *schema.Schema {
Optional: true,
Description: `Controls the maximum number of processes allowed to run in a pod.`,
},
"container_log_max_size": {
Type: schema.TypeString,
Optional: true,
Description: `Defines the maximum size of the container log file before it is rotated.`,
},
"container_log_max_files": {
Type: schema.TypeInt,
Optional: true,
Description: `Defines the maximum number of container log files that can be present for a container.`,
},
"image_gc_low_threshold_percent": {
Type: schema.TypeInt,
Optional: true,
Description: `Defines the percent of disk usage before which image garbage collection is never run. Lowest disk usage to garbage collect to.`,
},
"image_gc_high_threshold_percent": {
Type: schema.TypeInt,
Optional: true,
Description: `Defines the percent of disk usage after which image garbage collection is always run.`,
},
"image_minimum_gc_age": {
Type: schema.TypeString,
Optional: true,
Description: `Defines the minimum age for an unused image before it is garbage collected.`,
},
"image_maximum_gc_age": {
Type: schema.TypeString,
Optional: true,
Description: `Defines the maximum age an image can be unused before it is garbage collected.`,
},
"allowed_unsafe_sysctls": {
Type: schema.TypeList,
Optional: true,
Description: `Defines a comma-separated allowlist of unsafe sysctls or sysctl patterns which can be set on the Pods.`,
Elem: &schema.Schema{Type: schema.TypeString},
},
},
},
},

"linux_node_config": {
Type: schema.TypeList,
Optional: true,
Expand Down Expand Up @@ -1287,6 +1322,31 @@ func expandKubeletConfig(v interface{}) *container.NodeKubeletConfig {
if podPidsLimit, ok := cfg["pod_pids_limit"]; ok {
kConfig.PodPidsLimit = int64(podPidsLimit.(int))
}
if containerLogMaxSize, ok := cfg["container_log_max_size"]; ok {
kConfig.ContainerLogMaxSize = containerLogMaxSize.(string)
}
if containerLogMaxFiles, ok := cfg["container_log_max_files"]; ok {
kConfig.ContainerLogMaxFiles = int64(containerLogMaxFiles.(int))
}
if imageGcLowThresholdPercent, ok := cfg["image_gc_low_threshold_percent"]; ok {
kConfig.ImageGcLowThresholdPercent = int64(imageGcLowThresholdPercent.(int))
}
if imageGcHighThresholdPercent, ok := cfg["image_gc_high_threshold_percent"]; ok {
kConfig.ImageGcHighThresholdPercent = int64(imageGcHighThresholdPercent.(int))
}
if imageMinimumGcAge, ok := cfg["image_minimum_gc_age"]; ok {
kConfig.ImageMinimumGcAge = imageMinimumGcAge.(string)
}
if imageMaximumGcAge, ok := cfg["image_maximum_gc_age"]; ok {
kConfig.ImageMaximumGcAge = imageMaximumGcAge.(string)
}
if allowedUnsafeSysctls, ok := cfg["allowed_unsafe_sysctls"]; ok {
sysctls := allowedUnsafeSysctls.([]interface{})
kConfig.allowedUnsafeSysctls = make([]string, len(sysctls))
for i, s := range sysctls {
kConfig.AllowedUnsafeSysctls[i] = s.(string)
}
}
return kConfig
}

Expand Down Expand Up @@ -1892,6 +1952,13 @@ func flattenKubeletConfig(c *container.NodeKubeletConfig) []map[string]interface
"cpu_manager_policy": c.CpuManagerPolicy,
"insecure_kubelet_readonly_port_enabled": flattenInsecureKubeletReadonlyPortEnabled(c),
"pod_pids_limit": c.PodPidsLimit,
"container_log_max_size": c.ContainerLogMaxSize,
"container_log_max_files": c.ContainerLogMaxFiles,
"image_gc_low_threshold_percent": c.ImageGcLowThresholdPercent,
"image_gc_high_threshold_percent": c.ImageGcHighThresholdPercent,
"image_minimum_gc_age": c.ImageMinimumGcAge,
"image_maximum_gc_age": c.ImageMaximumGcAge,
"allowed_unsafe_sysctls": c.AllowedUnsafeSysctls,
})
}
return result
Expand Down
32 changes: 27 additions & 5 deletions mmv1/third_party/terraform/services/container/resource_container_node_pool_test.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ func TestAccContainerNodePool_withKubeletConfig(t *testing.T) {
CheckDestroy: testAccCheckContainerClusterDestroyProducer(t),
Steps: []resource.TestStep{
{
Config: testAccContainerNodePool_withKubeletConfig(cluster, np, "static", "100ms", networkName, subnetworkName, "TRUE", true, 2048),
Config: testAccContainerNodePool_withKubeletConfig(cluster, np, "static", "100ms", networkName, subnetworkName, "TRUE", "100Mi", "1m", "10m", true, 2048, 10, 10, 85),
ConfigPlanChecks: resource.ConfigPlanChecks{
PreApply: []plancheck.PlanCheck{
acctest.ExpectNoDelete(),
Expand All @@ -542,6 +542,20 @@ func TestAccContainerNodePool_withKubeletConfig(t *testing.T) {
"node_config.0.kubelet_config.0.insecure_kubelet_readonly_port_enabled", "TRUE"),
resource.TestCheckResourceAttr("google_container_node_pool.with_kubelet_config",
"node_config.0.kubelet_config.0.pod_pids_limit", "2048"),
resource.TestCheckResourceAttr("google_container_node_pool.with_kubelet_config",
"node_config.0.kubelet_config.0.container_log_max_size", "100Mi"),
resource.TestCheckResourceAttr("google_container_node_pool.with_kubelet_config",
"node_config.0.kubelet_config.0.container_log_max_files", "10"),
resource.TestCheckResourceAttr("google_container_node_pool.with_kubelet_config",
"node_config.0.kubelet_config.0.image_gc_low_threshold_percent", "10"),
resource.TestCheckResourceAttr("google_container_node_pool.with_kubelet_config",
"node_config.0.kubelet_config.0.image_gc_high_threshold_percent", "85"),
resource.TestCheckResourceAttr("google_container_node_pool.with_kubelet_config",
"node_config.0.kubelet_config.0.image_minimum_gc_age", "1m"),
resource.TestCheckResourceAttr("google_container_node_pool.with_kubelet_config",
"node_config.0.kubelet_config.0.image_maximum_gc_age", "10m"),
resource.TestCheckResourceAttr("google_container_node_pool.with_kubelet_config",
"node_config.0.kubelet_config.0.allowed_unsafe_sysctls.0", "kernel.shm*"),
),
},
{
Expand All @@ -550,7 +564,7 @@ func TestAccContainerNodePool_withKubeletConfig(t *testing.T) {
ImportStateVerify: true,
},
{
Config: testAccContainerNodePool_withKubeletConfig(cluster, np, "", "", networkName, subnetworkName, "FALSE", false, 1024),
Config: testAccContainerNodePool_withKubeletConfig(cluster, np, "", "", networkName, subnetworkName, "FALSE", "500Mi", "30s", "", false, 1024, 5, 50, 80),
ConfigPlanChecks: resource.ConfigPlanChecks{
PreApply: []plancheck.PlanCheck{
acctest.ExpectNoDelete(),
Expand Down Expand Up @@ -588,7 +602,7 @@ func TestAccContainerNodePool_withInvalidKubeletCpuManagerPolicy(t *testing.T) {
CheckDestroy: testAccCheckContainerClusterDestroyProducer(t),
Steps: []resource.TestStep{
{
Config: testAccContainerNodePool_withKubeletConfig(cluster, np, "dontexist", "100us", networkName, subnetworkName,"TRUE", false, 1024),
Config: testAccContainerNodePool_withKubeletConfig(cluster, np, "dontexist", "100us", networkName, subnetworkName,"TRUE", "", "", "", false, 1024, 2, 70, 75),
ExpectError: regexp.MustCompile(`.*to be one of \["?static"? "?none"? "?"?\].*`),
},
},
Expand Down Expand Up @@ -3167,7 +3181,7 @@ resource "google_container_node_pool" "with_sandbox_config" {
}
{{- end }}

func testAccContainerNodePool_withKubeletConfig(cluster, np, policy, period, networkName, subnetworkName, insecureKubeletReadonlyPortEnabled string, quota bool, podPidsLimit int) string {
func testAccContainerNodePool_withKubeletConfig(cluster, np, policy, period, networkName, subnetworkName, insecureKubeletReadonlyPortEnabled, containerLogMaxSize, imageMinimumGcAge, imageMaximumGcAge string, quota bool, podPidsLimit, containerLogMaxFiles, imageGcLowThresholdPercent, imageGcHighThresholdPercent int) string {
return fmt.Sprintf(`
data "google_container_engine_versions" "central1a" {
location = "us-central1-a"
Expand Down Expand Up @@ -3198,6 +3212,13 @@ resource "google_container_node_pool" "with_kubelet_config" {
cpu_cfs_quota_period = %q
insecure_kubelet_readonly_port_enabled = "%s"
pod_pids_limit = %d
container_log_max_size = %q
container_log_max_files = %d
image_gc_low_threshold_percent = %d
image_gc_high_threshold_percent = %d
image_minimum_gc_age = %q
image_maximum_gc_age = %q
allowed_unsafe_sysctls = ["kernel.shm*", "kernel.msg*", "kernel.sem", "fs.mqueue.*", "net.*"]
}
oauth_scopes = [
"https://www.googleapis.com/auth/logging.write",
Expand All @@ -3206,7 +3227,7 @@ resource "google_container_node_pool" "with_kubelet_config" {
logging_variant = "DEFAULT"
}
}
`, cluster, networkName, subnetworkName, np, policy, quota, period, insecureKubeletReadonlyPortEnabled, podPidsLimit)
`, cluster, networkName, subnetworkName, np, policy, quota, period, insecureKubeletReadonlyPortEnabled, podPidsLimit, containerLogMaxSize, containerLogMaxFiles, imageGcLowThresholdPercent, imageGcHighThresholdPercent, imageMinimumGcAge, imageMaximumGcAge)
}

func testAccContainerNodePool_withLinuxNodeConfig(cluster, np, tcpMem, networkName, subnetworkName string) string {
Expand All @@ -3228,6 +3249,7 @@ func testAccContainerNodePool_withLinuxNodeConfig(cluster, np, tcpMem, networkNa
"net.ipv4.tcp_rmem" = "%s"
"net.ipv4.tcp_wmem" = "%s"
"net.ipv4.tcp_tw_reuse" = 1
"kernel.shmmni" = 8192
}
}
`, tcpMem, tcpMem)
Expand Down
18 changes: 18 additions & 0 deletions mmv1/third_party/terraform/website/docs/r/container_cluster.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1344,6 +1344,24 @@ such as `"300ms"`. Valid time units are "ns", "us" (or "µs"), "ms", "s", "m",

* `pod_pids_limit` - (Optional) Controls the maximum number of processes allowed to run in a pod. The value must be greater than or equal to 1024 and less than 4194304.

* `container_log_max_size` - (Optional) Defines the maximum size of the
container log file before it is rotated. Specified as a positive number and a
unit suffix, such as `"100Ki"`, `"10Mi"`. Valid units are "Ki", "Mi", "Gi".
The value must be between `"10Mi"` and `"500Mi"`, inclusive. And the total container log size
(`container_log_max_size` * `container_log_max_files`) cannot exceed 1% of the total storage of the node.

* `container_log_max_files` - (Optional) Defines the maximum number of container log files that can be present for a container. The integer must be between 2 and 10, inclusive.

* `image_gc_low_threshold_percent` - (Optional) Defines the percent of disk usage before which image garbage collection is never run. Lowest disk usage to garbage collect to. The integer must be between 10 and 85, inclusive.

* `image_gc_high_threshold_percent` - (Optional) Defines the percent of disk usage after which image garbage collection is always run. The integer must be between 10 and 85, inclusive.

* `image_minimum_gc_age` - (Optional) Defines the minimum age for an unused image before it is garbage collected. Specified as a sequence of decimal numbers, each with optional fraction and a unit suffix, such as `"300s"`, `"1.5m"`. The value cannot be greater than "2m".

* `image_maximum_gc_age` - (Optional) Defines the maximum age an image can be unused before it is garbage collected. Specified as a sequence of decimal numbers, each with optional fraction and a unit suffix, such as `"300s"`, "1.5m"`, and `"2h45m"`. Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h". The value must be a positive duration.

* `allowed_unsafe_sysctls` - (Optional) Defines a comma-separated allowlist of unsafe sysctls or sysctl patterns which can be set on the Pods. The allowed sysctl groups are `kernel.shm*`, `kernel.msg*`, `kernel.sem`, `fs.mqueue.*`, and `net.*`.

<a name="nested_linux_node_config"></a>The `linux_node_config` block supports:

* `sysctls` - (Optional) The Linux kernel parameters to be applied to the nodes
Expand Down
Loading