Change container image_type to be _CONTAINERD variant due to depr…

…ecation (#5855) (#11360) Signed-off-by: Modular Magician <magic-modules@google.com>
hashicorp · Mar 28, 2022 · 2c3be0c · 2c3be0c
1 parent 1a3e5b9
commit 2c3be0c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/.changelog/5855.txt b/.changelog/5855.txt
@@ -0,0 +1,3 @@
+```release-note:none
+
+```
diff --git a/google/resource_container_cluster_test.go b/google/resource_container_cluster_test.go
@@ -2623,7 +2623,7 @@ resource "google_container_cluster" "with_node_config" {
     }
 
     // Updatable fields
-    image_type = "cos"
+    image_type = "COS_CONTAINERD"
   }
 }
 `, clusterName)
@@ -2672,7 +2672,7 @@ resource "google_container_cluster" "with_node_config" {
     }
 
     // Updatable fields
-    image_type = "UBUNTU"
+    image_type = "UBUNTU_CONTAINERD"
   }
 }
 `, clusterName)
@@ -2723,7 +2723,7 @@ resource "google_container_cluster" "with_node_config" {
     preemptible      = true
 
     // Updatable fields
-    image_type = "COS"
+    image_type = "COS_CONTAINERD"
 
     shielded_instance_config {
       enable_secure_boot          = true
@@ -3175,7 +3175,7 @@ resource "google_container_cluster" "with_node_pool_node_config" {
         foo                      = "bar"
         disable-legacy-endpoints = "true"
       }
-      image_type = "COS"
+      image_type = "COS_CONTAINERD"
       labels = {
         foo = "bar"
       }

diff --git a/google/resource_container_node_pool_test.go b/google/resource_container_node_pool_test.go
@@ -1176,7 +1176,7 @@ resource "google_container_node_pool" "np_with_node_config" {
     }
 
     // Updatable fields
-    image_type = "COS"
+    image_type = "COS_CONTAINERD"
   }
 }
 `, cluster, nodePool)
@@ -1220,7 +1220,7 @@ resource "google_container_node_pool" "np_with_node_config" {
     }
 
     // Updatable fields
-    image_type = "UBUNTU"
+    image_type = "UBUNTU_CONTAINERD"
   }
 }
 `, cluster, nodePool)
@@ -1359,7 +1359,7 @@ resource "google_container_node_pool" "np_with_gpu" {
 
     preemptible     = true
     service_account = "default"
-    image_type      = "COS"
+    image_type      = "COS_CONTAINERD"
 
     guest_accelerator {
       type  = "nvidia-tesla-a100"

diff --git a/website/docs/r/container_cluster.html.markdown b/website/docs/r/container_cluster.html.markdown
@@ -473,7 +473,7 @@ as "Intel Haswell" or "Intel Sandy Bridge".
 
 * `service_account` - (Optional) The Google Cloud Platform Service Account to be used by the node VMs.
 
-* `image_type` - (Optional) The default image type used by NAP once a new node pool is being created. Please note that according to the [official documentation](https://cloud.google.com/kubernetes-engine/docs/how-to/node-auto-provisioning#default-image-type) the value must be one of the [COS_CONTAINERD, COS, UBUNTU_CONTAINERD, UBUNTU].
+* `image_type` - (Optional) The default image type used by NAP once a new node pool is being created. Please note that according to the [official documentation](https://cloud.google.com/kubernetes-engine/docs/how-to/node-auto-provisioning#default-image-type) the value must be one of the [COS_CONTAINERD, COS, UBUNTU_CONTAINERD, UBUNTU]. __NOTE__ : COS AND UBUNTU are deprecated as of `GKE 1.24`
 
 <a name="nested_authenticator_groups_config"></a>The `authenticator_groups_config` block supports: