starlingx
/
config
Code Issues Proposed changes

Merge "Add capability to specify null image tags for kube apps"

This commit is contained in:
Zuul 2019-09-23 16:14:14 +00:00 committed by Gerrit Code Review
parent b03e647965 5fee41232a
commit 9d4439788d
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sysinv/sysinv/sysinv/sysinv/conductor/kube_app.py
View File

@ -610,12 +610,14 @@ class AppOperator(object):
if key not in images_overrides:
if key not in images_manifest:
images_manifest.update({key: images_charts[key]})
if not re.match(r'^.+:.+/', images_manifest[key]):
images_manifest.update(
{key: '{}/{}'.format(constants.DOCKER_REGISTRY_SERVER,
images_manifest[key])})
chart_image_tags_updated = True
image_tags.append(images_manifest[key])
# If the image is tagged as null, do not download
if images_manifest[key]:
if not re.match(r'^.+:.+/', images_manifest[key]):
images_manifest.update({key:
'{}/{}'.format(constants.DOCKER_REGISTRY_SERVER,
images_manifest[key])})
chart_image_tags_updated = True
image_tags.append(images_manifest[key])
else:
if not re.match(r'^.+:.+/', images_overrides[key]):
images_overrides.update(

6
sysinv/sysinv/sysinv/sysinv/helm/openstack_version_check.py
View File

@ -7,9 +7,9 @@
from sysinv.helm import base
SUPPORTED_VERSIONS = {
'1.0-18-centos-stable-versioned',
'1.0-18-centos-stable-latest',
'1.0-18',
'1.0-19-centos-stable-versioned',
'1.0-19-centos-stable-latest',
'1.0-19',
}