fix(kubernetes): allow container to be copied if image does not have …

…registry (#3602)
spinnaker · May 1, 2017 · f50a70a · f50a70a
1 parent b650f35
commit f50a70a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/app/scripts/modules/kubernetes/cluster/configure/CommandBuilder.js b/app/scripts/modules/kubernetes/cluster/configure/CommandBuilder.js
@@ -144,7 +144,11 @@ module.exports = angular.module('spinnaker.kubernetes.clusterCommandBuilder.serv
       } else if (image.fromTrigger && !image.tag) {
         return `${image.registry}/${image.repository} (Tag resolved at runtime)`;
       } else {
-        return `${image.registry}/${image.repository}:${image.tag}`;
+        if (image.registry) {
+          return `${image.registry}/${image.repository}:${image.tag}`;
+        } else {
+          return `${image.repository}:${image.tag}`;
+        }
       }
     }
 

diff --git a/app/scripts/modules/kubernetes/serverGroup/configure/configuration.service.js b/app/scripts/modules/kubernetes/serverGroup/configure/configuration.service.js
@@ -150,13 +150,23 @@ module.exports = angular.module('spinnaker.serverGroup.configure.kubernetes.conf
       command.backingData.filtered.containers = _.map(command.backingData.filtered.images, mapImageToContainer(command));
       var validContainers = [];
       command.containers.forEach(function(container) {
-        if (container.imageDescription.fromContext
-            || container.imageDescription.fromTrigger
-            || _.find(command.backingData.filtered.containers, { imageDescription: { imageId: container.imageDescription.imageId } })) {
+        if (container.imageDescription.fromContext || container.imageDescription.fromTrigger) {
           validContainers.push(container);
         } else {
-          result.dirty.containers = result.dirty.containers || [];
-          result.dirty.containers.push(container.image);
+          let matchingContainers = command.backingData.filtered.containers.filter(test => {
+            if (container.imageDescription.registry) {
+              return test.imageDescription.imageId === container.imageDescription.imageId;
+            } else {
+              return _.last(test.imageDescription.imageId.split('/')) === container.imageDescription.imageId;
+            }
+          });
+
+          if (matchingContainers.length === 1) {
+            validContainers.push(matchingContainers[0]);
+          } else {
+            result.dirty.containers = result.dirty.containers || [];
+            result.dirty.containers.push(container.image);
+          }
         }
       });
       command.containers = validContainers;