pause-container: extend the regex to catch region based. (#3674)

DataDog · Feb 13, 2018 · 0ec2446 · 0ec2446
1 parent 7fd6e7d
commit 0ec2446
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/tests/core/test_dockerutil.py b/tests/core/test_dockerutil.py
@@ -174,6 +174,7 @@ def test_docker_are_tags_filtered(self):
             self.assertTrue(du.is_k8s())
             pause_containers = [
                 "docker_image:gcr.io/google_containers/pause-amd64:0.3.0",
+                "docker_image:asia.gcr.io/google_containers/pause-amd64:3.0",
                 "docker_image:k8s.gcr.io/pause-amd64:latest",
                 "image_name:openshift/origin-pod",
                 "image_name:kubernetes/pause",

diff --git a/utils/dockerutil.py b/utils/dockerutil.py
@@ -47,8 +47,8 @@ class CGroupException(Exception):
 
 # only used if no exclude rule was defined
 DEFAULT_CONTAINER_EXCLUDE = [
-    "docker_image:gcr.io/google_containers/pause.*",
-    "docker_image:k8s.gcr.io/pause.*",
+    "docker_image:(.*)gcr.io/google_containers/pause(.*)",
+    "docker_image:k8s.gcr.io/pause(.*)",
     "image_name:openshift/origin-pod",
     "image_name:kubernetes/pause"
 ]