dapp 0.34.5 → 0.34.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e158ef5aa79fdd0d80e63c3a67ff04752a5e95970811f8339d5ce0ebf08a3dbf
-  data.tar.gz: 0313d8a67f96d00189fe9cb91fcfc66fd3574f8d8cfe2018e076fde9d9c3bb1d
+  metadata.gz: 6d3f60d37c909d4cd6fac3b062529c7a895af7c59134cb049bf724d8d8df359b
+  data.tar.gz: 0b3beb8905b7d355386a69208ba35698047c4a3a8cfbad1d84f849122b4f832f
 SHA512:
-  metadata.gz: 58fb54abf5ecc6ad133a58efc887512de42208c292acfb1132cfe38faab8fe1d63560c4022cdca4d09b48e499deac2f910b26a521e95046dc2612fb370c58fe8
-  data.tar.gz: f34d57aca9c58a300e1130ff9ac4b39ba3f4e834720c2f0d7fc4e62530d343fff9902d9c9af5b003853c7785c7bb247898cbef72e42c1d3fa60ca8020f2ff3d9
+  metadata.gz: e9393fd477193b3de67c08b4f12d3c5265e1679c18e066d8c01dd756f17965b043651ab725535574c905491d5c3ca7dcd25fd8dbb90923e386863167f0195aaf
+  data.tar.gz: 3feec06d7c74e3f947559d2daa55e3614f8af060c41d53b442919d21b4532b55daac58ee42d7dcffb9b6554d9193bf952b129d3265a304db562e025264c7b904

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

@@ -225,59 +225,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.34.5"
+  VERSION = "0.34.6"
   BUILD_CACHE_VERSION = 31
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.34.5
+  version: 0.34.6
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-16 00:00:00.000000000 Z
+date: 2019-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -744,7 +744,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Build docker packaged apps using chef or shell