Merge branch 'master' into feature/private-cluster

terraform-google-modules · Jan 4, 2019 · 0e38f96 · 0e38f96
2 parents 4c20e45 + 218e1b9
commit 0e38f96
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/test/integration/simple_regional/controls/gcloud.rb b/test/integration/simple_regional/controls/gcloud.rb
@@ -48,9 +48,7 @@
 
       it "has the expected addon settings" do
         expect(data['addonsConfig']).to eq({
-          "horizontalPodAutoscaling" => {
-            "disabled" => true,
-          },
+          "horizontalPodAutoscaling" => {},
           "httpLoadBalancing" => {},
           "kubernetesDashboard" => {
             "disabled" => true,

diff --git a/test/integration/simple_zonal/controls/gcloud.rb b/test/integration/simple_zonal/controls/gcloud.rb
@@ -48,9 +48,7 @@
 
       it "has the expected addon settings" do
         expect(data['addonsConfig']).to eq({
-          "horizontalPodAutoscaling" => {
-            "disabled" => true,
-          },
+          "horizontalPodAutoscaling" => {},
           "httpLoadBalancing" => {},
           "kubernetesDashboard" => {
             "disabled" => true,

diff --git a/test/integration/stub_domains/controls/gcloud.rb b/test/integration/stub_domains/controls/gcloud.rb
@@ -40,9 +40,7 @@
 
       it "has the expected addon settings" do
         expect(data['addonsConfig']).to eq({
-          "horizontalPodAutoscaling" => {
-            "disabled" => true,
-          },
+          "horizontalPodAutoscaling" => {},
           "httpLoadBalancing" => {},
           "kubernetesDashboard" => {
             "disabled" => true,