pfab 0.38.0 → 0.39.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f97f4b3507d44fbd80c2e918993f9ef147977ccf00ff136d17b682ed8b1d25c
-  data.tar.gz: 664d287826bb2b8fa896b4741621b0eaa10ad9d3cd3753447db7770e4a4e103e
+  metadata.gz: f561887ca5e83e755c6841adc9bd5f7bb665c7fc983f694fae7a0721a6f31803
+  data.tar.gz: ec200b656730a992810235c3ef54fc586f7cfbd55af8779eb43bb71a65da30e7
 SHA512:
-  metadata.gz: 40a58495cae3d2f458391962a402200ed486f3e00234dd1e54111d6b3d430bbc72b2059b5d920329b07c59afa7c6c6188ba2b28a0c76b308a6a68369912fe5d5
-  data.tar.gz: 3c9595f4ac5d3b11cd389dea2439a6b6c131414ee1e2e2f2beaf720367c9121e72de5560a87d3f7f6d81397895a4fc3727522de665b8eca0bf4327d5b3fd611c
+  metadata.gz: aa72a372ca6dbd79130a87a6aeac08211b79f8d97500ed9e854e1affdb219d495e9cf58338de835a9bebd23a7c56099c5871e16e9b2daa2887f66c92785bc98a
+  data.tar.gz: a6f890f67571a0bbc93c1160f1ff7adebb566f3554f945eb4a6a28b9a8db016eab4f5ef2bf84a2650bea6cd0404ea6ef85e33e5a39ad3fbbc358a8b0274b5c39

data/Gemfile.lock

@@ -53,7 +53,8 @@ GEM
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
-    git (1.11.0)
+    git (1.18.0)
+      addressable (~> 2.8)
       rchardet (~> 1.8)
     github_api (0.19.0)
       addressable (~> 2.4)

data/README.markdown

@@ -124,5 +124,5 @@ Releasing
 Copyright
 ---------
 
-Copyright (c) 2018 Jeff Dwyer. See
+Copyright (c) 2023 Prefab Inc. See
 LICENSE.txt for further details.

data/lib/pfab/cli.rb

@@ -88,7 +88,7 @@ module Pfab
 
           first_pod = get_first_pod(app_name)
 
-          puts_and_system("kubectl logs -f #{first_pod}")
+          kubectl("logs -f #{first_pod}")
         end
       end
 
@@ -100,7 +100,7 @@ module Pfab
           set_kube_context
           app_name = get_app_name
 
-          puts_and_system "kubectl rollout restart deployment.apps/#{app_name}"
+          kubectl "rollout restart deployment.apps/#{app_name}"
         end
       end
 
@@ -117,7 +117,7 @@ module Pfab
           set_kube_context
           app_name = get_app_name
           first_pod = get_first_pod app_name
-          puts_and_system "kubectl exec -it #{first_pod} -- #{options.command || '/bin/sh'}"
+          kubectl "exec -it #{first_pod} -- #{options.command || '/bin/sh'}"
         end
       end
 
@@ -142,11 +142,11 @@ module Pfab
           selector = "application=#{@application_yaml['name']}"
 
           if options.watch
-            puts_and_system "kubectl get pods -l #{selector} -w"
+            kubectl "get pods -l #{selector} -w"
           elsif $verbose
-            puts_and_system "kubectl describe pods -l #{selector}"
+            kubectl "describe pods -l #{selector}"
           else
-            puts_and_system "kubectl get ingresses,jobs,services,cronjobs,deployments,pods -l #{selector}"
+            kubectl "get ingresses,jobs,services,cronjobs,deployments,pods -l #{selector}"
           end
         end
       end
@@ -185,9 +185,9 @@ module Pfab
           puts "THIS APPLIES TO THE ENTIRE NAMESPACE"
           types = %w(Failed Pending Succeeded)
           types.each do |type|
-            system("kubectl get pods --field-selector status.phase=#{type}")
+            kubectl("get pods --field-selector status.phase=#{type}")
             if agree("Delete those?")
-              `kubectl delete pods --field-selector status.phase=#{type}`
+              kubectl("delete pods --field-selector status.phase=#{type}")
               puts "Deleted"
             end
           end
@@ -206,9 +206,9 @@ module Pfab
         app = deployables[app_name]
         if app[:deployable_type] == "cron"
           deployed_name = deployed_name(app)
-          puts_and_system("kubectl delete cronjob -l deployed-name=#{deployed_name}")
+          kubectl("delete cronjob -l deployed-name=#{deployed_name}")
         end
-        puts_and_system("kubectl apply -f .application-k8s-#{$env}-#{app_name}.yaml")
+        kubectl("apply -f .application-k8s-#{$env}-#{app_name}.yaml")
         puts_and_system("git tag release-#{$env}-#{app_name}-#{Time.now.strftime("%Y-%m-%d-%H-%M-%S")} HEAD")
         puts_and_system("git push origin --tags")
       end
@@ -324,6 +324,10 @@ module Pfab
       @_config ||= YAML.load(File.read(File.join(Dir.home, ".pfab.yaml")))
     end
 
+    def kubectl cmd
+      puts_and_system "kubectl #{cmd} --namespace=#{yy.namespace}"
+    end
+
     def puts_and_system cmd
       puts cmd
       if $dryrun
@@ -369,8 +373,7 @@ module Pfab
     end
 
     def get_pods(app)
-      get_pods_str = "kubectl get pods -o json -l deployed-name=#{app}"
-      puts get_pods_str
+      kubectl "get pods -o json -l deployed-name=#{app}"
       pods_str = `#{get_pods_str}`
       JSON.parse(pods_str)
     end

data/lib/pfab/templates/base.rb

@@ -17,12 +17,16 @@ module Pfab
         app_vars.dig(@data["env"], key) || app_vars[key]
       end
 
-      def get_top_level(key)
-        @data["application_yaml"].dig(@data["env"], key) || @data["application_yaml"][key]
+      def get_namespace
+        @data['namespace']
       end
 
-      def get_namespace()
-        get("namespace") || get_top_level("namespace") || @data['env']
+      def get_command()
+        cmd = get("command")
+        if cmd.kind_of?(Array)
+          return cmd
+        end
+        return cmd.split(" ")
       end
 
       def cpu(req_type)

data/lib/pfab/templates/cron.rb

@@ -58,7 +58,7 @@ module Pfab
                       {
                         image: image_name,
                         name: @data['deployed_name'],
-                        command: app_vars["command"].split(" "),
+                        command: get_command,
                         env: env_vars,
                         resources: resources,
                       },

data/lib/pfab/templates/daemon.rb

@@ -54,7 +54,7 @@ module Pfab
                   {
                     image: image_name,
                     name: @data['deployed_name'],
-                    command: get("command").split(" "),
+                    command: get_command,
                     env: env_vars,
                     resources: resources,
                   }

data/lib/pfab/templates/job.rb

@@ -49,7 +49,7 @@ module Pfab
                   {
                     image: image_name,
                     name: @data['deployed_name'],
-                    command: app_vars["command"].split(" "),
+                    command: get_command,
                     env: env_vars,
                     resources: resources,
                   },

data/lib/pfab/templates/web.rb

@@ -236,7 +236,7 @@ module Pfab
                   {
                     image: image_name,
                     name: @data['deployed_name'],
-                    command: get("command").split(" "),
+                    command: get_command,
                     env: env_vars,
                     resources: resources,
                     ports: [

data/lib/pfab/version.rb

@@ -1,7 +1,7 @@
 module Pfab
   module Version
     MAJOR = 0
-    MINOR = 38
+    MINOR = 39
     PATCH = 0
     BUILD = nil
 

data/lib/pfab/yamls.rb

@@ -4,6 +4,8 @@ module Pfab
 
     def initialize(apps:, application_yaml:, image_name:, env:, sha:, config:)
       @apps = apps
+      namespace = application_yaml.dig(env.to_s, "namespace") || application_yaml["namespace"]
+      raise "No namespace founds" unless namespace
       @base_data = {
         "env" => env.to_s,
         'image_name' => image_name,
@@ -11,7 +13,8 @@ module Pfab
         'container_repository' => config["container.repository"],
         'config' => config,
         'application' => application_yaml["name"],
-        'application_yaml' => application_yaml
+        'application_yaml' => application_yaml,
+        'namespace' => namespace,
       }
     end
 
@@ -27,8 +30,11 @@ module Pfab
       data
     end
 
-    def generate(keys)
+    def namespace
+      @base_data['namespace']
+    end
 
+    def generate(keys)
       keys.each do |key|
         props = @apps[key]
         data = data_for(key, props)
@@ -48,9 +54,6 @@ module Pfab
         end
         filename
       end
-
     end
-
-
   end
 end

data/pfab.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: pfab 0.38.0 ruby lib
+# stub: pfab 0.39.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.38.0"
+  s.version = "0.39.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Jeff Dwyer".freeze]
-  s.date = "2023-03-27"
+  s.date = "2023-04-14"
   s.description = "k8s helper".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.executables = ["pfab".freeze]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pfab
 version: !ruby/object:Gem::Version
-  version: 0.38.0
+  version: 0.39.0
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-27 00:00:00.000000000 Z
+date: 2023-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander