ood_core 0.17.5 → 0.17.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88f0fb9eed8a53308dd19e73929e3c7af71ad1295738d69e0bf34d551a2ef0b3
-  data.tar.gz: 6437344171900c7b289ee3cf658550f050f95435e46b75eb1e34891e6ec9af08
+  metadata.gz: c5611442cd9ae16b3716ae1b7acc1188868590447745ef8cebd74a009eebf34b
+  data.tar.gz: 07226bc4c9dcdf6bd82a8adce1b738adbb9730ec4a64cdbed2313f8a7724c0c2
 SHA512:
-  metadata.gz: b6aa7f5b93547e1c167870146f76766c70f2d26b19c706fd757880b70973281466674c5791bf62eafd5297b6733f20dc8e37128b4715374d764eb6c85d2b2919
-  data.tar.gz: 3930e176306b5354d2f451d744c89be9f61a714c31e8a0e4dcf6fc680ad7e70af6eb8769675157c7f7d247258f33d705bd146ac50e22553f8e064898b2ebebe6
+  metadata.gz: 6ba4ced751b6ee01c55ef9a2ceb9efeafe317b6f5b2a351ba231a23a4a1999ff00c62a9ba595e83b1101216fdd89f2d9b18c6d34ed7684af05a75fef87d673d5
+  data.tar.gz: 3ff4e64fac908455303e2df27d1a1825f1ebbf234caa0d8eb1be6a5a5b0b89122d6fb2c4490139c49b4022b088e85ddeb73104ef6b1b6be1e66771f1921aeb11

data/CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.17.6] - 8-24-2021
+
+### Added
+
+- kubernetes now allows for arbitrary labels to be set in [317](https://github.com/OSC/ood_core/pull/317).
+- kubernetes now allows for limits and requests to be different in [318](https://github.com/OSC/ood_core/pull/318).
+
 ## [0.17.5] - 8-20-2021
 
 ### Fixed
@@ -380,7 +387,8 @@ Functionally the same as [0.17.3] but with some CI updates.
 ### Added
 - Initial release!
 
-[Unreleased]: https://github.com/OSC/ood_core/compare/v0.17.5...HEAD
+[Unreleased]: https://github.com/OSC/ood_core/compare/v0.17.6...HEAD
+[0.17.6]: https://github.com/OSC/ood_core/compare/v0.17.5...v0.17.6
 [0.17.5]: https://github.com/OSC/ood_core/compare/v0.17.4...v0.17.5
 [0.17.4]: https://github.com/OSC/ood_core/compare/v0.17.3...v0.17.4
 [0.17.3]: https://github.com/OSC/ood_core/compare/v0.17.2...v0.17.3

data/lib/ood_core/job/adapters/kubernetes/helper.rb

@@ -49,14 +49,17 @@ class OodCore::Job::Adapters::Kubernetes::Helper
       command: parse_command(container[:command]),
       port: container[:port],
       env: default_env.merge(env),
-      memory: container[:memory],
-      cpu: container[:cpu],
+      memory_limit: container[:memory_limit] || container[:memory],
+      memory_request: container[:memory_request] || container[:memory],
+      cpu_limit: container[:cpu_limit] || container[:cpu],
+      cpu_request: container[:cpu_request] || container[:cpu],
       working_dir: container[:working_dir],
       restart_policy: container[:restart_policy],
       image_pull_policy: container[:image_pull_policy],
       image_pull_secret: container[:image_pull_secret],
       supplemental_groups: container[:supplemental_groups],
       startup_probe: container[:startup_probe],
+      labels: container[:labels],
     )
   end
 

data/lib/ood_core/job/adapters/kubernetes/resources.rb

@@ -55,14 +55,16 @@ module OodCore::Job::Adapters::Kubernetes::Resources
   end
 
   class Container
-    attr_accessor :name, :image, :command, :port, :env, :memory, :cpu, :working_dir,
+    attr_accessor :name, :image, :command, :port, :env, :working_dir,
+                  :memory_limit, :memory_request, :cpu_limit, :cpu_request, 
                   :restart_policy, :image_pull_policy, :image_pull_secret, :supplemental_groups,
-                  :startup_probe
+                  :startup_probe, :labels
 
     def initialize(
-        name, image, command: [], port: nil, env: {}, memory: "4Gi", cpu: "1",
+        name, image, command: [], port: nil, env: {},
+        memory_limit: nil, memory_request: nil, cpu_limit: nil, cpu_request: nil,
         working_dir: "", restart_policy: "Never", image_pull_policy: nil, image_pull_secret: nil, supplemental_groups: [],
-        startup_probe: {}
+        startup_probe: {}, labels: {}
       )
       raise ArgumentError, "containers need valid names and images" unless name && image
 
@@ -71,14 +73,17 @@ module OodCore::Job::Adapters::Kubernetes::Resources
       @command = command.nil? ? [] : command
       @port = port&.to_i
       @env = env.nil? ? {} : env
-      @memory = memory.nil? ? "4Gi" : memory
-      @cpu = cpu.nil? ? "1" : cpu
+      @memory_limit = memory_limit.nil? ? "4Gi" : memory_limit
+      @memory_request = memory_request.nil? ? "4Gi" : memory_request
+      @cpu_limit = cpu_limit.nil? ? "1" : cpu_limit
+      @cpu_request = cpu_request.nil? ? "1" : cpu_request
       @working_dir = working_dir.nil? ? "" : working_dir
       @restart_policy = restart_policy.nil? ? "Never" : restart_policy
       @image_pull_policy = image_pull_policy.nil? ? "IfNotPresent" : image_pull_policy
       @image_pull_secret = image_pull_secret
       @supplemental_groups = supplemental_groups.nil? ? [] : supplemental_groups
       @startup_probe = TCPProbe.new(@port, startup_probe)
+      @labels = labels.nil? ? {} : labels
     end
 
     def ==(other)
@@ -87,14 +92,17 @@ module OodCore::Job::Adapters::Kubernetes::Resources
         command == other.command &&
         port == other.port &&
         env == other.env &&
-        memory == other.memory &&
-        cpu == other.cpu &&
+        memory_limit == other.memory_limit &&
+        memory_request == other.memory_request &&
+        cpu_limit == other.cpu_limit &&
+        cpu_request == other.cpu_request &&
         working_dir == other.working_dir &&
         restart_policy == other.restart_policy &&
         image_pull_policy == other.image_pull_policy &&
         image_pull_secret == other.image_pull_secret &&
         supplemental_groups == other.supplemental_groups &&
-        startup_probe.to_h == other.startup_probe.to_h
+        startup_probe.to_h == other.startup_probe.to_h &&
+        labels.to_h == other.labels.to_h
     end
   end
 

data/lib/ood_core/job/adapters/kubernetes/templates/pod.yml.erb

@@ -10,6 +10,9 @@ metadata:
     <%- if !script.accounting_id.nil? && script.accounting_id != "" -%>
     account: <%= script.accounting_id %>
     <%- end -%>
+    <%- spec.container.labels.each_pair do |key, value| -%>
+    <%= key %>: "<%= value %>"
+    <%- end -%>
   annotations:
     <%- unless script.wall_time.nil? -%>
     pod.kubernetes.io/lifetime: <%= helper.seconds_to_duration(script.wall_time) %>
@@ -88,14 +91,14 @@ spec:
     <%- end # configmap mounts? and all_mounts not empty -%>
     resources:
       limits:
-        memory: "<%= spec.container.memory %>"
-        cpu: "<%= spec.container.cpu %>"
+        memory: "<%= spec.container.memory_limit %>"
+        cpu: "<%= spec.container.cpu_limit %>"
         <%- unless script.gpus_per_node.nil? -%>
         <%= gpu_type %>: <%= script.gpus_per_node %>
         <%- end -%>
       requests:
-        memory: "<%= spec.container.memory %>"
-        cpu: "<%= spec.container.cpu %>"
+        memory: "<%= spec.container.memory_request %>"
+        cpu: "<%= spec.container.cpu_request %>"
         <%- unless script.gpus_per_node.nil? -%>
         <%= gpu_type %>: <%= script.gpus_per_node %>
         <%- end -%>

data/lib/ood_core/version.rb

@@ -1,4 +1,4 @@
 module OodCore
   # The current version of {OodCore}
-  VERSION = "0.17.5"
+  VERSION = "0.17.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ood_core
 version: !ruby/object:Gem::Version
-  version: 0.17.5
+  version: 0.17.6
 platform: ruby
 authors:
 - Eric Franz
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-20 00:00:00.000000000 Z
+date: 2021-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ood_support