dapp 0.33.14 → 0.33.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b3ffcc3d20183a2107fe0fd67671abb1f3d3eb7afb3e49424d89bb61a1b884a
-  data.tar.gz: e0ecc216bc77c53c050497f0112fe8114326af08ba87276127ed9e45453ddc7f
+  metadata.gz: 3f290b2992bb6ce30ebe1dab2bb20f7a77e9b155bb897a490884ac084c7e6dd6
+  data.tar.gz: d8135d2fab8e31117f8d903cd6abb0b9e959cd09aaa4c392d227b88ddf2a9968
 SHA512:
-  metadata.gz: 998b5073bad1b5d0145baae6a9d0e33b94580adf113a1f3005acc9ca7006f6687b0672926b89f3b66293ff2ad85cc3a752956de88b650b5e778a12388d7cbdb7
-  data.tar.gz: 542c12362a89b9605507ef71fcf17f59c0615e5f124b2d5b74c47916589e142750b3a48f9d711f524568dfa85870e170f6724d421fe393b75b4aeaa5622172a9
+  metadata.gz: f1487ffe421b4a675cafecb4740e87a49a210305635e363f0bb469c72a1380c3885f09766c32f73f8a46aea98517b84ab163eeb76eb1f6f4d622e23b1b0abe3a
+  data.tar.gz: a5d65a3441da976a57ce662f235fcccbb8d5118d156fcd68665fded42bead6704eb8bb426c00b5381c3d2d486517d5b5b179e619585acfc03e286c0642451533

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.33.14"
+  VERSION = "0.33.15"
   BUILD_CACHE_VERSION = 31
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.33.14
+  version: 0.33.15
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-02 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