ood_core 0.17.1 → 0.17.2
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/.github/dependabot.yml +8 -0
- data/CHANGELOG.md +8 -1
- data/lib/ood_core/job/adapters/kubernetes/helper.rb +5 -5
- data/lib/ood_core/version.rb +1 -1
- metadata +3 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: dca336fb15a08ad68f556b8d33fb76887f5c0370a0eef63685a5770fbf073110
|
|
4
|
+
data.tar.gz: 410b08fee5e739b7444ca3054483a2758d43062af964168b3f32318489d19fa0
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: e82540895495b9f09c92f413f8f39a894fb700122da195cd4224d68eb5eae30845f8692c6d440462bac2c4f45b0a3270e7bf5219ba4adecfc63baa3884b53d28
|
|
7
|
+
data.tar.gz: 39a441ede8e9b91e169b1aff0c1345a56c98aac1f25a1b07d873b20e66833ed46a534b5ef23f392f5d0213b7e5c80e942f62b0031f4fd2065c327116975fdf8b
|
data/CHANGELOG.md
CHANGED
|
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
|
|
|
7
7
|
|
|
8
8
|
## [Unreleased]
|
|
9
9
|
|
|
10
|
+
## [0.17.2] - 7-14-2021
|
|
11
|
+
|
|
12
|
+
### Fixed
|
|
13
|
+
|
|
14
|
+
- Fixed k8s adapter to only show Running pods as running in [300](https://github.com/OSC/ood_core/pull/300).
|
|
15
|
+
|
|
10
16
|
## [0.17.1] - 6-14-2021
|
|
11
17
|
|
|
12
18
|
### Fixed
|
|
@@ -354,7 +360,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
|
|
|
354
360
|
### Added
|
|
355
361
|
- Initial release!
|
|
356
362
|
|
|
357
|
-
[Unreleased]: https://github.com/OSC/ood_core/compare/v0.17.
|
|
363
|
+
[Unreleased]: https://github.com/OSC/ood_core/compare/v0.17.2...HEAD
|
|
364
|
+
[0.17.2]: https://github.com/OSC/ood_core/compare/v0.17.1...v0.17.2
|
|
358
365
|
[0.17.1]: https://github.com/OSC/ood_core/compare/v0.17.0...v0.17.1
|
|
359
366
|
[0.17.0]: https://github.com/OSC/ood_core/compare/v0.16.1...v0.17.0
|
|
360
367
|
[0.16.1]: https://github.com/OSC/ood_core/compare/v0.16.0...v0.16.1
|
|
@@ -150,7 +150,7 @@ class OodCore::Job::Adapters::Kubernetes::Helper
|
|
|
150
150
|
{
|
|
151
151
|
id: json_data.dig(:metadata, :name).to_s,
|
|
152
152
|
job_name: name_from_metadata(json_data.dig(:metadata)),
|
|
153
|
-
status: pod_status_from_json(json_data),
|
|
153
|
+
status: OodCore::Job::Status.new(state: pod_status_from_json(json_data)),
|
|
154
154
|
job_owner: job_owner_from_json(json_data, ns_prefix),
|
|
155
155
|
submission_time: submission_time(json_data),
|
|
156
156
|
dispatch_time: dispatch_time(json_data),
|
|
@@ -263,10 +263,12 @@ class OodCore::Job::Adapters::Kubernetes::Helper
|
|
|
263
263
|
def pod_status_from_json(json_data)
|
|
264
264
|
phase = json_data.dig(:status, :phase)
|
|
265
265
|
conditions = json_data.dig(:status, :conditions)
|
|
266
|
+
container_statuses = json_data.dig(:status, :containerStatuses)
|
|
266
267
|
unschedulable = conditions.to_a.any? { |c| c.dig(:reason) == "Unschedulable" }
|
|
268
|
+
ready = !container_statuses.to_a.empty? && container_statuses.to_a.all? { |s| s.dig(:ready) == true }
|
|
269
|
+
return "running" if ready
|
|
270
|
+
|
|
267
271
|
state = case phase
|
|
268
|
-
when "Running"
|
|
269
|
-
"running"
|
|
270
272
|
when "Pending"
|
|
271
273
|
if unschedulable
|
|
272
274
|
"queued_held"
|
|
@@ -282,8 +284,6 @@ class OodCore::Job::Adapters::Kubernetes::Helper
|
|
|
282
284
|
else
|
|
283
285
|
"undetermined"
|
|
284
286
|
end
|
|
285
|
-
|
|
286
|
-
OodCore::Job::Status.new(state: state)
|
|
287
287
|
end
|
|
288
288
|
|
|
289
289
|
def terminated_state(status)
|
data/lib/ood_core/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: ood_core
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.17.
|
|
4
|
+
version: 0.17.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Eric Franz
|
|
@@ -10,7 +10,7 @@ authors:
|
|
|
10
10
|
autorequire:
|
|
11
11
|
bindir: exe
|
|
12
12
|
cert_chain: []
|
|
13
|
-
date: 2021-
|
|
13
|
+
date: 2021-07-16 00:00:00.000000000 Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: ood_support
|
|
@@ -160,6 +160,7 @@ executables: []
|
|
|
160
160
|
extensions: []
|
|
161
161
|
extra_rdoc_files: []
|
|
162
162
|
files:
|
|
163
|
+
- ".github/dependabot.yml"
|
|
163
164
|
- ".github/workflows/test.yml"
|
|
164
165
|
- ".gitignore"
|
|
165
166
|
- ".rspec"
|