dapp 0.32.8 → 0.32.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d1b5d0ebdabe6d51b8df5119eacf92d563a1d0d7dd6448e02478be668737a40
-  data.tar.gz: 6a0e31582b9c58048fd4e42705a6fa2cca486734793d44de0370f31eb0ed8c12
+  metadata.gz: 84bcab09003b5bcb58dec3ff3c2f9e3c3f5f966f5a4cd0f7f45445002272dea0
+  data.tar.gz: 527b07b2fbd2cd2806f5cff2df657f2e2b2f1e628c346bd32c6f4501360375b1
 SHA512:
-  metadata.gz: 78424178f65f10b738dfe9c4ff5c6049d3fcb08268f2597d12547bcf2dc67cb2f02901d8d563e132ecdef8b80924bba42a17419404019ea7c77cff1b467d6c6d
-  data.tar.gz: 4cf3f50a9120eb284746e279927bec7ef1931cf1cb70116b84c02b6937c37f7b5e108e9fce39d6af319c8f44ec6f73379cd9a3aad548d6dca1f18cf4ac8743f0
+  metadata.gz: a4e134481c0ded1e4f4ff83014184893766647f727f5ff6364b3ecd299ba4e4092964cd32b6f2b18f96501507a534b7c24ac955f3c903003dc95024831a9644f
+  data.tar.gz: 2a0afc03f24a5d010f527711903db5d2114ac3aa223a7f5c9c9c13a27056d2b261191b71ce3d73e0674e7f4d7b9144d7f43305530aff6972a43a29cbb431d2fe

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

metadata

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