From ba26b618243f689449263b0db36f57c7850b7488 Mon Sep 17 00:00:00 2001 From: Modular Magician Date: Wed, 20 Oct 2021 17:52:46 +0000 Subject: [PATCH] Deprecate container cluster fields (#5261) Signed-off-by: Modular Magician --- .changelog/5261.txt | 3 +++ google-beta/resource_container_cluster.go | 2 ++ .../guides/version_4_upgrade.html.markdown | 27 ++++++++++++++----- 3 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 .changelog/5261.txt diff --git a/.changelog/5261.txt b/.changelog/5261.txt new file mode 100644 index 0000000000..5abcf7645f --- /dev/null +++ b/.changelog/5261.txt @@ -0,0 +1,3 @@ +```release-note:deprecation +container: deprecated the following `google_container_cluster` fields: `instance_group_urls` and `master_auth` +``` diff --git a/google-beta/resource_container_cluster.go b/google-beta/resource_container_cluster.go index 02926e4e9a..fc51ac07e1 100644 --- a/google-beta/resource_container_cluster.go +++ b/google-beta/resource_container_cluster.go @@ -730,6 +730,7 @@ func resourceContainerCluster() *schema.Resource { Optional: true, MaxItems: 1, Computed: true, + Deprecated: `Basic authentication was removed for GKE cluster versions >= 1.19.`, Description: `The authentication information for accessing the Kubernetes master. Some values in this block are only returned by the API if your service account has permission to get credentials for your GKE cluster. If you see an unexpected diff removing a username/password or unsetting your client cert, ensure you have the container.clusters.getCredentials permission.`, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -922,6 +923,7 @@ func resourceContainerCluster() *schema.Resource { "instance_group_urls": { Type: schema.TypeList, Computed: true, + Deprecated: `Please use node_pool.instance_group_urls instead.`, Elem: &schema.Schema{Type: schema.TypeString}, Description: `List of instance group URLs which have been assigned to the cluster.`, }, diff --git a/website/docs/guides/version_4_upgrade.html.markdown b/website/docs/guides/version_4_upgrade.html.markdown index f90c74261f..9a17f075e9 100644 --- a/website/docs/guides/version_4_upgrade.html.markdown +++ b/website/docs/guides/version_4_upgrade.html.markdown @@ -12,15 +12,21 @@ description: |- - [I accidentally upgraded to 4.0.0, how do I downgrade to `3.X`?](#i-accidentally-upgraded-to-400-how-do-i-downgrade-to-3x) - [Provider Version Configuration](#provider-version-configuration) - [Provider](#provider) - - [Provider-level change example](#provider-level-change-example) + - [Runtime Configurator (`runtimeconfig`) resources have been removed from the GA provider](#runtime-configurator-runtimeconfig-resources-have-been-removed-from-the-ga-provider) - [Datasource: `google_product_resource`](#datasource-google_product_resource) - [Datasource-level change example](#datasource-level-change-example) -- [Resource: `google_compute_instance_group_manager`](#resource-google_compute_instance_group_manager) - - [`update_policy.min_ready_sec` is removed from the GA provider](#update_policymin_ready_sec-is-removed-from-the-GA-provider) -- [Resource: `google_compute_region_instance_group_manager`](#resource-google_compute_region_instance_group_manager) - - [`update_policy.min_ready_sec` is removed from the GA provider](#update_policymin_ready_sec-is-removed-from-the-GA-provider) + - [Resource: `google_compute_instance_group_manager`](#resource-google_compute_instance_group_manager) + - [`update_policy.min_ready_sec` is removed from the GA provider](#update_policymin_ready_sec-is-removed-from-the-ga-provider) + - [Resource: `google_compute_region_instance_group_manager`](#resource-google_compute_region_instance_group_manager) + - [`update_policy.min_ready_sec` is removed from the GA provider](#update_policymin_ready_sec-is-removed-from-the-ga-provider-1) + - [Resource: `google_compute_instance_template`](#resource-google_compute_instance_template) + - [`enable_display` is removed from the GA provider](#enable_display-is-removed-from-the-ga-provider) - [Resource: `google_container_cluster`](#resource-google_container_cluster) + - [`instance_group_urls` is now removed](#instance_group_urls-is-now-removed) + - [`master_auth` is now removed](#master_auth-is-now-removed) - [`node_config.workload_metadata_config.node_metadata` is now removed](#node_configworkload_metadata_confignode_metadata-is-now-removed) + - [`workload_identity_config.0.identity_namespace` is now removed](#workload_identity_config0identity_namespace-is-now-removed) + - [`pod_security_policy_config` is removed from the GA provider](#pod_security_policy_config-is-removed-from-the-ga-provider) @@ -183,6 +189,15 @@ resource definition. ## Resource: `google_container_cluster` +### `instance_group_urls` is now removed + +`instance_group_urls` has been removed in favor of `node_pool.instance_group_urls` + +### `master_auth` is now removed + +`master_auth` and its subfields have been removed. +Basic authentication was removed for GKE cluster versions >= 1.19. The cluster cannot be created with basic authentication enabled. Instructions for choosing an alternative authentication method can be found at: cloud.google.com/kubernetes-engine/docs/how-to/api-server-authentication. + ### `node_config.workload_metadata_config.node_metadata` is now removed Removed in favor of `node_config.workload_metadata_config.mode`. @@ -203,7 +218,7 @@ resource "google_container_cluster" "cluster" { - identity_namespace = "your-project.svc.id.goog" + workload_pool = "your-project.svc.id.goog" } -```` +``` ### `pod_security_policy_config` is removed from the GA provider