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

terraform-google-modules · Nov 16, 2022 · e2a193d · e2a193d
2 parents 1ecaea7 + 1c43c9d
commit e2a193d
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 7 deletions.
diff --git a/test/integration/beta_cluster/controls/gcloud.rb b/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

diff --git a/test/integration/sandbox_enabled/controls/gcloud.rb b/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

diff --git a/test/integration/simple_autopilot_public/controls/gcloud.rb b/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

diff --git a/test/integration/simple_regional/controls/gcloud.rb b/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

diff --git a/test/integration/simple_regional_with_kubeconfig/controls/gcloud.rb b/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

diff --git a/test/integration/simple_regional_with_networking/controls/gcloud.rb b/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

diff --git a/test/integration/simple_zonal/controls/gcloud.rb b/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