fix 0 size cache config

wangxy518 · May 3, 2018 · 502784c · 502784c
1 parent ec96ee0
commit 502784c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 21 deletions.
diff --git a/dns/cluster/coredns-configmap.yaml b/dns/cluster/coredns-configmap.yaml
@@ -29,9 +29,4 @@ data:
           fallthrough in-addr.arpa ip6.arpa
         }
         prometheus :9153
-        proxy . /etc/resolv.conf
-        cache 30 {
-          success 1000
-          denial 1000
-        }
     }
diff --git a/dns/py/params.py b/dns/py/params.py
@@ -158,11 +158,14 @@ def is_relevant(self, attributes):
     return 'cluster-dns' not in attributes
 
   def set(self, inputs, value):
-    config = inputs.configmap_yaml['data']
-    config['Corefile'] = re.sub(r'success \d+', 'success ' + repr(value),
-                                config['Corefile'])
-    config['Corefile'] = re.sub(r'denial \d+', 'denial ' + repr(value),
-                                config['Corefile'])
+    if value > 0:
+      cf = inputs.configmap_yaml['data']['Corefile']
+      cf = re.sub(r'\n', "\n"
+                  "  cache {\n"
+                  "    success " + repr(value) + "\n"
+                  "    denial " + repr(value) + "\n"
+                  "  }\n", cf, 1)
+      inputs.configmap_yaml['data']['Corefile'] = cf
 
 class DnsperfCmdlineParam(Param):
   """

diff --git a/dns/py/params_test.py b/dns/py/params_test.py
@@ -123,17 +123,14 @@ def test_coredns_params(self):
         continue
       param.set(inputs, values[param.name])
 
-      self.assertEquals(
-          '100m',
-          inputs.deployment_yaml['spec']['template']['spec']['containers']
-          [0]['resources']['limits']['cpu'])
-      self.assertTrue(
-          """
-    cache 30 {
-      success 200
-      denial 200
-    }"""
-          in inputs.configmap_yaml['data']['Corefile'])
+    self.assertTrue("success 200"
+                    in inputs.configmap_yaml['data']['Corefile'])
+    self.assertTrue("denial 200"
+                    in inputs.configmap_yaml['data']['Corefile'])
+    self.assertEquals(
+        '100m',
+        inputs.deployment_yaml['spec']['template']['spec']['containers']
+        [0]['resources']['limits']['cpu'])
 
   def test_null_params(self):
     # These should result in no limits.