From 2c3be0cf1f9c56231817a2e876fa63b1afdb46e2 Mon Sep 17 00:00:00 2001 From: The Magician Date: Mon, 28 Mar 2022 11:56:45 -0500 Subject: [PATCH] Change container `image_type` to be `_CONTAINERD` variant due to deprecation (#5855) (#11360) Signed-off-by: Modular Magician --- .changelog/5855.txt | 3 +++ google/resource_container_cluster_test.go | 8 ++++---- google/resource_container_node_pool_test.go | 6 +++--- website/docs/r/container_cluster.html.markdown | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 .changelog/5855.txt diff --git a/.changelog/5855.txt b/.changelog/5855.txt new file mode 100644 index 00000000000..8ec013c0699 --- /dev/null +++ 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 index a6e24b62633..0a93114ff24 100644 --- 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 index fca60138d5a..41a24500b3e 100644 --- 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 index 70a9cf64a95..cd08c09e679 100644 --- 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` The `authenticator_groups_config` block supports: