Skip to content

Commit 6124d78

Browse files
committed
terraform, pangeo-hubs: add opt-out for node-purpose infra labels
1 parent 81efb74 commit 6124d78

File tree

1 file changed

+18
-2
lines changed

1 file changed

+18
-2
lines changed

terraform/gcp/projects/pangeo-hubs.tfvars

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,19 @@
1818
#
1919
# terraform apply --var-file projects/pangeo-hubs.tfvars
2020
#
21-
# FIXME: core_node_machine_type should be set to n2-highmem-4 as its enough
2221
prefix = "pangeo-hubs"
2322
project_id = "pangeo-integration-te-3eea"
2423
billing_project_id = "pangeo-integration-te-3eea"
2524
zone = "us-central1-b"
2625
region = "us-central1"
27-
core_node_machine_type = "n2-highmem-8"
2826
enable_private_cluster = true
2927

28+
# FIXME: core_node_machine_type should be set to n2-highmem-4 as its enough
29+
# FIXME: Remove temp_opt_out_node_purpose_label_core_nodes when a node upgrade can be
30+
# done. See https://github.com/2i2c-org/infrastructure/issues/3405.
31+
core_node_machine_type = "n2-highmem-8"
32+
temp_opt_out_node_purpose_label_core_nodes = true
33+
3034
k8s_versions = {
3135
min_master_version : "1.26.5-gke.2100",
3236
core_nodes_version : "1.26.4-gke.1400",
@@ -58,40 +62,49 @@ user_buckets = {
5862

5963
# Setup notebook node pools
6064
notebook_nodes = {
65+
# FIXME: Remove temp_opt_out_node_purpose_label when a node upgrade can be
66+
# done. See https://github.com/2i2c-org/infrastructure/issues/3405.
6167
"n2-highmem-4" : {
6268
min : 0,
6369
max : 100,
6470
machine_type : "n2-highmem-4",
71+
temp_opt_out_node_purpose_label : true,
6572
},
6673
"n2-highmem-16" : {
6774
min : 0,
6875
max : 100,
6976
machine_type : "n2-highmem-16",
77+
temp_opt_out_node_purpose_label : true,
7078
},
7179
"n2-highmem-64" : {
7280
min : 0,
7381
max : 100,
7482
machine_type : "n2-highmem-64",
83+
temp_opt_out_node_purpose_label : true,
7584
},
7685
"small" : {
7786
min : 0,
7887
max : 100,
7988
machine_type : "n1-standard-2",
89+
temp_opt_out_node_purpose_label : true,
8090
},
8191
"medium" : {
8292
min : 0,
8393
max : 100,
8494
machine_type : "n1-standard-4",
95+
temp_opt_out_node_purpose_label : true,
8596
},
8697
"large" : {
8798
min : 0,
8899
max : 100,
89100
machine_type : "n1-standard-8",
101+
temp_opt_out_node_purpose_label : true,
90102
},
91103
"huge" : {
92104
min : 0,
93105
max : 100,
94106
machine_type : "n1-standard-16",
107+
temp_opt_out_node_purpose_label : true,
95108
},
96109
}
97110

@@ -102,10 +115,13 @@ notebook_nodes = {
102115
#
103116
dask_nodes = {
104117
# FIXME: Rename this to "n2-highmem-16" when given the chance and no such nodes are running
118+
# FIXME: Remove temp_opt_out_node_purpose_label when a node upgrade can be
119+
# done. See https://github.com/2i2c-org/infrastructure/issues/3405.
105120
"worker" : {
106121
min : 0,
107122
max : 100,
108123
machine_type : "n2-highmem-16",
124+
temp_opt_out_node_purpose_label : true,
109125
},
110126
}
111127

0 commit comments

Comments
 (0)