dapp 0.35.43 → 0.35.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a5ddc9fb88e7e0a57c6c72af2ac06256d957010054db2c6a9946e0bd6370e8e
-  data.tar.gz: 63740e105c70bb0e11fd0790a249e3f1bcb511bea16fa3acfa45260e98b70329
+  metadata.gz: 99b222c87131f22b52c73a39dd0d70fc2ae726738037ff9a0261820ad3c38712
+  data.tar.gz: 48780641e9255822e3c524c60953c16b97517787b0c7989ef108ab59d44a2ba0
 SHA512:
-  metadata.gz: c97fc980df42476346bec2f7cb700e6f7276b8e2f3cac21b7653415ed3813f6a65b3e63949b9a07ebf2784aaf29e23acad7041c370375414acea4c203f9e57be
-  data.tar.gz: 1afcb6c3f29fdb6c7c13e2a14ec414096f9aa0e4a8974c2de3f22e89ad640a0db6ec943729adf224f4fc9eb92a5b0f766fffa55e976cb90579c7c02da8f46646
+  metadata.gz: 18f48701ebb7a647d643baf6579d36940149518fab7c056153e8283febd513fb650a977988fedd12020b949eff0063f074427fc021a37705df49a5d87e8fc946
+  data.tar.gz: c2ed1618a395fba88cb769e2f97474aac96655b85b6e93685e578f67b682d32fce5d4f8f471949b76ccd3674fe16db048f395da13b63ac60abda9288ac144f83

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

@@ -74,59 +74,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.35.43"
+  VERSION = "0.35.44"
   BUILD_CACHE_VERSION = 33
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.35.43
+  version: 0.35.44
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-04 00:00:00.000000000 Z
+date: 2019-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -742,7 +742,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