Skip to content

Commit 0ec2446

Browse files
JulienBalestrahush-hush
authored andcommitted
pause-container: extend the regex to catch region based. (#3674)
1 parent 7fd6e7d commit 0ec2446

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

tests/core/test_dockerutil.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ def test_docker_are_tags_filtered(self):
174174
self.assertTrue(du.is_k8s())
175175
pause_containers = [
176176
"docker_image:gcr.io/google_containers/pause-amd64:0.3.0",
177+
"docker_image:asia.gcr.io/google_containers/pause-amd64:3.0",
177178
"docker_image:k8s.gcr.io/pause-amd64:latest",
178179
"image_name:openshift/origin-pod",
179180
"image_name:kubernetes/pause",

utils/dockerutil.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ class CGroupException(Exception):
4747

4848
# only used if no exclude rule was defined
4949
DEFAULT_CONTAINER_EXCLUDE = [
50-
"docker_image:gcr.io/google_containers/pause.*",
51-
"docker_image:k8s.gcr.io/pause.*",
50+
"docker_image:(.*)gcr.io/google_containers/pause(.*)",
51+
"docker_image:k8s.gcr.io/pause(.*)",
5252
"image_name:openshift/origin-pod",
5353
"image_name:kubernetes/pause"
5454
]

0 commit comments

Comments
 (0)