Skip to content

Commit 6072e52

Browse files
authored
Use latest Kubernetes versions for GCP clusters (nebari-dev#3182)
1 parent e6b8d28 commit 6072e52

File tree

1 file changed

+14
-2
lines changed
  • src/_nebari/stages/infrastructure/template/gcp/modules/kubernetes

1 file changed

+14
-2
lines changed

src/_nebari/stages/infrastructure/template/gcp/modules/kubernetes/main.tf

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
data "google_client_config" "main" {
22
}
33

4+
data "google_container_engine_versions" "main" {
5+
location = var.location
6+
version_prefix = "${var.kubernetes_version}."
7+
}
8+
49
resource "google_container_cluster" "main" {
510
name = var.name
611
location = var.location
7-
min_master_version = var.kubernetes_version
12+
min_master_version = data.google_container_engine_versions.main.latest_master_version
813
deletion_protection = false
914

1015
node_locations = var.availability_zones
@@ -75,7 +80,7 @@ resource "google_container_node_pool" "main" {
7580
name = local.merged_node_groups[count.index].name
7681
location = var.location
7782
cluster = google_container_cluster.main.name
78-
version = var.kubernetes_version
83+
version = data.google_container_engine_versions.main.latest_node_version
7984

8085
initial_node_count = local.merged_node_groups[count.index].min_size
8186

@@ -122,4 +127,11 @@ resource "google_container_node_pool" "main" {
122127
tags = var.tags
123128
}
124129

130+
lifecycle {
131+
ignore_changes = [
132+
# GCP automatically adds resource labels for node pools (e.g., goog-gke-accelerator-type)
133+
node_config[0].resource_labels,
134+
]
135+
}
136+
125137
}

0 commit comments

Comments
 (0)