Skip to content

Commit 179764d

Browse files
[CI] Remove some settings to keep terraform happy
Some of these seem to have gotten fixed after upgrading to a more recent GCP provider version. There is still one left on the windows node pool that needs more investigation.
1 parent ddc8555 commit 179764d

File tree

1 file changed

+0
-28
lines changed

1 file changed

+0
-28
lines changed

premerge/gke_cluster/main.tf

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,6 @@ resource "google_container_node_pool" "llvm_premerge_linux_service" {
4444
workload_metadata_config {
4545
mode = "GKE_METADATA"
4646
}
47-
# Terraform wants to recreate the node pool everytime whe running
48-
# terraform apply unless we explicitly set this.
49-
# TODO(boomanaiden154): Look into why terraform is doing this so we do
50-
# not need this hack.
51-
resource_labels = {
52-
"goog-gke-node-pool-provisioning-model" = "on-demand"
53-
}
5447
}
5548
}
5649

@@ -76,13 +69,6 @@ resource "google_container_node_pool" "llvm_premerge_linux" {
7669
"premerge-platform" : "linux"
7770
}
7871
disk_size_gb = 200
79-
# Terraform wants to recreate the node pool everytime whe running
80-
# terraform apply unless we explicitly set this.
81-
# TODO(boomanaiden154): Look into why terraform is doing this so we do
82-
# not need this hack.
83-
resource_labels = {
84-
"goog-gke-node-pool-provisioning-model" = "on-demand"
85-
}
8672

8773
# Enable workload identity federation for this pool so that we can access
8874
# GCS buckets.
@@ -114,13 +100,6 @@ resource "google_container_node_pool" "llvm_premerge_libcxx" {
114100
"premerge-platform-libcxx" : "linux-libcxx"
115101
}
116102
disk_size_gb = 200
117-
# Terraform wants to recreate the node pool everytime whe running
118-
# terraform apply unless we explicitly set this.
119-
# TODO(boomanaiden154): Look into why terraform is doing this so we do
120-
# not need this hack.
121-
resource_labels = {
122-
"goog-gke-node-pool-provisioning-model" = "on-demand"
123-
}
124103
}
125104
}
126105

@@ -159,13 +138,6 @@ resource "google_container_node_pool" "llvm_premerge_windows_2022" {
159138
}
160139
disk_size_gb = 200
161140
disk_type = "pd-ssd"
162-
# Terraform wants to recreate the node pool everytime whe running
163-
# terraform apply unless we explicitly set this.
164-
# TODO(boomanaiden154): Look into why terraform is doing this so we do
165-
# not need this hack.
166-
resource_labels = {
167-
"goog-gke-node-pool-provisioning-model" = "on-demand"
168-
}
169141

170142
# Enable workload identity federation for this pool so that we can access
171143
# GCS buckets.

0 commit comments

Comments
 (0)