dapp 0.30.8 → 0.30.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2516a75d4f8a58101009d26d6a7b1526fc6781922d17e780d9522a0c47472648
-  data.tar.gz: be39799ce50347f59aa7bfe6737b8a01ccc074ae0c6bed61c638b74ab1f2ee3a
+  metadata.gz: b7d8d5655f96b83f1c72d7295dbe45bbf6ca740aa56952cac758f448732ed9bb
+  data.tar.gz: d8260992885dc604ff06671b5858a6abb7132a4c82449043fff4f8949fb228a5
 SHA512:
-  metadata.gz: aa056b818a6413520a99749d9a6e8a98c9cd46b004dfc74e56ee19d0af5f20080b21e84541340599aac5291e78aed01fc27b40ab81c021892db59f11fb1243fe
-  data.tar.gz: 74969729bea3665b355c89046391fc6329bf81a4b98b9346780f8d09d18d1beee850227fdb6a8d37506a50249fc016a7eaa43e30a6b220f691e538466eaca571
+  metadata.gz: 43e531034f25aa6f968180a5becf7b684c84039f70e6a237b04914863f6d498cb07c45182abf7354d5d705bdef073bcd36bc746a49762211cc2fa0755efb7f17
+  data.tar.gz: 593d56d59b4ff0d59621bac06d87c2438b8e876ea85e6b36194b90f7bb0e77c80774faa8424d6a0d38606f8aaa842fe8f3068bae8b6289ef296e9a47d70e6c59

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.30.8"
+  VERSION = "0.30.9"
   BUILD_CACHE_VERSION = 30
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.30.8
+  version: 0.30.9
 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