3.90.1: Fix deprecation warning in GKE Cluster (#3820)

Author: rileykarson

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 3.90.1 (Unreleased)
+
+DEPRECATIONS:
+
+* container: fixed an overly-broad deprecation on `master_auth`, constraining it to `master_auth.username` and `master_auth.password`
+
 ## 3.90.0 (October 26, 2021)
 
 DEPRECATIONS:

google-beta/resource_container_cluster.go

@@ -730,13 +730,13 @@ 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{
 						"password": {
 							Type:         schema.TypeString,
 							Optional:     true,
+							Deprecated:   `Basic authentication was removed for GKE cluster versions >= 1.19. If master_auth is present in your config with only password or username set, you can remove the block entirely.`,
 							AtLeastOneOf: []string{"master_auth.0.password", "master_auth.0.username", "master_auth.0.client_certificate_config"},
 							Sensitive:    true,
 							Description:  `The password to use for HTTP basic authentication when accessing the Kubernetes master endpoint.`,
@@ -745,6 +745,7 @@ func resourceContainerCluster() *schema.Resource {
 						"username": {
 							Type:         schema.TypeString,
 							Optional:     true,
+							Deprecated:   `Basic authentication was removed for GKE cluster versions >= 1.19. If master_auth is present in your config with only password or username set, you can remove the block entirely.`,
 							AtLeastOneOf: []string{"master_auth.0.password", "master_auth.0.username", "master_auth.0.client_certificate_config"},
 							Description:  `The username to use for HTTP basic authentication when accessing the Kubernetes master endpoint. If not present basic auth will be disabled.`,
 						},