ood_core 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52ba764b085dedb7eaeb06d95751f1804a50488e1859f980a7836d2d9032b95d
-  data.tar.gz: c2dc5edf395fe158960f33b80c554f3dc745f15e7ec1337b738683a0e1bbdc7f
+  metadata.gz: 766b778b98f189dee73ff1cb70a2b0acf53d628a897288260a1b8cf7cb80c0c6
+  data.tar.gz: 03052a68c57de5fe76b795dfd76b66639520d3e9b055c324fbece05db71dd331
 SHA512:
-  metadata.gz: 59915bae23a008a923c249d222e50548a7bee3438144068a29ae1cafdd489ca1229ee1a14f4f81e3fd065381f46f920bef24344fe633c7c578cb1f6a4f9a2a77
-  data.tar.gz: 8d2ca42c7f49158c8d321c21b79aff1c636df3c77bb7e71107db70371a34058d79c8a5ec32ca93883e7d3bcc7dc2202375144d23613f167ab089318d6270248c
+  metadata.gz: c678069d0a37762a706a020c5a7ad7a7354ed3f1edb01fdd25b915065b50754d43c60df48c9ea3b773f3dc4ddb4e12604e9dda02a1ad30b0482e7ab050804181
+  data.tar.gz: 8416227140b6d761f6246f0cce50e41f4462f83b1913ad9e72b511685412810b7b2c7c9951f8c712b127572b421e8a57cd6cdb4dedb7cab9c242eba0d057ad45

data/.github/workflows/test.yml

@@ -0,0 +1,30 @@
+name: Unit Tests
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: checkout
+        uses: actions/checkout@v2
+
+      - name: Setup Ruby using Bundler
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "2.7.1"
+          bundler-cache: true
+          bundler: "2.1.4"
+
+      - name: install gems
+        run: bundle install
+
+      - name: test
+        run: bundle exec rake spec

data/CHANGELOG.md

@@ -6,6 +6,24 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [0.15.0] - 2021-01-26
+### Fixed
+- ccq adapter now accepts job names with spaces in [210](https://github.com/OSC/ood_core/pull/209)
+- k8s correctly handles having no mount volumes in [239](https://github.com/OSC/ood_core/pull/239)
+
+### Added
+- k8s adapter now applies account metadata to resources in [216](https://github.com/OSC/ood_core/pull/216) and
+  [231](https://github.com/OSC/ood_core/pull/231)
+- k8s adapter can now prefix namespaces in [218](https://github.com/OSC/ood_core/pull/218)
+- k8s adapter now applies time limits to pods in [224](https://github.com/OSC/ood_core/pull/224)
+
+### Changed
+- testing automation is now done in github actions in [221](https://github.com/OSC/ood_core/pull/218)
+- update bunlder to 2.1.4 and ruby to 2.7 in [235](https://github.com/OSC/ood_core/pull/218) updated bundler and ruby
+- k8s adapter more appropriately labels unschedulable pods as queued in [230](https://github.com/OSC/ood_core/pull/230)
+- k8s adapter now uses the script#ood_connection_info API instead of script#native in
+  [222](https://github.com/OSC/ood_core/pull/222)
+
 ## [0.14.0] - 2020-10-01
 ### Added 
 - Kubernetes adapter in PR [156](https://github.com/OSC/ood_core/pull/156)
@@ -255,7 +273,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Initial release!
 
-[Unreleased]: https://github.com/OSC/ood_core/compare/v0.14.0...HEAD
+[Unreleased]: https://github.com/OSC/ood_core/compare/v0.15.0...HEAD
+[0.15.0]: https://github.com/OSC/ood_core/compare/v0.14.0...v0.15.0
 [0.14.0]: https://github.com/OSC/ood_core/compare/v0.13.0...v0.14.0
 [0.13.0]: https://github.com/OSC/ood_core/compare/v0.12.0...v0.13.0
 [0.12.0]: https://github.com/OSC/ood_core/compare/v0.11.4...v0.12.0

data/README.md

@@ -1,6 +1,6 @@
 # OodCore
 
-[![Build Status](https://travis-ci.org/OSC/ood_core.svg?branch=master)](https://travis-ci.org/OSC/ood_core)
+[![Build Status](https://github.com/osc/ood_core/workflows/Unit%20Tests/badge.svg)](https://github.com/OSC/ood_core/actions?query=workflow%3A%22Unit+Tests%22)
 ![GitHub Release](https://img.shields.io/github/release/osc/ood_core.svg)
 ![GitHub License](https://img.shields.io/github/license/osc/ood_core.svg)
 

data/lib/ood_core/job/adapters/ccq.rb

@@ -203,6 +203,10 @@ module OodCore
           'ccq_ood_script_'
         end
 
+        def ccqstat_regex
+          /^(?<id>\S+)\s+(?<name>.+)\s+(?<username>\S+)\s+(?<scheduler>\S+)\s+(?<status>\S+)\s*$/
+        end
+
         def parse_job_id_from_ccqsub(output)
           match_data = /#{jobid_regex}/.match(output)
           # match_data could be nil, OR re-configured jobid_regex could be looking for a different named group
@@ -236,28 +240,31 @@ module OodCore
         def info_from_ccqstat(data)
           infos = []
 
-          data.to_s.each_line do |line|
-            words = line.split(/\s/).reject(&:empty?)
-            next if !words.empty? && words[0] == "Id" # just skip the header
-
-            infos << Info.new(line_to_hash(words)) if words.size == 5
+          data.to_s.lines.drop(1).each do |line|
+            match_data = ccqstat_regex.match(line)
+            infos << Info.new(ccqstat_match_to_hash(match_data)) if valid_ccqstat_match?(match_data)
           end
 
           infos
         end
 
-        def line_to_hash(words)
-          return unless words.size == 5
-
+        def ccqstat_match_to_hash(match)
           data_hash = {}
-          data_hash[:id] = words[0]
-          data_hash[:job_name] = words[1]
-          data_hash[:job_owner] = words[2]
-          data_hash[:status] = get_state(words[4])
+          data_hash[:id] = match.named_captures.fetch('id', nil)
+          data_hash[:job_owner] = match.named_captures.fetch('username', nil)
+          data_hash[:status] = get_state(match.named_captures.fetch('status', nil))
+
+          # The regex leaves trailing empty spaces. There's no way to tell if they're _actually_
+          # a part of the job name or not, so we assume they're not and add the rstrip.
+          data_hash[:job_name] = match.named_captures.fetch('name', nil).to_s.rstrip
 
           data_hash
         end
 
+        def valid_ccqstat_match?(match)
+          !match.nil? && !match.named_captures.fetch('id', nil).nil?
+        end
+
         def get_state(state)
           STATE_MAP.fetch(state, :undetermined)
         end

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

@@ -7,7 +7,7 @@ module OodCore
       using Refinements::HashExtensions
 
       def self.build_kubernetes(config)
-        batch = Adapters::Kubernetes::Batch.new(config.to_h.symbolize_keys, Adapters::Kubernetes::Helper.new)
+        batch = Adapters::Kubernetes::Batch.new(config.to_h.symbolize_keys)
         Adapters::Kubernetes.new(batch)
       end
     end

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

@@ -3,31 +3,31 @@ require "json"
 
 class OodCore::Job::Adapters::Kubernetes::Batch
 
-  require "ood_core/job/adapters/kubernetes/helper"
-
-  Helper = OodCore::Job::Adapters::Kubernetes::Helper
-  Resources = OodCore::Job::Adapters::Kubernetes::Resources
+  require_relative "helper"
+  require_relative "k8s_job_info"
 
   using OodCore::Refinements::HashExtensions
 
   class Error < StandardError; end
+  class NotFoundError < StandardError; end
 
-  attr_reader :config_file, :bin, :cluster_name, :mounts
+  attr_reader :config_file, :bin, :cluster, :mounts
   attr_reader :all_namespaces, :using_context, :helper
-  attr_reader :username_prefix
+  attr_reader :username_prefix, :namespace_prefix
 
-  def initialize(options = {}, helper = Helper.new)
+  def initialize(options = {})
     options = options.to_h.symbolize_keys
 
     @config_file = options.fetch(:config_file, default_config_file)
     @bin = options.fetch(:bin, '/usr/bin/kubectl')
-    @cluster_name = options.fetch(:cluster_name, 'open-ondemand')
+    @cluster = options.fetch(:cluster, 'open-ondemand')
     @mounts = options.fetch(:mounts, []).map { |m| m.to_h.symbolize_keys }
     @all_namespaces = options.fetch(:all_namespaces, false)
     @username_prefix = options.fetch(:username_prefix, nil)
+    @namespace_prefix = options.fetch(:namespace_prefix, '')
 
     @using_context = false
-    @helper = helper
+    @helper = Helper.new
 
     begin
       make_kubectl_config(options)
@@ -44,7 +44,7 @@ class OodCore::Job::Adapters::Kubernetes::Batch
   def submit(script, after: [], afterok: [], afternotok: [], afterany: [])
     raise ArgumentError, 'Must specify the script' if script.nil?
 
-    resource_yml, id = generate_id_yml(script.native)
+    resource_yml, id = generate_id_yml(script)
     call("#{formatted_ns_cmd} create -f -", stdin: resource_yml)
 
     id
@@ -92,16 +92,11 @@ class OodCore::Job::Adapters::Kubernetes::Batch
   end
 
   def info(id)
-    pod_json = call_json_output('get', 'pod', id)
+    pod_json = safe_call('get', 'pod', id)
+    return OodCore::Job::Info.new({ id: id, status: 'completed' }) if pod_json.empty?
 
-    begin
-      service_json = call_json_output('get', 'service', service_name(id))
-      secret_json = call_json_output('get', 'secret', secret_name(id))
-    rescue
-      # it's ok if these don't exist
-      service_json ||= nil
-      secret_json ||= nil
-    end
+    service_json = safe_call('get', 'service', service_name(id))
+    secret_json = safe_call('get', 'secret', secret_name(id))
 
     helper.info_from_json(pod_json: pod_json, service_json: service_json, secret_json: secret_json)
   end
@@ -111,16 +106,10 @@ class OodCore::Job::Adapters::Kubernetes::Batch
   end
 
   def delete(id)
-    call("#{namespaced_cmd} delete pod #{id}")
-
-    begin
-      call("#{namespaced_cmd} delete service #{service_name(id)}")
-      call("#{namespaced_cmd} delete secret #{secret_name(id)}")
-      call("#{namespaced_cmd} delete configmap #{configmap_name(id)}")
-    rescue
-      # FIXME: retries? delete if exists?
-      # just eat the results of deleting services and secrets
-    end
+    safe_call("delete", "pod", id)
+    safe_call("delete", "service", service_name(id))
+    safe_call("delete", "secret", secret_name(id))
+    safe_call("delete", "configmap", configmap_name(id))
   end
 
   def configmap_mount_path
@@ -129,6 +118,19 @@ class OodCore::Job::Adapters::Kubernetes::Batch
 
   private
 
+  def safe_call(verb, resource, id)
+    begin
+      case verb.to_s
+      when "get"
+        call_json_output('get', resource, id)
+      when "delete"
+        call("#{namespaced_cmd} delete #{resource} #{id}")
+      end
+    rescue NotFoundError
+      {}
+    end
+  end
+
   # helper to help format multi-line yaml data from the submit.yml into 
   # mutli-line yaml in the pod.yml.erb
   def config_data_lines(data)
@@ -165,15 +167,16 @@ class OodCore::Job::Adapters::Kubernetes::Batch
 
   # helper to template resource yml you're going to submit and
   # create an id.
-  def generate_id_yml(native_data)
+  def generate_id_yml(script)
+    native_data = script.native
     container = helper.container_from_native(native_data[:container])
     id = generate_id(container.name)
     configmap = helper.configmap_from_native(native_data, id)
     init_containers = helper.init_ctrs_from_native(native_data[:init_containers])
-    spec = Resources::PodSpec.new(container, init_containers: init_containers)
+    spec = Kubernetes::Resources::PodSpec.new(container, init_containers: init_containers)
     all_mounts = native_data[:mounts].nil? ? mounts : mounts + native_data[:mounts]
 
-    template = ERB.new(File.read(resource_file))
+    template = ERB.new(File.read(resource_file), nil, '-')
 
     [template.result(binding), id]
   end
@@ -204,15 +207,11 @@ class OodCore::Job::Adapters::Kubernetes::Batch
   end
 
   def namespace
-    default_namespace
-  end
-
-  def default_namespace
-    username
+    "#{namespace_prefix}#{username}"
   end
 
   def context
-    cluster_name
+    cluster
   end
 
   def default_config_file
@@ -264,7 +263,7 @@ class OodCore::Job::Adapters::Kubernetes::Batch
 
   def pod_info_from_json(pod)
     hash = helper.pod_info_from_json(pod)
-    OodCore::Job::Info.new(hash)
+    K8sJobInfo.new(hash)
   rescue Helper::K8sDataError
     # FIXME: silently eating error, could probably use a logger
     nil
@@ -318,14 +317,14 @@ class OodCore::Job::Adapters::Kubernetes::Batch
     locale = "--region=#{region}" unless region.nil?
 
     # gke cluster name can probably can differ from what ood calls the cluster
-    cmd = "gcloud container clusters get-credentials #{locale} #{cluster_name}"
+    cmd = "gcloud container clusters get-credentials #{locale} #{cluster}"
     env = { 'KUBECONFIG' => config_file }
     call(cmd, env)
   end
 
   def set_context
-    cmd = "#{base_cmd} config set-context #{cluster_name}"
-    cmd << " --cluster=#{cluster_name} --namespace=#{namespace}"
+    cmd = "#{base_cmd} config set-context #{cluster}"
+    cmd << " --cluster=#{cluster} --namespace=#{namespace}"
     cmd << " --user=#{k8s_username}"
 
     call(cmd)
@@ -336,7 +335,7 @@ class OodCore::Job::Adapters::Kubernetes::Batch
     server = config.fetch(:endpoint)
     cert = config.fetch(:cert_authority_file, nil)
 
-    cmd = "#{base_cmd} config set-cluster #{cluster_name}"
+    cmd = "#{base_cmd} config set-cluster #{cluster}"
     cmd << " --server=#{server}"
     cmd << " --certificate-authority=#{cert}" unless cert.nil?
 
@@ -344,7 +343,12 @@ class OodCore::Job::Adapters::Kubernetes::Batch
   end
 
   def call(cmd = '', env: {}, stdin: nil)
-    o, error, s = Open3.capture3(env, cmd, stdin_data: stdin.to_s)
-    s.success? ? o : raise(Error, error)
+    o, e, s = Open3.capture3(env, cmd, stdin_data: stdin.to_s)
+    s.success? ? o : interpret_and_raise(e)
+  end
+
+  def interpret_and_raise(stderr)
+    raise NotFoundError, stderr if /^Error from server \(NotFound\):/.match(stderr)
+    raise(Error, stderr)
   end
 end

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

@@ -1,18 +1,17 @@
 class OodCore::Job::Adapters::Kubernetes::Helper
 
-  require 'ood_core/job/adapters/kubernetes/resources'
+  require_relative 'resources'
+  require_relative 'k8s_job_info'
   require 'resolv'
   require 'base64'
+  require 'active_support/core_ext/hash'
 
   class K8sDataError < StandardError; end
 
-  Resources = OodCore::Job::Adapters::Kubernetes::Resources
-
   # Extract info from json data. The data is expected to be from the kubectl
   # command and conform to kubernetes' datatype structures.
   #
-  # Returns { native: {host: localhost, port:80, password: sshhh }} in the info
-  # object field in lieu of writing a connection.yml
+  # Returns K8sJobInfo in the in lieu of writing a connection.yml
   #
   # @param pod_json [#to_h]
   #   the pod data returned from 'kubectl get pod abc-123'
@@ -20,16 +19,17 @@ class OodCore::Job::Adapters::Kubernetes::Helper
   #   the service data returned from 'kubectl get service abc-123-service'
   # @param secret_json [#to_h]
   #   the secret data returned from 'kubectl get secret abc-123-secret'
-  # @return [OodCore::Job::Info]
-  def info_from_json(pod_json: nil, service_json: nil, secret_json: nil)
-    pod_hash = pod_info_from_json(pod_json)
+  # @param ns_prefix [#to_s]
+  #   the namespace prefix so that namespaces can be converted back to usernames
+  # @return [OodCore::Job::Adapters::Kubernetes::K8sJobInfo]
+  def info_from_json(pod_json: nil, service_json: nil, secret_json: nil, ns_prefix: nil)
+    pod_hash = pod_info_from_json(pod_json, ns_prefix: ns_prefix)
     service_hash = service_info_from_json(service_json)
     secret_hash = secret_info_from_json(secret_json)
 
-    # can't just use deep_merge bc we don't depend *directly* on rails
-    pod_hash[:native] = pod_hash[:native].merge(service_hash[:native])
-    pod_hash[:native] = pod_hash[:native].merge(secret_hash[:native])
-    OodCore::Job::Info.new(pod_hash)
+    pod_hash.deep_merge!(service_hash)
+    pod_hash.deep_merge!(secret_hash)
+    K8sJobInfo.new(pod_hash)
   rescue NoMethodError
     raise K8sDataError, "unable to read data correctly from json"
   end
@@ -40,7 +40,7 @@ class OodCore::Job::Adapters::Kubernetes::Helper
   #   the input container hash
   # @return  [OodCore::Job::Adapters::Kubernetes::Resources::Container]
   def container_from_native(container)
-    Resources::Container.new(
+    Kubernetes::Resources::Container.new(
       container[:name],
       container[:image],
       command: parse_command(container[:command]),
@@ -81,7 +81,7 @@ class OodCore::Job::Adapters::Kubernetes::Helper
     configmap = native.fetch(:configmap, nil)
     return nil if configmap.nil?
 
-    Resources::ConfigMap.new(
+    Kubernetes::Resources::ConfigMap.new(
       configmap_name(id),
       configmap[:filename],
       configmap[:data]
@@ -118,25 +118,29 @@ class OodCore::Job::Adapters::Kubernetes::Helper
     id + '-configmap'
   end
 
+  def seconds_to_duration(s)
+    "%02dh%02dm%02ds" % [s / 3600, s / 60 % 60, s % 60]
+  end
+
   # Extract pod info from json data. The data is expected to be from the kubectl
   # command and conform to kubernetes' datatype structures.
   #
   # @param json_data [#to_h]
   #   the pod data returned from 'kubectl get pod abc-123'
+  # @param ns_prefix [#to_s]
+  #   the namespace prefix so that namespaces can be converted back to usernames
   # @return [#to_h]
   #   the hash of info expected from adapters
-  def pod_info_from_json(json_data)
+  def pod_info_from_json(json_data, ns_prefix: nil)
     {
       id: json_data.dig(:metadata, :name).to_s,
       job_name: name_from_metadata(json_data.dig(:metadata)),
       status: pod_status_from_json(json_data),
-      job_owner: json_data.dig(:metadata, :namespace).to_s,
+      job_owner: job_owner_from_json(json_data, ns_prefix),
       submission_time: submission_time(json_data),
       dispatch_time: dispatch_time(json_data),
       wallclock_time: wallclock_time(json_data),
-      native: {
-        host: get_host(json_data.dig(:status, :hostIP))
-      },
+      ood_connection_info: { host: get_host(json_data.dig(:status, :hostIP)) },
       procs: procs_from_json(json_data)
     }
   rescue NoMethodError
@@ -162,39 +166,24 @@ class OodCore::Job::Adapters::Kubernetes::Helper
   def service_info_from_json(json_data)
     # all we need is the port - .spec.ports[0].nodePort
     ports = json_data.dig(:spec, :ports)
-    {
-      native:
-        {
-          port: ports[0].dig(:nodePort)
-        }
-    }
+    { ood_connection_info: { port: ports[0].dig(:nodePort) } }
   rescue
-    empty_native
+    {}
   end
 
   def secret_info_from_json(json_data)
     raw = json_data.dig(:data, :password)
-    {
-      native:
-        {
-          password: Base64.decode64(raw)
-        }
-    }
+    { ood_connection_info: { password: Base64.decode64(raw) } }
   rescue
-    empty_native
-  end
-
-  def empty_native
-    {
-      native: {}
-    }
+    {}
   end
 
   def dispatch_time(json_data)
     status = pod_status_from_json(json_data)
-    return nil if status == 'undetermined'
+    container_statuses = json_data.dig(:status, :containerStatuses)
+    return nil if container_statuses.nil?
 
-    state_data = json_data.dig(:status, :containerStatuses)[0].dig(:state)
+    state_data = container_statuses[0].dig(:state)
     date_string = nil
 
     if status == 'completed'
@@ -208,9 +197,10 @@ class OodCore::Job::Adapters::Kubernetes::Helper
 
   def wallclock_time(json_data)
     status = pod_status_from_json(json_data)
-    return nil if status == 'undetermined'
+    container_statuses = json_data.dig(:status, :containerStatuses)
+    return nil if container_statuses.nil?
 
-    state_data = json_data.dig(:status, :containerStatuses)[0].dig(:state)
+    state_data = container_statuses[0].dig(:state)
     start_time = dispatch_time(json_data)
     return nil if start_time.nil?
 
@@ -250,20 +240,21 @@ class OodCore::Job::Adapters::Kubernetes::Helper
   end
 
   def pod_status_from_json(json_data)
-    state = 'undetermined'
-    status = json_data.dig(:status)
-    container_statuses = status.dig(:containerStatuses)
-
-    if container_statuses.nil?
-      # if you're here, it means you're pending, probably unschedulable
-      return OodCore::Job::Status.new(state: state)
-    end
-
-    # only support 1 container/pod
-    json_state = container_statuses[0].dig(:state)
-    state = 'running' unless json_state.dig(:running).nil?
-    state = terminated_state(json_state) unless json_state.dig(:terminated).nil?
-    state = 'queued' unless json_state.dig(:waiting).nil?
+    phase = json_data.dig(:status, :phase)
+    state = case phase
+            when "Running"
+              "running"
+            when "Pending"
+              "queued"
+            when "Failed"
+              "suspended"
+            when "Succeeded"
+              "completed"
+            when "Unknown"
+              "undetermined"
+            else
+              "undetermined"
+            end
 
     OodCore::Job::Status.new(state: state)
   end
@@ -295,4 +286,9 @@ class OodCore::Job::Adapters::Kubernetes::Helper
       cpu
     end
   end
-end
+
+  def job_owner_from_json(json_data = {}, ns_prefix = nil)
+    namespace = json_data.dig(:metadata, :namespace).to_s
+    namespace.delete_prefix(ns_prefix.to_s)
+  end
+end

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

@@ -0,0 +1,9 @@
+# An object that describes a submitted kubernetes job with extended information
+class OodCore::Job::Adapters::Kubernetes::K8sJobInfo < OodCore::Job::Info
+  attr_reader :ood_connection_info
+
+  def initialize(ood_connection_info: {}, **options)
+    super(options)
+    @ood_connection_info = ood_connection_info
+  end
+end

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

@@ -7,6 +7,13 @@ metadata:
     job: <%= id %>
     app.kubernetes.io/name: <%= container.name %>
     app.kubernetes.io/managed-by: open-ondemand
+    <%- if !script.accounting_id.nil? && script.accounting_id != "" -%>
+    account: <%= script.accounting_id %>
+    <%- end -%>
+  annotations:
+    <%- unless script.wall_time.nil? -%>
+    pod.kubernetes.io/lifetime: <%= helper.seconds_to_duration(script.wall_time) %>
+    <%- end -%>
 spec:
   restartPolicy: <%= spec.container.restart_policy %>
   securityContext:
@@ -17,35 +24,35 @@ spec:
   - name: "<%= spec.container.name %>"
     image: <%= spec.container.image %>
     imagePullPolicy: IfNotPresent
-    <% unless spec.container.working_dir.empty? %>
+    <%- unless spec.container.working_dir.empty? -%>
     workingDir: "<%= spec.container.working_dir %>"
-    <% end %>
-    <% unless spec.container.env.empty? %>
+    <%- end -%>
+    <%- unless spec.container.env.empty? -%>
     env:
-    <% spec.container.env.each do |env| %>
+    <%- spec.container.env.each do |env| -%>
     - name: <%= env[:name] %>
       value: "<%= env[:value] %>"
-    <% end %> <%# for each env %>
-    <% end %> <%# unless env is nil %>
-    <% unless spec.container.command.empty? %>
+    <%- end # for each env -%>
+    <%- end # unless env is nil -%>
+    <%- unless spec.container.command.empty? -%>
     command:
-    <% spec.container.command.each do |cmd| %>
+    <%- spec.container.command.each do |cmd| -%>
     - "<%= cmd %>"
-    <% end %> <%# for each command %>
-    <% end %> <%# unless command is nil %>
-    <% unless spec.container.port.nil? %>
+    <%- end # for each command -%>
+    <%- end # unless command is nil -%>
+    <%- unless spec.container.port.nil? -%>
     ports:
     - containerPort: <%= spec.container.port %>
-    <% end %> 
+    <%- end -%>
     volumeMounts:
-    <% unless configmap.nil? %>
+    <%- unless configmap.nil? -%>
     - name: configmap-volume
       mountPath:  <%= configmap_mount_path %>
-    <% end %>
-    <% all_mounts.each do |mount| %>
+    <%- end -%>
+    <%- all_mounts.each do |mount| -%>
     - name: <%= mount[:name] %>
       mountPath: <%= mount[:destination_path] %>
-    <% end %> <%# for each mount %>
+    <%- end # for each mount -%>
     resources:
       limits:
         memory: "<%= spec.container.memory %>"
@@ -53,54 +60,56 @@ spec:
       requests:
         memory: "<%= spec.container.memory %>"
         cpu: "<%= spec.container.cpu %>"
-  <% unless spec.init_containers.nil? %>
+  <%- unless spec.init_containers.nil? -%>
   initContainers:
-  <% spec.init_containers.each do |ctr| %>
+  <%- spec.init_containers.each do |ctr| -%>
   - name: "<%= ctr.name %>"
     image: "<%= ctr.image %>"
     command:
-    <% ctr.command.each do |cmd| %>
+    <%- ctr.command.each do |cmd| -%>
     - "<%= cmd %>"
-    <% end %> <%# command loop  %>
+    <%- end # command loop -%>
     volumeMounts:
-    <% unless configmap.nil? %>
+    <%- unless configmap.nil? -%>
     - name: configmap-volume
       mountPath:  <%= configmap_mount_path %>
-    <% end %>
-    <% all_mounts.each do |mount| %>
+    <%- end -%>
+    <%- all_mounts.each do |mount| -%>
     - name: <%= mount[:name] %>
       mountPath: <%= mount[:destination_path] %>
-    <% end %> <%# for each mount %>
-  <% end %> <%# init container loop  %>
-  <% end %> <%# if init containers  %>
-  <% unless configmap.nil? || all_mounts.empty? %>
+    <%- end # for each mount -%>
+  <%- end # init container loop -%>
+  <%- end # if init containers -%>
+  <%- unless (configmap.to_s.empty? && all_mounts.empty?) -%>
   volumes:
-  <% end %> <%# configmap.nil? || all_mounts.empty? %>
-  <% unless configmap.nil? %>
+  <%- unless configmap.to_s.empty? -%>
   - name: configmap-volume
     configMap:
       name: <%= configmap_name(id) %>
-  <% end %>
-  <% all_mounts.each do |mount| %>
-  <% if mount[:type] == 'nfs' %>
+  <%- end -%>
+  <%- all_mounts.each do |mount| -%>
+  <%- if mount[:type] == 'nfs' -%>
   - name: <%= mount[:name] %>
     nfs:
       server: <%= mount[:host] %>
       path: <%= mount[:path] %>
-  <% elsif mount[:type] == 'host' %>
+  <%- elsif mount[:type] == 'host' -%>
   - name: <%= mount[:name] %>
     hostPath:
       path: <%= mount[:path] %>
       type: <%= mount[:host_type] %>
-  <% end %> <%# if mount is [host,nfs] %>
-  <% end %> <%# for each mount %>
+  <%- end # if mount is [host,nfs] -%>
+  <%- end # for each mount -%>
+  <%- end # (configmap.to_s.empty? || all_mounts.empty?) -%>
 ---
-<% unless spec.container.port.nil? %>
+<%- unless spec.container.port.nil? -%>
 apiVersion: v1
 kind: Service
 metadata:
   name: <%= service_name(id) %>
   namespace: <%= namespace %>
+  labels:
+    job: <%= id %>
 spec:
   selector:
     job: <%= id %>
@@ -109,15 +118,17 @@ spec:
     port: 80
     targetPort: <%= spec.container.port %>
   type: NodePort
-<% end %> <%# end for service %>
+<%- end # end for service -%>
 ---
-<% unless configmap.nil? %>
+<%- unless configmap.nil? -%>
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: <%= configmap_name(id) %>
   namespace: <%= namespace %>
+  labels:
+    job: <%= id %>
 data:
   <%= configmap.filename %>: |
     <% config_data_lines(configmap.data).each do |line| %><%= line %><% end %>
-<% end %> <%# end for configmap %>
+<%- end # end for configmap -%>

data/lib/ood_core/version.rb

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

data/ood_core.gemspec

@@ -24,7 +24,8 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "ood_support", "~> 0.0.2"
   spec.add_runtime_dependency "ffi", "~> 1.9", ">= 1.9.6"
-  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "bundler", "~> 2.1"
+  spec.add_runtime_dependency "activesupport", ">= 5.2", "< 6.0"
   spec.add_development_dependency "rake", "~> 13.0.1"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry", "~> 0.10"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ood_core
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Eric Franz
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-01 00:00:00.000000000 Z
+date: 2021-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ood_support
@@ -52,14 +52,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -140,9 +160,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -169,6 +189,7 @@ files:
 - lib/ood_core/job/adapters/kubernetes.rb
 - lib/ood_core/job/adapters/kubernetes/batch.rb
 - lib/ood_core/job/adapters/kubernetes/helper.rb
+- lib/ood_core/job/adapters/kubernetes/k8s_job_info.rb
 - lib/ood_core/job/adapters/kubernetes/resources.rb
 - lib/ood_core/job/adapters/kubernetes/templates/pod.yml.erb
 - lib/ood_core/job/adapters/linux_host.rb
@@ -221,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Open OnDemand core library

data/.travis.yml

@@ -1,9 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.5.5
-before_install: gem install bundler -v '~> 1.17'
-notifications:
-  email:
-    on_success: never
-    on_failure: always