Merge branch 'master' into fix/global-master-access

Author: bharathkkb

test/integration/beta_cluster/controls/gcloud.rb

@@ -45,7 +45,8 @@
       end
 
       it "uses public nodes and master endpoint" do
-        expect(data['privateClusterConfig']).to eq nil
+        expect(data['privateClusterConfig']['enablePrivateEndpoint']).to eq nil
+        expect(data['privateClusterConfig']['enablePrivateNodes']).to eq nil
       end
 
       it "has the expected addon settings" do

test/integration/sandbox_enabled/controls/gcloud.rb

@@ -40,7 +40,8 @@
       end
 
       it "uses public nodes and master endpoint" do
-        expect(data['privateClusterConfig']).to eq nil
+        expect(data['privateClusterConfig']['enablePrivateEndpoint']).to eq nil
+        expect(data['privateClusterConfig']['enablePrivateNodes']).to eq nil
       end
 
       it "has the expected addon settings" do

test/integration/simple_autopilot_public/controls/gcloud.rb

@@ -44,7 +44,8 @@
       end
 
       it "uses public nodes and master endpoint" do
-        expect(data['privateClusterConfig']).to eq nil
+        expect(data['privateClusterConfig']['enablePrivateEndpoint']).to eq nil
+        expect(data['privateClusterConfig']['enablePrivateNodes']).to eq nil
       end
 
       it "has the expected addon settings" do

test/integration/simple_regional/controls/gcloud.rb

@@ -40,7 +40,8 @@
       end
 
       it "uses public nodes and master endpoint" do
-        expect(data['privateClusterConfig']).to eq nil
+        expect(data['privateClusterConfig']['enablePrivateEndpoint']).to eq nil
+        expect(data['privateClusterConfig']['enablePrivateNodes']).to eq nil
       end
 
       it "has the expected addon settings" do

test/integration/simple_regional_with_kubeconfig/controls/gcloud.rb

@@ -40,7 +40,8 @@
       end
 
       it "uses public nodes and master endpoint" do
-        expect(data['privateClusterConfig']).to eq nil
+        expect(data['privateClusterConfig']['enablePrivateEndpoint']).to eq nil
+        expect(data['privateClusterConfig']['enablePrivateNodes']).to eq nil
       end
 
       it "has the expected addon settings" do

test/integration/simple_regional_with_networking/controls/gcloud.rb

@@ -40,7 +40,8 @@
       end
 
       it "uses public nodes and master endpoint" do
-        expect(data['privateClusterConfig']).to eq nil
+        expect(data['privateClusterConfig']['enablePrivateEndpoint']).to eq nil
+        expect(data['privateClusterConfig']['enablePrivateNodes']).to eq nil
       end
 
       it "has the expected addon settings" do

test/integration/simple_zonal/controls/gcloud.rb

@@ -45,7 +45,8 @@
       end
 
       it "uses public nodes and master endpoint" do
-        expect(data['privateClusterConfig']).to eq nil
+        expect(data['privateClusterConfig']['enablePrivateEndpoint']).to eq nil
+        expect(data['privateClusterConfig']['enablePrivateNodes']).to eq nil
       end
 
       it "has the expected addon settings" do