cuber 1.6.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39f690dbfe51c572573fa0bf59c5f43c1b2806576aed7249afafa94d9184f146
-  data.tar.gz: 03a35ba128901bb1d2a86a95f517cfeb44383da40b5351914ccdda21e8d21315
+  metadata.gz: 8c28c18ed3acd87a99a88d336b9b729d4089efe1f97224b9bc4d16058a7ace8e
+  data.tar.gz: 36957c9449da91c15284dbd041edef524627c33dbf3252300049baf717f64c5b
 SHA512:
-  metadata.gz: 1800876c72eac1ad1066cf17bdf139ee3ce204c3d32eff529dad6fd031632a0c1c8b912012fb37ce900d912d76f846bdfd9ffdc505cbbc6e54f1fd80ceecff92
-  data.tar.gz: f6a2dc6449e62325d82d988b392b9dd2cea53cc7584701fe7901093c7d6ceef009114f7dda2a95bec25f9426d40fcc56e333bd7240309f3d272341cde8a0a486
+  metadata.gz: 8498fc1f4c44b8e6fe4ed0939eec0e6229bb44e0dc66da2eb1e504e3304d0e2f74dc5d5ba40a123f884d9550fa584e245400cf0a1e3124beda52c0a078a48628
+  data.tar.gz: 2f76ecbc4462b448069ec251ccfebbc9c4def63ca4be2e2378d37e63b3db8df38ea889830b4a1ef0e73be51a9f2de418fc81bb3f83c5c79eb46080825a2706d8

data/lib/cuber/cli.rb

@@ -7,6 +7,7 @@ require 'yaml'
 require 'json'
 require 'shellwords'
 require 'time'
+require 'uri'
 
 module Cuber
   class CLI
@@ -26,7 +27,7 @@ module Cuber
     end
 
     def parse_cuberfile
-      abort 'Cuberfile not found in current directory' unless File.exists? 'Cuberfile'
+      abort 'Cuberfile not found in current directory' unless File.exist? 'Cuberfile'
       content = File.read 'Cuberfile'
       parser = CuberfileParser.new
       parser.instance_eval(content)

data/lib/cuber/commands/info.rb

@@ -98,7 +98,7 @@ module Cuber::Commands
         schedule = cron['spec']['schedule']
         command = cron['spec']['jobTemplate']['spec']['template']['spec']['containers'][0]['command'].shelljoin
         last = cron['status']['lastScheduleTime']
-        puts "#{name}: #{schedule} #{command} (#{time_ago_in_words last})"
+        puts "#{name}: #{schedule} #{command} #{'(' + time_ago_in_words(last) + ')' if last}"
       end
     end
 

data/lib/cuber/cuberfile_parser.rb

@@ -15,6 +15,7 @@ module Cuber
       @cron = {}
       @secrets = {}
       @env = {}
+      @health = nil
       @lb = {}
       @ingress = nil
       @ssl = nil
@@ -75,6 +76,10 @@ module Cuber
     def env key, value, secret: false
       secret ? (@secrets[key] = value) : (@env[key] = value)
     end
+    
+    def health url
+      @health = url
+    end
 
     def lb key, value
       @lb[key] = value

data/lib/cuber/cuberfile_validator.rb

@@ -20,6 +20,7 @@ module Cuber
       validate_procs
       validate_cron
       validate_env
+      validate_health
       validate_lb
       validate_ingress
       validate_ssl
@@ -49,7 +50,7 @@ module Cuber
 
     def validate_dockerfile
       return unless @options[:dockerfile]
-      @errors << 'dockerfile must be a file' unless File.exists? @options[:dockerfile]
+      @errors << 'dockerfile must be a file' unless File.exist? @options[:dockerfile]
     end
 
     def validate_image
@@ -63,12 +64,12 @@ module Cuber
 
     def validate_dockerconfig
       return unless @options[:dockerconfig]
-      @errors << 'dockerconfig must be a file' unless File.exists? @options[:dockerconfig]
+      @errors << 'dockerconfig must be a file' unless File.exist? @options[:dockerconfig]
     end
 
     def validate_kubeconfig
       @errors << 'kubeconfig must be present' if @options[:kubeconfig].to_s.strip.empty?
-      @errors << 'kubeconfig must be a file' unless File.exists? @options[:kubeconfig]
+      @errors << 'kubeconfig must be a file' unless File.exist? @options[:kubeconfig]
     end
 
     def validate_migrate
@@ -103,6 +104,11 @@ module Cuber
         @errors << "env \"#{key}\" name can only include uppercase letters, digits or underscores" if key !~ /\A[A-Z_]+[A-Z0-9_]*\z/
       end
     end
+    
+    def validate_health
+      return unless @options[:health]
+      @errors << 'health checks must be an http url' unless URI.parse(@options[:health]).kind_of? URI::HTTP
+    end
 
     def validate_lb
       @options[:lb].each do |key, value|
@@ -117,8 +123,8 @@ module Cuber
 
     def validate_ssl
       return unless @options[:ssl]
-      @errors << 'ssl crt must be a file' unless File.exists? @options[:ssl][:crt]
-      @errors << 'ssl key must be a file' unless File.exists? @options[:ssl][:key]
+      @errors << 'ssl crt must be a file' unless File.exist? @options[:ssl][:crt]
+      @errors << 'ssl key must be a file' unless File.exist? @options[:ssl][:key]
     end
 
   end

data/lib/cuber/templates/deployment.yml.erb

@@ -59,6 +59,23 @@ data:
   <%= key %>: <%= value.to_s.to_json %>
   <%- end -%>
 
+---
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: web-pdb
+  namespace: <%= @options[:app] %>
+  labels:
+    app.kubernetes.io/name: <%= @options[:app] %>
+    app.kubernetes.io/instance: <%= @options[:instance] %>
+    app.kubernetes.io/version: <%= @options[:release] %>
+    app.kubernetes.io/managed-by: cuber
+spec:
+  maxUnavailable: "50%"
+  selector:
+    matchLabels:
+      app: web-proc
+
 <%- if @options[:migrate] -%>
 ---
 apiVersion: batch/v1
@@ -164,10 +181,17 @@ spec:
           value: "8080"
         ports:
         - containerPort: 8080
+        <%- end -%>
+        <%- if procname.to_s == 'web' && @options[:health] -%>
         readinessProbe:
           httpGet:
-            path: /
             port: 8080
+            path: <%= URI.parse(@options[:health]).path.to_json %>
+            httpHeaders:
+              - name: Host
+                value: <%= URI.parse(@options[:health]).host.to_json %>
+              - name: X-Forwarded-Proto
+                value: <%= URI.parse(@options[:health]).scheme.to_json %>
         <%- end -%>
       <%- if @options[:migrate] && @options[:migrate][:check] -%>
       initContainers:

data/lib/cuber/version.rb

@@ -1,3 +1,3 @@
 module Cuber
-  VERSION = '1.6.0'.freeze
+  VERSION = '1.8.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cuber
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Cuber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-01 00:00:00.000000000 Z
+date: 2022-11-08 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: