dapp 0.31.26 → 0.31.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef15c48d2795a83b0b878c80984ecf8f5721280d693846c679ce869abbf2cc67
-  data.tar.gz: 1d70cb5181e56734836fff4768f46296532a01b0a9d4d94f195cd2ea7f4493b4
+  metadata.gz: ea5c15c538c43c16c1306e655925b8a1cbad8e04ab8299c0d3e0c937c01c0647
+  data.tar.gz: 63a67727234720904f5c06553133d5702784200eb71718d1ee0f94d05e2bf223
 SHA512:
-  metadata.gz: 510903517d7a58b8db21bb3fda45ed07ee03bb3ba436a07f90722ec753227a4eb2728506e3d681e1257d1f1453c0da93b8e2ba6dba314875b93224703550402a
-  data.tar.gz: 30fab8b9eac2e8f6b23d621926c6cdc80cee41e9026fd8123bcae11e027f0c4ca728ff545fc4972ac53c8eb32d94daec74fd2fb698d8dab4f3ff88aa8209dd74
+  metadata.gz: 04da5f96559c9e5d1bbe0838ba26b6a13359b24d0430f6ad7b358095188fe1d2f54572f9a12de19743b327be0abbdcd4c362614a7c93a2766bd7c79055f35a67
+  data.tar.gz: d3f90e3c71910c4872952ca6382fb4bb4f3529409fbbe8bd6b977ccc74b2f778f18993a89142e89cddb51646c150be6df34d028bbd569ea584fbcd79f1dc1f22

data/lib/dapp/dimg/dapp/command/cleanup_repo.rb

@@ -180,59 +180,65 @@ module Dapp
           # pod items[] spec containers[] image
           def pod_images(client)
             client.pod_list['items'].map do |item|
-              item['spec']['containers'].map{ |cont| cont['image'] }
+              images_from_pod_spec(item)
             end
           end
 
           # cronjob items[] spec jobTemplate spec template spec containers[] image
           def cronjob_images(client)
             client.cronjob_list['items'].map do |item|
-              item['spec']['jobTemplate']['spec']['template']['spec']['containers'].map{ |cont| cont['image'] }
+              images_from_pod_spec(item['spec']['jobTemplate']['spec']['template'])
             end
           end
 
           # daemonsets   items[] spec template spec containers[] image
           def daemonset_images(client)
             client.daemonset_list['items'].map do |item|
-              item['spec']['template']['spec']['containers'].map{ |cont| cont['image'] }
+              images_from_pod_spec(item['spec']['template'])
             end
           end
 
           # deployment   items[] spec template spec containers[] image
           def deployment_images(client)
             client.deployment_list['items'].map do |item|
-              item['spec']['template']['spec']['containers'].map{ |cont| cont['image'] }
+              images_from_pod_spec(item['spec']['template'])
             end
           end
 
           # job          items[] spec template spec containers[] image
           def job_images(client)
             client.job_list['items'].map do |item|
-              item['spec']['template']['spec']['containers'].map{ |cont| cont['image'] }
+              images_from_pod_spec(item['spec']['template'])
             end
           end
 
           # replicasets  items[] spec template spec containers[] image
           def replicaset_images(client)
             client.replicaset_list['items'].map do |item|
-              item['spec']['template']['spec']['containers'].map{ |cont| cont['image'] }
+              images_from_pod_spec(item['spec']['template'])
             end
           end
 
            # replicasets  items[] spec template spec containers[] image
            def statefulset_images(client)
             client.statefulset_list['items'].map do |item|
-              item['spec']['template']['spec']['containers'].map{ |cont| cont['image'] }
+              images_from_pod_spec(item['spec']['template'])
             end
           end
 
           # replicationcontroller    items[] spec template spec containers[] image
           def replicationcontroller_images(client)
             client.replicationcontroller_list['items'].map do |item|
-              item['spec']['template']['spec']['containers'].map{ |cont| cont['image'] }
+              images_from_pod_spec(item['spec']['template'])
             end
           end
 
+          def images_from_pod_spec(pod_spec)
+            containers = Array(pod_spec['spec']['containers'])
+            initContainers = Array(pod_spec['spec']['initContainers'])
+            (containers + initContainers).map { |cont| cont['image'] }
+          end
+
           def without_kube?
             !!options[:without_kube]
           end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.31.26"
+  VERSION = "0.31.27"
   BUILD_CACHE_VERSION = 31
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.31.26
+  version: 0.31.27
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-31 00:00:00.000000000 Z
+date: 2019-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout