fix(kubernetes): adds retry logic to kubernetes image reader (#3612)

spinnaker · May 3, 2017 · 419ec62 · 419ec62
1 parent 0c636da
commit 419ec62
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/app/scripts/modules/kubernetes/image/image.reader.js b/app/scripts/modules/kubernetes/image/image.reader.js
@@ -1,18 +1,16 @@
 'use strict';
 
 import {API_SERVICE} from 'core/api/api.service';
+import {RETRY_SERVICE} from 'core/retry/retry.service';
 
 let angular = require('angular');
 
-module.exports = angular.module('spinnaker.kubernetes.image.reader', [API_SERVICE])
-  .factory('kubernetesImageReader', function ($q, API) {
+module.exports = angular.module('spinnaker.kubernetes.image.reader', [API_SERVICE, RETRY_SERVICE])
+  .factory('kubernetesImageReader', function ($q, API, retryService) {
     function findImages(params) {
-      return API.all('images/find').getList(params).then(function(results) {
-          return results;
-        },
-        function() {
-          return [];
-        });
+      return retryService
+        .buildRetrySequence(() => API.all('images/find').getList(params), results => (results.length > 0), 10, 1000)
+        .catch(() => []);
     }
 
     function getImage(/*amiName, region, account*/) {

diff --git a/app/scripts/modules/kubernetes/serverGroup/configure/configuration.service.js b/app/scripts/modules/kubernetes/serverGroup/configure/configuration.service.js
@@ -157,7 +157,7 @@ module.exports = angular.module('spinnaker.serverGroup.configure.kubernetes.conf
             if (container.imageDescription.registry) {
               return test.imageDescription.imageId === container.imageDescription.imageId;
             } else {
-              return _.last(test.imageDescription.imageId.split('/')) === container.imageDescription.imageId;
+              return _.endsWith(test.imageDescription.imageId, container.imageDescription.imageId);
             }
           });