ood_core 0.17.2 → 0.17.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dca336fb15a08ad68f556b8d33fb76887f5c0370a0eef63685a5770fbf073110
-  data.tar.gz: 410b08fee5e739b7444ca3054483a2758d43062af964168b3f32318489d19fa0
+  metadata.gz: 4c94c6fbf110564ec2cff9d885d2799566a70e1e98759f44fec00fde6eb0cdec
+  data.tar.gz: 7ed0326c52582dbd8b15a272706e8aa58e36a2be0555a78c65037bb74517d0a6
 SHA512:
-  metadata.gz: e82540895495b9f09c92f413f8f39a894fb700122da195cd4224d68eb5eae30845f8692c6d440462bac2c4f45b0a3270e7bf5219ba4adecfc63baa3884b53d28
-  data.tar.gz: 39a441ede8e9b91e169b1aff0c1345a56c98aac1f25a1b07d873b20e66833ed46a534b5ef23f392f5d0213b7e5c80e942f62b0031f4fd2065c327116975fdf8b
+  metadata.gz: b6af308bf4acb767e6c3128ce753714ebcee4f33a17b5114a1196d73ec7df63be5d5007ad985c752329463e2533ed1bbfa8951426a2a035ef08ce9b3704b5984
+  data.tar.gz: 76b07812da52479c3d5c834c51dcb6c5af328721436474197a77bd0423f5061361d333d233c235da7a699e31ac772104eb65902e74ee25afb4640c6e5adc4add

data/CHANGELOG.md

@@ -7,6 +7,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.17.4] - 7-29-2021
+
+Functionally the same as [0.17.3] but with some CI updates.
+
+## [0.17.3] - 7-29-2021
+
+### Fixed
+
+- Fixed handling of pods in a startup phase in [303](https://github.com/OSC/ood_core/pull/303).
+
+### Added
+
+- Enable automatic population of supplemental groups in [305](https://github.com/OSC/ood_core/pull/305).
+
 ## [0.17.2] - 7-14-2021
 
 ### Fixed
@@ -360,7 +374,9 @@ 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.17.2...HEAD
+[Unreleased]: https://github.com/OSC/ood_core/compare/v0.17.4...HEAD
+[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
 [0.17.2]: https://github.com/OSC/ood_core/compare/v0.17.1...v0.17.2
 [0.17.1]: https://github.com/OSC/ood_core/compare/v0.17.0...v0.17.1
 [0.17.0]: https://github.com/OSC/ood_core/compare/v0.16.1...v0.17.0

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

@@ -14,6 +14,7 @@ class OodCore::Job::Adapters::Kubernetes::Batch
   attr_reader :config_file, :bin, :cluster, :mounts
   attr_reader :all_namespaces, :using_context, :helper
   attr_reader :username_prefix, :namespace_prefix
+  attr_reader :auto_supplemental_groups
 
   def initialize(options = {})
     options = options.to_h.symbolize_keys
@@ -25,6 +26,7 @@ class OodCore::Job::Adapters::Kubernetes::Batch
     @all_namespaces = options.fetch(:all_namespaces, false)
     @username_prefix = options.fetch(:username_prefix, '')
     @namespace_prefix = options.fetch(:namespace_prefix, '')
+    @auto_supplemental_groups = options.fetch(:auto_supplemental_groups, false)
 
     @using_context = false
     @helper = OodCore::Job::Adapters::Kubernetes::Helper.new
@@ -176,6 +178,19 @@ class OodCore::Job::Adapters::Kubernetes::Batch
     Etc.getgrgid(run_as_group).name
   end
 
+  def default_supplemental_groups
+    OodSupport::User.new.groups.sort_by(&:id).map(&:id).reject { |id| id < 1000 }
+  end
+
+  def supplemental_groups(groups = [])
+    sgroups = []
+    if auto_supplemental_groups
+      sgroups.concat(default_supplemental_groups)
+    end
+    sgroups.concat(groups.to_a)
+    sgroups.uniq.sort
+  end
+
   def default_env
     {
       USER: username,
@@ -191,6 +206,7 @@ class OodCore::Job::Adapters::Kubernetes::Batch
   # create an id.
   def generate_id_yml(script)
     native_data = script.native
+    native_data[:container][:supplemental_groups] = supplemental_groups(native_data[:container][:supplemental_groups])
     container = helper.container_from_native(native_data[:container], default_env)
     id = generate_id(container.name)
     configmap = helper.configmap_from_native(native_data, id, script.content)

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

@@ -55,6 +55,7 @@ class OodCore::Job::Adapters::Kubernetes::Helper
       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],
     )
   end
@@ -266,7 +267,9 @@ class OodCore::Job::Adapters::Kubernetes::Helper
     container_statuses = json_data.dig(:status, :containerStatuses)
     unschedulable = conditions.to_a.any? { |c| c.dig(:reason) == "Unschedulable" }
     ready = !container_statuses.to_a.empty? && container_statuses.to_a.all? { |s| s.dig(:ready) == true }
+    started = !container_statuses.to_a.empty? && container_statuses.to_a.any? { |s| s.fetch(:state, {}).key?(:running) }
     return "running" if ready
+    return "queued" if phase == "Running" && started
 
     state = case phase
             when "Pending"

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

@@ -20,14 +20,7 @@ spec:
     runAsUser: <%= run_as_user %>
     runAsGroup: <%= run_as_group %>
     runAsNonRoot: true
-    <%- if spec.container.supplemental_groups.empty? -%>
-    supplementalGroups: []
-    <%- else -%>
-    supplementalGroups:
-    <%- spec.container.supplemental_groups.each do |supplemental_group| -%>
-    - "<%= supplemental_group %>"
-    <%- end -%>
-    <%- end -%>
+    supplementalGroups: <%= spec.container.supplemental_groups %>
     fsGroup: <%= fs_group %>
   hostNetwork: false
   hostIPC: false

data/lib/ood_core/version.rb

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

data/ood_core.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
+    f.match(%r{^(test|spec|features|.github)/})
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ood_core
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.17.4
 platform: ruby
 authors:
 - Eric Franz
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-16 00:00:00.000000000 Z
+date: 2021-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ood_support
@@ -160,8 +160,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/dependabot.yml"
-- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - CHANGELOG.md

data/.github/dependabot.yml

@@ -1,8 +0,0 @@
-version: 2
-updates:
-- package-ecosystem: bundler
-  directory: "/"
-  schedule:
-    interval: daily
-    time: "03:30"
-  open-pull-requests-limit: 10

data/.github/workflows/test.yml

@@ -1,30 +0,0 @@
-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