From 989531fadaa9dc81850cd269fda8fd45030e6313 Mon Sep 17 00:00:00 2001
From: Paul Stack <public@paulstack.co.uk>
Date: Fri, 7 May 2021 12:06:35 +0100
Subject: [PATCH] As of GKE 1.19, masterAuth is no longer able to be set (#996)

Fixes: #995
---
 gcp-py-gke/__main__.py                                         | 3 +--
 gcp-ts-gke/cluster.ts                                          | 1 -
 gcp-ts-k8s-ruby-on-rails-postgresql/infra/cluster.ts           | 1 -
 google-native-ts-k8s-ruby-on-rails-postgresql/infra/cluster.ts | 1 -
 kubernetes-ts-multicloud/gke.ts                                | 1 -
 misc/scripts/testinfra/gke.ts                                  | 1 -
 6 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/gcp-py-gke/__main__.py b/gcp-py-gke/__main__.py
index 27e3ad342..673678f81 100644
--- a/gcp-py-gke/__main__.py
+++ b/gcp-py-gke/__main__.py
@@ -1,6 +1,6 @@
 from pulumi import Config, export, get_project, get_stack, Output, ResourceOptions
 from pulumi_gcp.config import project, zone
-from pulumi_gcp.container import Cluster, ClusterMasterAuthArgs, ClusterNodeConfigArgs
+from pulumi_gcp.container import Cluster, ClusterNodeConfigArgs
 from pulumi_kubernetes import Provider
 from pulumi_kubernetes.apps.v1 import Deployment, DeploymentSpecArgs
 from pulumi_kubernetes.core.v1 import ContainerArgs, PodSpecArgs, PodTemplateSpecArgs, Service, ServicePortArgs, ServiceSpecArgs
@@ -27,7 +27,6 @@
     initial_node_count=NODE_COUNT,
     node_version=MASTER_VERSION,
     min_master_version=MASTER_VERSION,
-    master_auth=ClusterMasterAuthArgs(username=USERNAME, password=PASSWORD),
     node_config=ClusterNodeConfigArgs(
         machine_type=NODE_MACHINE_TYPE,
         oauth_scopes=[
diff --git a/gcp-ts-gke/cluster.ts b/gcp-ts-gke/cluster.ts
index c48a452eb..c1dedfed3 100644
--- a/gcp-ts-gke/cluster.ts
+++ b/gcp-ts-gke/cluster.ts
@@ -14,7 +14,6 @@ export const k8sCluster = new gcp.container.Cluster("gke-cluster", {
     removeDefaultNodePool: true,
 
     minMasterVersion: masterVersion,
-    masterAuth: { username, password },
 });
 
 const nodePool = new gcp.container.NodePool(`primary-node-pool`, {
diff --git a/gcp-ts-k8s-ruby-on-rails-postgresql/infra/cluster.ts b/gcp-ts-k8s-ruby-on-rails-postgresql/infra/cluster.ts
index 4c628a30c..e08f02bbd 100644
--- a/gcp-ts-k8s-ruby-on-rails-postgresql/infra/cluster.ts
+++ b/gcp-ts-k8s-ruby-on-rails-postgresql/infra/cluster.ts
@@ -14,7 +14,6 @@ export const cluster = new gcp.container.Cluster("gke-cluster", {
     removeDefaultNodePool: true,
 
     minMasterVersion: masterVersion,
-    masterAuth: { username: clusterUsername, password: clusterPassword },
 });
 
 const nodePool = new gcp.container.NodePool(`primary-node-pool`, {
diff --git a/google-native-ts-k8s-ruby-on-rails-postgresql/infra/cluster.ts b/google-native-ts-k8s-ruby-on-rails-postgresql/infra/cluster.ts
index 74fd0dae3..962368c82 100644
--- a/google-native-ts-k8s-ruby-on-rails-postgresql/infra/cluster.ts
+++ b/google-native-ts-k8s-ruby-on-rails-postgresql/infra/cluster.ts
@@ -14,7 +14,6 @@ const cluster = new gcloud.container.v1.Cluster("cluster", {
     parent: `projects/${project}/locations/${region}`,
     initialClusterVersion: "1.18.16-gke.2100",
     initialNodeCount: 1,
-    masterAuth: { username: clusterUsername, password: clusterPassword },
     name: clusterName,
     network: `projects/${project}/global/networks/default`,
     nodeConfig: {
diff --git a/kubernetes-ts-multicloud/gke.ts b/kubernetes-ts-multicloud/gke.ts
index b06504c3a..a78fe2bca 100644
--- a/kubernetes-ts-multicloud/gke.ts
+++ b/kubernetes-ts-multicloud/gke.ts
@@ -43,7 +43,6 @@ export class GkeCluster extends pulumi.ComponentResource {
             removeDefaultNodePool: true,
 
             minMasterVersion: engineVersion,
-            masterAuth: {username: "example-user", password: password},
         }, {parent: this});
 
         const nodePool = new gcp.container.NodePool(`primary-node-pool`, {
diff --git a/misc/scripts/testinfra/gke.ts b/misc/scripts/testinfra/gke.ts
index 0b1686724..d7da498a7 100644
--- a/misc/scripts/testinfra/gke.ts
+++ b/misc/scripts/testinfra/gke.ts
@@ -41,7 +41,6 @@ export class GkeCluster extends pulumi.ComponentResource {
             removeDefaultNodePool: true,
 
             minMasterVersion: engineVersion,
-            masterAuth: {username: config.masterUsername, password: config.masterPassword},
             project: config.gcpProject,
             location: config.gcpLocation,
         }, {parent: this});