From cc32fd13db55dd065e9ba7608f34e544edb36dad Mon Sep 17 00:00:00 2001 From: chrislovecnm Date: Tue, 25 Jun 2019 15:04:58 -0600 Subject: [PATCH] Tweaking integration tests Adding new field 'configure_ip_masq' to public stub domain example and removing the same field from the private cluster example. Removed the integration control to check for ip masq in the private cluster as well. --- examples/stub_domains/main.tf | 2 ++ .../stub_domains_private/controls/kubectl.rb | 20 ------------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/examples/stub_domains/main.tf b/examples/stub_domains/main.tf index 0129ecab4b..5f60993ea1 100644 --- a/examples/stub_domains/main.tf +++ b/examples/stub_domains/main.tf @@ -40,6 +40,8 @@ module "gke" { network_policy = true service_account = "${var.compute_engine_service_account}" + configure_ip_masq = true + stub_domains { "example.com" = [ "10.254.154.11", diff --git a/test/integration/stub_domains_private/controls/kubectl.rb b/test/integration/stub_domains_private/controls/kubectl.rb index 687522bf92..e9a1bd7412 100644 --- a/test/integration/stub_domains_private/controls/kubectl.rb +++ b/test/integration/stub_domains_private/controls/kubectl.rb @@ -59,26 +59,6 @@ }) end end - - describe "ipmasq" do - let(:ipmasq_configmap) { client.get_config_map("ip-masq-agent", "kube-system") } - - it "is created by Terraform" do - expect(ipmasq_configmap.metadata.labels.maintained_by).to eq "terraform" - end - - it "is configured properly" do - expect(YAML.load(ipmasq_configmap.data.config)).to eq({ - "nonMasqueradeCIDRs" => [ - "10.0.0.0/8", - "172.16.0.0/12", - "192.168.0.0/16", - ], - "resyncInterval" => "60s", - "masqLinkLocal" => false, - }) - end - end end end end