dapp 0.23.4 → 0.23.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/dapp.rb +1 -0
- data/lib/dapp/kube/dapp/command/deploy.rb +28 -6
- data/lib/dapp/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: d1672f9ce8c2f27ed332a84192f58e5f7bcd0ac4
|
4
|
+
data.tar.gz: 1fca50e98ca0e2ce4b7a92e6d3e550294f2760fe
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 723888bf022b14c57707e0a11f4129a43bb4abe2016eb5a013c296ac2f95d09e068cc8fade9ea221ded9d14b4f1f6d768db2a6d32d6aefbea9cb1288aa761ddd
|
7
|
+
data.tar.gz: e817219bea8f79e6ea181e44e7a38a4940f4d7e28889be4de2bf98be6601b6a7573867360c1005cad4e5f86b146d1da93f70caf8328eaadb61e28a9b6599df3f
|
data/lib/dapp.rb
CHANGED
@@ -18,24 +18,46 @@ module Dapp
|
|
18
18
|
end
|
19
19
|
|
20
20
|
def kube_flush_hooks_jobs(release)
|
21
|
+
all_jobs_names = kube_all_jobs_names
|
22
|
+
|
23
|
+
all_pods_specs = kubernetes.pod_list["items"]
|
24
|
+
.map {|spec| Kubernetes::Client::Resource::Pod.new(spec)}
|
25
|
+
|
21
26
|
release.hooks.values
|
22
27
|
.reject { |job| ['0', 'false'].include? job.annotations["dapp/recreate"].to_s }
|
23
|
-
.select { |job|
|
28
|
+
.select { |job| all_jobs_names.include? job.name }
|
24
29
|
.each do |job|
|
25
30
|
log_process("Delete hooks job `#{job.name}`", short: true) do
|
26
|
-
kube_delete_job!(job.name) unless dry_run?
|
31
|
+
kube_delete_job!(job.name, all_pods_specs) unless dry_run?
|
27
32
|
end
|
28
33
|
end
|
29
34
|
end
|
30
35
|
|
31
|
-
def
|
36
|
+
def kube_all_jobs_names
|
32
37
|
kubernetes.job_list['items'].map { |i| i['metadata']['name'] }
|
33
38
|
end
|
34
39
|
|
35
|
-
def kube_delete_job!(
|
36
|
-
kubernetes.
|
40
|
+
def kube_delete_job!(job_name, all_pods_specs)
|
41
|
+
job_spec = Kubernetes::Client::Resource::Pod.new kubernetes.job(job_name)
|
42
|
+
|
43
|
+
job_pods_specs = all_pods_specs
|
44
|
+
.select do |pod|
|
45
|
+
Array(pod.metadata['ownerReferences']).any? do |owner_reference|
|
46
|
+
owner_reference['uid'] == job_spec.metadata['uid']
|
47
|
+
end
|
48
|
+
end
|
49
|
+
|
50
|
+
job_pods_specs.each do |job_pod_spec|
|
51
|
+
kubernetes.delete_pod!(job_pod_spec.name)
|
52
|
+
end
|
53
|
+
|
54
|
+
# FIXME: https://kubernetes.io/docs/concepts/workloads/controllers/garbage-collection/
|
55
|
+
# FIXME: orphanDependents deprecated, should be propagationPolicy=Orphan. But it does not work.
|
56
|
+
# FIXME: Also, kubectl uses the same: https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/delete.go#L388
|
57
|
+
# FIXME: https://github.com/kubernetes/kubernetes/issues/46659
|
58
|
+
kubernetes.delete_job!(job_name, orphanDependents: false)
|
37
59
|
loop do
|
38
|
-
break unless kubernetes.job?(
|
60
|
+
break unless kubernetes.job?(job_name)
|
39
61
|
sleep 1
|
40
62
|
end
|
41
63
|
end
|
data/lib/dapp/version.rb
CHANGED