stax-helm 0.0.8 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90efb4bc5fd77b16200e4693747b303df7644ebfe21149d715327a56397f1d25
-  data.tar.gz: 19d2b39ef1cbd165dbd32091f317f8c11b12624d381920bdffd5295b8b8c5b68
+  metadata.gz: 3909b351d090d040c868d10944e88a1701d66bba982d32692a278cd15fe3ebce
+  data.tar.gz: 51bc19ccc238fff367b62128862836088efbdebff095536816f3432f2112a526
 SHA512:
-  metadata.gz: 5566799f8341ace21b46a2ec7c3d90a3c5dc11d26f54c7efa1dc593df439e6dd59732286153823995573a53337252f8249000d54f26dd4813e72ebad23e943ff
-  data.tar.gz: 8d1b6ca7b1e7465cac0f77754438ccff9ad880e12bf7d1eb9b2c58a6f48921bbad3471696ab4cd2e609aeee1cd749c0ce6304c23ad248ece555a2291140c5785
+  metadata.gz: 49dd63da8e6ce484a620c5f71f73929bf0be858cb793e7b7ad6e596e8c102dacce8d0995e086f22e372ab6695ed79a54eedfcb45b38c9a3b604a22f452e829ab
+  data.tar.gz: 433e7b094f0baf03fc2a1690c6da212af9335dbcd8ccccfc31456db5b7c4c519394fe783856cf833f79722984647cd8e666949f47e1bb363e2fa3cf3f97ef001

data/lib/stax/helm/base.rb

@@ -8,7 +8,7 @@ module Stax
 
       ## make string safe to use in naming helm stuff
       def helm_safe(string)
-        string.slice(0, 53).gsub(/[\W_]/, '-').downcase
+        string.slice(0, 53).gsub(/[\W_]/, '-').sub(/-+$/, '').downcase
       end
     end
 

data/lib/stax/helm/cronjobs.rb

@@ -0,0 +1,13 @@
+## tasks to get cronjob details
+module Stax
+  module Helm
+    class Cmd < Base
+
+      desc 'cronjobs', 'list cronjobs'
+      def cronjobs
+        kubectl_run(:get, :cronjobs, '-l', helm_selector)
+      end
+
+    end
+  end
+end

data/lib/stax/helm/jobs.rb

@@ -0,0 +1,13 @@
+## tasks to get job details
+module Stax
+  module Helm
+    class Cmd < Base
+
+      desc 'jobs', 'list jobs'
+      def jobs
+        kubectl_run(:get, :jobs, '-l', helm_selector)
+      end
+
+    end
+  end
+end

data/lib/stax/helm/runcmd.rb

@@ -5,8 +5,8 @@ module Stax
     class Cmd
 
       no_commands do
-        ## construct a Job template from passed container spec
-        def helm_run_template(name, container_spec)
+        ## construct a Job template
+        def helm_run_template(name)
           {
             apiVersion: 'batch/v1',
             kind: :Job,
@@ -19,12 +19,11 @@ module Stax
             spec: {
               template: {
                 spec: {
-                  restartPolicy: :Never,
-                  containers: [ container_spec ],
+                  restartPolicy: :Never
                 }
               }
             }
-          }.to_json
+          }
         end
 
         ## Deployment to clone for container
@@ -55,30 +54,43 @@ module Stax
       desc 'runcmd [CMD]', 'run dedicated interactive container'
       method_option :sleep, type: :string,  default: '1h',  description: 'kill container after time'
       method_option :keep,  type: :boolean, default: false, description: 'do not delete job'
+      method_option :ttl,   type: :numeric, default: 30,    description: 'secs to keep job after pod terminates'
       def runcmd(*cmd)
         ## use default if not set
         cmd = Array(helm_run_cmd) if cmd.empty?
 
-        ## name of k8s Job to create
+        ## name of k8s Job to create, and basic template
         job = helm_run_job
+        template = helm_run_template(job)
 
         ## get deployment and extract container spec
         deployment = kubectl_json(:get, :deployment, helm_run_deployment)
-        spec = deployment['spec']['template']['spec']['containers'].find do |c|
+        spec = deployment.dig('spec', 'template', 'spec', 'containers').find do |c|
           c['name'] == helm_run_container
         end
 
         ## cleanup the container spec so we can use it in a Job
         spec.delete('livenessProbe')
         spec.delete('readinessProbe')
+        spec.delete('startupProbe')
         spec.delete('volumeMounts')
         spec['name'] = 'run'
         spec['args'] = ['sleep', options[:sleep]]
 
+        ## add container to Job template
+        template[:spec][:template][:spec][:containers] = [ spec ]
+
+        ## add ttl to Job so it will be cleaned up after Pod terminates
+        template[:spec][:ttlSecondsAfterFinished] = options[:ttl]
+
+        ## get service account and add to template
+        service_account = deployment.dig('spec', 'template', 'spec', 'serviceAccountName')
+        template[:spec][:template][:spec][:serviceAccountName] = service_account if service_account
+
         ## create new unique Job based on the container spec
         debug("Creating job #{job}")
         Open3.popen2('kubectl create -f -') { |stdin, stdout, _|
-          stdin.print(helm_run_template(job, spec))
+          stdin.print(template.to_json)
           stdin.close
           puts stdout.gets
         }

data/lib/stax/helm/version.rb

@@ -1,5 +1,5 @@
 module Stax
   module Helm
-    VERSION = '0.0.8'
+    VERSION = '0.0.12'
   end
 end

data/lib/stax/helm.rb

@@ -4,6 +4,8 @@ require 'stax/helm/kubectl'
 require 'stax/helm/ingress'
 require 'stax/helm/pod'
 require 'stax/helm/deployment'
+require 'stax/helm/jobs'
+require 'stax/helm/cronjobs'
 require 'stax/helm/stern'
 require 'stax/helm/runcmd'
 Stax.add_command(:helm, Stax::Helm::Cmd)

data/stax-helm.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.14'
+  spec.add_development_dependency 'bundler', '~> 2'
   spec.add_development_dependency 'rake', '>= 12.3.3'
 
   spec.add_dependency('stax')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stax-helm
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.12
 platform: ruby
 authors:
 - Richard Lister
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-03 00:00:00.000000000 Z
+date: 2021-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -69,8 +69,10 @@ files:
 - lib/stax/helm.rb
 - lib/stax/helm/base.rb
 - lib/stax/helm/cmd.rb
+- lib/stax/helm/cronjobs.rb
 - lib/stax/helm/deployment.rb
 - lib/stax/helm/ingress.rb
+- lib/stax/helm/jobs.rb
 - lib/stax/helm/kubectl.rb
 - lib/stax/helm/pod.rb
 - lib/stax/helm/runcmd.rb
@@ -96,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Control helm charts with stax.