Fixes gke version for test and docs

GoogleCloudPlatform · Mar 13, 2023 · 2c0afee · 2c0afee
1 parent a894979
commit 2c0afee
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/mmv1/third_party/terraform/tests/resource_container_node_pool_test.go.erb b/mmv1/third_party/terraform/tests/resource_container_node_pool_test.go.erb
@@ -1271,16 +1271,24 @@ func TestAccContainerNodePool_localNvmeSsdBlockConfig(t *testing.T) {
 
 func testAccContainerNodePool_localNvmeSsdBlockConfig(cluster, np string) string {
 	return fmt.Sprintf(`
+data "google_container_engine_versions" "central1a" {
+	location       = "us-central1-a"
+	// this feature became available in 1.25.3-gke.1800, not sure if theres a better way to do
+	version_prefix = "1.25.3"
+}
+
 resource "google_container_cluster" "cluster" {
   name               = "%s"
   location           = "us-central1-a"
+  min_master_version = data.google_container_engine_versions.central1a.latest_master_version
   initial_node_count = 1
 }
 
 resource "google_container_node_pool" "np" {
   name               = "%s"
   location           = "us-central1-a"
   cluster            = google_container_cluster.cluster.name
+  node_version       = data.google_container_engine_versions.central1a.latest_node_version
   initial_node_count = 1
 
   node_config {
@@ -1294,10 +1302,6 @@ resource "google_container_node_pool" "np" {
 }
 <% end %>
 
-
-
-
-
 func TestAccContainerNodePool_gcfsConfig(t *testing.T) {
 	t.Parallel()
 

diff --git a/mmv1/third_party/terraform/website/docs/r/container_cluster.html.markdown b/mmv1/third_party/terraform/website/docs/r/container_cluster.html.markdown
@@ -742,10 +742,10 @@ ephemeral_storage_config {
 }
 ```
 
-* `local_nvme_ssd_config` - (Optional, [Beta]) Parameters for the local NVMe SSDs. Structure is [documented below](#nested_local_nvme_ssd_config).
+* `local_nvme_ssd_block_config` - (Optional, [Beta]) Parameters for the local NVMe SSDs. Structure is [documented below](#nested_local_nvme_ssd_block_config).
 
 ```hcl
-local_nvme_ssd_config {
+local_nvme_ssd_block_config {
   local_ssd_count = 2
 }
 ```
@@ -886,9 +886,10 @@ linux_node_config {
 
 * `local_ssd_count` (Required) - Number of local SSDs to use to back ephemeral storage. Uses NVMe interfaces. Each local SSD is 375 GB in size. If zero, it means to disable using local SSDs as ephemeral storage.
 
-<a name="nested_local_nvme_ssd_config"></a>The `local_nvme_ssd_config` block supports:
+<a name="nested_local_nvme_ssd_block_config"></a>The `local_nvme_ssd_block_config` block supports:
 
 * `local_ssd_count` (Required) - Number of local NVMe SSDs attached to the instance. Each NVMe SSD is 375 GB in size.
+-> Note: Only supported in GKE versions v1.25.3-gke.1800 or later.
 
 <a name="nested_gcfs_config"></a>The `gcfs_config` block supports: