Merge "New image parsing pattern that supports "registry""

sysinv/sysinv/sysinv/sysinv/conductor/kube_app.py

@@ -3433,6 +3433,10 @@ class AppImageParser(object):
               5. image: <str>
                  imageTag(tag/imagetag): <str>
 
+              6. image:
+                    registry: <str>
+                    repository: <str>
+
         :param var_dict: dict
         :return: a list of image references
         """
@@ -3456,6 +3460,9 @@ class AppImageParser(object):
                         keys = v.keys()
                         if 'repository' in keys:
                             image.update({'repository': v['repository']})
+                            if 'registry' in keys:
+                                image.update({'repository': '{}/{}'.format(
+                                    v['registry'], v['repository'])})
                         if 'tag' in keys:
                             image.update({'tag': v['tag']})
                         if image:

sysinv/sysinv/sysinv/sysinv/tests/conductor/data/chart_values_sample.yaml

@@ -25,6 +25,12 @@ image:
   repository: docker.elastic.co/elasticsearch/elasticsearch-oss
   tag: 7.4.0
 
+metricsServer:
+  image:
+    registry: k8s.gcr.io
+    repository: metrics-server/metrics-server
+    tag: 0.6.1
+
 extraInitContainers:
   limitset:
     image: docker.elastic.co/beats/filebeat-oss:7.4.0

sysinv/sysinv/sysinv/sysinv/tests/conductor/test_kube_app_image_parser.py

@@ -90,6 +90,12 @@ IMAGES_RESOURCE = {
     'image': {
         'tag': '7.4.0',
         'repository': 'docker.elastic.co/elasticsearch/elasticsearch-oss'
+    },
+    'metricsServer': {
+        'image': {
+            'tag': '0.6.1',
+            'repository': 'k8s.gcr.io/metrics-server/metrics-server'
+        }
     }
 }
 
@@ -189,6 +195,12 @@ class TestKubeAppImageParser(base.TestCase):
             'image': {
                 'tag': '7.4.0',
                 'repository': 'registry.local:9001/docker.elastic.co/elasticsearch/elasticsearch-oss'
+            },
+            'metricsServer': {
+                'image': {
+                    'tag': '0.6.1',
+                    'repository': 'registry.local:9001/k8s.gcr.io/metrics-server/metrics-server'
+                }
             }
         }
 
@@ -309,6 +321,12 @@ class TestKubeAppImageParser(base.TestCase):
             'image': {
                 'tag': '7.5.2',
                 'repository': 'docker.elastic.co/elasticsearch/elasticsearch-oss'
+            },
+            'metricsServer': {
+                'image': {
+                    'tag': '0.6.1',
+                    'repository': 'k8s.gcr.io/metrics-server/metrics-server'
+                }
             }
         }
 
@@ -331,7 +349,8 @@ class TestKubeAppImageParser(base.TestCase):
             'quay.io/silicom/phc2sys:3.1.1',
             'quay.io/silicom/grpc-tsyncd:2.1.2.8',
             'quay.io/silicom/gpsd:3.23.1',
-            'docker.io/starlingx/stx-heat:master-centos-stable-latest'
+            'docker.io/starlingx/stx-heat:master-centos-stable-latest',
+            'k8s.gcr.io/metrics-server/metrics-server:0.6.1'
         ]
 
         download_imgs_list = self.image_parser.generate_download_images_list(