openstack
/
zun
Code Issues Proposed changes

Merge "Force image pull policy to always"

This commit is contained in:
Zuul 2019-04-10 03:34:30 +00:00 committed by Gerrit Code Review
parent 6cec75b904 b2c812f453
commit 1307bc5f86
5 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zun/api/controllers/v1/capsules.py
View File

@ -211,6 +211,9 @@ class CapsuleController(base.Controller):
merged_containers_spec = init_containers_spec + containers_spec
for container_spec in merged_containers_spec:
if container_spec.get('image_pull_policy'):
policy.enforce(context, "container:create:image_pull_policy",
action="container:create:image_pull_policy")
container_dict = container_spec
container_dict['project_id'] = context.project_id
container_dict['user_id'] = context.user_id

3
zun/api/controllers/v1/containers.py
View File

@ -395,6 +395,9 @@ class ContainersController(base.Controller):
container_dict.get('image_driver'))
if not container_dict['image_driver']:
container_dict['image_driver'] = CONF.default_image_driver
if container_dict.get('image_pull_policy'):
policy.enforce(context, "container:create:image_pull_policy",
action="container:create:image_pull_policy")
container_dict['project_id'] = context.project_id
container_dict['user_id'] = context.user_id

12
zun/common/policies/container.py
View File

@ -52,6 +52,18 @@ rules = [
}
]
),
policy.DocumentedRuleDefault(
name=CONTAINER % 'create:image_pull_policy',
check_str=base.RULE_ADMIN_API,
description=('Create a new container with specified image pull '
'policy.'),
operations=[
{
'path': '/v1/containers',
'method': 'POST'
}
]
),
policy.DocumentedRuleDefault(
name=CONTAINER % 'delete',
check_str=base.RULE_ADMIN_OR_OWNER,

5
zun/common/utils.py
View File

@ -248,10 +248,7 @@ def check_container_id(function):
def get_image_pull_policy(image_pull_policy, image_tag):
if not image_pull_policy:
if image_tag == 'latest' or not image_tag:
image_pull_policy = 'always'
else:
image_pull_policy = 'ifnotpresent'
image_pull_policy = 'always'
return image_pull_policy

2
zun/tests/unit/common/test_utils.py
View File

@ -92,7 +92,7 @@ class TestUtils(base.TestCase):
self.assertEqual('always',
utils.get_image_pull_policy(None,
'latest'))
self.assertEqual('ifnotpresent',
self.assertEqual('always',
utils.get_image_pull_policy(None,
'2.0'))