dapp 0.23.4 → 0.23.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10aba50841edaf51a638a9c6343f4aadaacfd131
-  data.tar.gz: d711f069cc88acae89e5f95566e769d06c99e137
+  metadata.gz: d1672f9ce8c2f27ed332a84192f58e5f7bcd0ac4
+  data.tar.gz: 1fca50e98ca0e2ce4b7a92e6d3e550294f2760fe
 SHA512:
-  metadata.gz: d18bd976c005d9123e1d4c45a809319b2ebe427d23062324e5c9e171d06a45934b1ce0477e4c1da6af96ca0addec1bf9a07805c35651d4fe23b14753ffff733e
-  data.tar.gz: e0a31de68d9c6f569a16029774d9c4a96e9ce245cde1d469d9124cf71790fe757d4263ac95465b737999e05bf92da4578fe3af6ff81d793ce8156b4af53ea8da
+  metadata.gz: 723888bf022b14c57707e0a11f4129a43bb4abe2016eb5a013c296ac2f95d09e068cc8fade9ea221ded9d14b4f1f6d768db2a6d32d6aefbea9cb1288aa761ddd
+  data.tar.gz: e817219bea8f79e6ea181e44e7a38a4940f4d7e28889be4de2bf98be6601b6a7573867360c1005cad4e5f86b146d1da93f70caf8328eaadb61e28a9b6599df3f

data/lib/dapp.rb

@@ -25,6 +25,7 @@ require 'etc'
 require 'zlib'
 require 'slugify'
 require 'base64'
+require 'io/console'
 
 require 'dapp/version'
 require 'dapp/core_ext/hash'

data/lib/dapp/kube/dapp/command/deploy.rb

@@ -18,24 +18,46 @@ module Dapp
           end
 
           def kube_flush_hooks_jobs(release)
+            all_jobs_names = kube_all_jobs_names
+
+            all_pods_specs = kubernetes.pod_list["items"]
+              .map {|spec| Kubernetes::Client::Resource::Pod.new(spec)}
+
             release.hooks.values
               .reject { |job| ['0', 'false'].include? job.annotations["dapp/recreate"].to_s }
-              .select { |job| kube_job_list.include? job.name }
+              .select { |job| all_jobs_names.include? job.name }
               .each do |job|
                 log_process("Delete hooks job `#{job.name}`", short: true) do
-                  kube_delete_job!(job.name) unless dry_run?
+                  kube_delete_job!(job.name, all_pods_specs) unless dry_run?
                 end
               end
           end
 
-          def kube_job_list
+          def kube_all_jobs_names
             kubernetes.job_list['items'].map { |i| i['metadata']['name'] }
           end
 
-          def kube_delete_job!(name)
-            kubernetes.delete_job!(name)
+          def kube_delete_job!(job_name, all_pods_specs)
+            job_spec = Kubernetes::Client::Resource::Pod.new kubernetes.job(job_name)
+
+            job_pods_specs = all_pods_specs
+              .select do |pod|
+                Array(pod.metadata['ownerReferences']).any? do |owner_reference|
+                  owner_reference['uid'] == job_spec.metadata['uid']
+                end
+              end
+
+            job_pods_specs.each do |job_pod_spec|
+              kubernetes.delete_pod!(job_pod_spec.name)
+            end
+
+            # FIXME: https://kubernetes.io/docs/concepts/workloads/controllers/garbage-collection/
+            # FIXME: orphanDependents deprecated, should be propagationPolicy=Orphan. But it does not work.
+            # FIXME: Also, kubectl uses the same: https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/delete.go#L388
+            # FIXME: https://github.com/kubernetes/kubernetes/issues/46659
+            kubernetes.delete_job!(job_name, orphanDependents: false)
             loop do
-              break unless kubernetes.job?(name)
+              break unless kubernetes.job?(job_name)
               sleep 1
             end
           end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.23.4'.freeze
+  VERSION = "0.23.5"
   BUILD_CACHE_VERSION = 26
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.23.4
+  version: 0.23.5
 platform: ruby
 authors:
 - Dmitry Stolyarov