Skip to content

Commit c747115

Browse files
apeabodyg-awmalik
andauthored
Revert "chore(CI): temporarily disable AP cgroup test" (#2357)
Co-authored-by: Awais Malik <awmalik@google.com>
1 parent c5e3df4 commit c747115

File tree

4 files changed

+12
-16
lines changed
  • examples
    • simple_autopilot_private
    • simple_autopilot_private_cmek
    • simple_autopilot_private_non_default_sa
    • simple_autopilot_public

4 files changed

+12
-16
lines changed

examples/simple_autopilot_private/main.tf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ module "gke" {
5050
enable_private_endpoint = true
5151
enable_private_nodes = true
5252
network_tags = [local.cluster_type]
53-
# TODO: b/413643369
54-
# node_pools_cgroup_mode = "CGROUP_MODE_V2"
53+
node_pools_cgroup_mode = "CGROUP_MODE_V2"
5554
deletion_protection = false
5655
insecure_kubelet_readonly_port_enabled = false
5756
}

examples/simple_autopilot_private_cmek/main.tf

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,8 @@ module "gke" {
7171
enable_private_endpoint = true
7272
enable_private_nodes = true
7373
network_tags = [local.cluster_type]
74-
# TODO: b/413643369
75-
# node_pools_cgroup_mode = "CGROUP_MODE_V2"
76-
deletion_protection = false
77-
boot_disk_kms_key = values(module.kms.keys)[0]
78-
depends_on = [google_kms_crypto_key_iam_member.main]
74+
node_pools_cgroup_mode = "CGROUP_MODE_V2"
75+
deletion_protection = false
76+
boot_disk_kms_key = values(module.kms.keys)[0]
77+
depends_on = [google_kms_crypto_key_iam_member.main]
7978
}

examples/simple_autopilot_private_non_default_sa/main.tf

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,8 @@ module "gke" {
4949
enable_vertical_pod_autoscaling = true
5050
enable_private_endpoint = true
5151
enable_private_nodes = true
52-
# TODO: b/413643369
53-
# node_pools_cgroup_mode = "CGROUP_MODE_V2"
54-
deletion_protection = false
52+
node_pools_cgroup_mode = "CGROUP_MODE_V2"
53+
deletion_protection = false
5554

5655
master_authorized_networks = [
5756
{

examples/simple_autopilot_public/main.tf

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,11 @@ module "gke" {
4747
release_channel = "RAPID"
4848
enable_vertical_pod_autoscaling = true
4949
network_tags = [local.cluster_type]
50-
# TODO: b/413643369
51-
# node_pools_cgroup_mode = "CGROUP_MODE_V2"
52-
deletion_protection = false
53-
enable_l4_ilb_subsetting = true
54-
stateful_ha = false
55-
gke_backup_agent_config = false
50+
node_pools_cgroup_mode = "CGROUP_MODE_V2"
51+
deletion_protection = false
52+
enable_l4_ilb_subsetting = true
53+
stateful_ha = false
54+
gke_backup_agent_config = false
5655
ray_operator_config = {
5756
enabled = true
5857
logging_enabled = true

0 commit comments

Comments
 (0)