From f04cb41a9eeaca0bd9c9c4d3400ffda14a5117df Mon Sep 17 00:00:00 2001 From: Angie Wang Date: Fri, 1 Nov 2019 15:00:37 -0400 Subject: [PATCH] Update armada image reference In commit https://review.opendev.org/#/c/692611/, it changes all system images to push under the default registry namespaces. With/without private registries, controller should pull armada image from "registry.local:9001/quay.io" Closes-Bug: 1846799 Depends-On: https://review.opendev.org/#/c/692611/1 Change-Id: Icb1ba83bfc54b468b277c5745fbc0de1d395ef4f Signed-off-by: Angie Wang --- .../sysinv/sysinv/conductor/kube_app.py | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/sysinv/sysinv/sysinv/sysinv/conductor/kube_app.py b/sysinv/sysinv/sysinv/sysinv/conductor/kube_app.py index 5504301e7f..d95b013385 100644 --- a/sysinv/sysinv/sysinv/sysinv/conductor/kube_app.py +++ b/sysinv/sysinv/sysinv/sysinv/conductor/kube_app.py @@ -2722,21 +2722,12 @@ class DockerHelper(object): overrides_dir: {'bind': '/overrides', 'mode': 'ro'}, logs_dir: {'bind': ARMADA_CONTAINER_LOG_LOCATION, 'mode': 'rw'}} - quay_registry_url = self._dbapi.service_parameter_get_all( - service=constants.SERVICE_TYPE_DOCKER, - section=constants.SERVICE_PARAM_SECTION_DOCKER_QUAY_REGISTRY, - name=constants.SERVICE_PARAM_NAME_DOCKER_URL) - - if quay_registry_url: - quay_url = quay_registry_url[0].value - # If registry url has a port, strip it out - quay_url = re.sub(r':[0-9]+', '', quay_url) - else: - quay_url = constants.DEFAULT_DOCKER_QUAY_REGISTRY - - armada_image_tag = constants.DOCKER_REGISTRY_SERVER + '/' + quay_url + \ - image_versions.ARMADA_IMAGE_NAME + ":" + \ - image_versions.ARMADA_IMAGE_VERSION + # Armada img was pushed to local registry (registry.local:9001/quay.io/) + # at bootstrap time + armada_image_tag = constants.DOCKER_REGISTRY_SERVER + '/' + \ + constants.DEFAULT_DOCKER_QUAY_REGISTRY + \ + image_versions.ARMADA_IMAGE_NAME + ":" + \ + image_versions.ARMADA_IMAGE_VERSION armada_image = client.images.list(armada_image_tag) # Pull Armada image if it's not available