stax-helm 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90efb4bc5fd77b16200e4693747b303df7644ebfe21149d715327a56397f1d25
-  data.tar.gz: 19d2b39ef1cbd165dbd32091f317f8c11b12624d381920bdffd5295b8b8c5b68
+  metadata.gz: 53e53de7fb96d2b35470594bbb80e1de7bcbcf41aad867d6d20217db8bc20aef
+  data.tar.gz: 99f8d5f4a0964e66303803885d4f065d0979606f33cceed2afc7b5e82869f650
 SHA512:
-  metadata.gz: 5566799f8341ace21b46a2ec7c3d90a3c5dc11d26f54c7efa1dc593df439e6dd59732286153823995573a53337252f8249000d54f26dd4813e72ebad23e943ff
-  data.tar.gz: 8d1b6ca7b1e7465cac0f77754438ccff9ad880e12bf7d1eb9b2c58a6f48921bbad3471696ab4cd2e609aeee1cd749c0ce6304c23ad248ece555a2291140c5785
+  metadata.gz: 5cf3d1c0a868fdb26deb92346704bb3dacf507f28c3b70761b6525d3ecca93891fa0e1276533cfd3096913a1944d418469de7b7dbcf2383417803cc11fd7396c
+  data.tar.gz: d581092b08654b29454a72ab0c1ff198d47caa0aa1663baa17123898bc0cd738d01994cb4f7f9daf20cd19542124f3e8d630d55188f2bacc632339b889c556b4

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/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
@@ -59,12 +58,13 @@ module Stax
         ## 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
 
@@ -75,10 +75,17 @@ module Stax
         spec['name'] = 'run'
         spec['args'] = ['sleep', options[:sleep]]
 
+        ## add container to Job template
+        template[:spec][:template][:spec][:containers] = [ spec ]
+
+        ## 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.9'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stax-helm
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Richard Lister
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-03 00:00:00.000000000 Z
+date: 2020-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -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