fix(bom): Rename 'spinnaker-monitoring-*' to 'monitoring-*'. (#1482)

spinnaker · Mar 17, 2017 · 1e6585a · 1e6585a
1 parent 6c3028c
commit 1e6585a
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/dev/generate_bom.py b/dev/generate_bom.py
@@ -124,9 +124,8 @@ def write_container_builder_gcr_config(self):
       if comp == 'spinnaker-monitoring':
         config = dict(GOOGLE_CONTAINER_BUILDER_MONITORING_BASE_CONFIG)
         version = self.__version_from_tag(comp)
-        versioned_image = '{reg}/{repo}-daemon:{tag}'.format(reg=self.__docker_registry,
-                                                             repo=comp,
-                                                             tag=version)
+        versioned_image = '{reg}/monitoring-daemon:{tag}'.format(reg=self.__docker_registry,
+                                                                 tag=version)
         config['steps'][0]['args'] = ['build', '-t', versioned_image, '-f', 'Dockerfile', '.']
         config['images'] = [versioned_image]
         config_file = '{0}-gcb.yml'.format(comp)
@@ -208,10 +207,8 @@ def write_bom(self):
       version_entry = {VERSION: gradle_version}
       if comp == 'spinnaker-monitoring':
         # Add two entries for both components of spinnaker-monitoring
-        third_party = '{0}-third-party'.format(comp)
-        daemon = '{0}-daemon'.format(comp)
-        output_yaml[SERVICES][third_party] = dict(version_entry)
-        output_yaml[SERVICES][daemon] = dict(version_entry)
+        output_yaml[SERVICES]['monitoring-third-party'] = dict(version_entry)
+        output_yaml[SERVICES]['monitoring-daemon'] = dict(version_entry)
       else:
         output_yaml[SERVICES][comp] = version_entry