v0.1.4

app.rb

@@ -2,6 +2,7 @@ require "bundler/setup"
 require "sinatra"
 require "sinatra/cookies"
 require "sinatra/multi_route"
+require "sinatra/quiet_logger"
 require "time"
 require "fileutils"
 require "json"
@@ -20,7 +21,7 @@ $LOAD_PATH.unshift File.dirname(__FILE__) + "/lib"
 
 require "config"
 
-VERSION = "0.1.2"
+VERSION = "0.1.4"
 
 CHUNK_SIZE = 1024**2
 SESSION_SECRET_HEX_LENGTH = 64
@@ -52,9 +53,12 @@ DURATION_PARTS = [
 
 config = Config.new
 
+set :quiet_logger_prefixes, %w[livez readyz]
 set :session_secret, config.session_secret.unwrap
 set :public_folder, __dir__ + "/static"
 
+register Sinatra::QuietLogger
+
 module Sinatra
   module RequestHeadersHelper
     def req_headers
@@ -113,7 +117,6 @@ class TickTock
   def initialize
     @pid = ppid
     @procfs_f = format "/proc/%s/stat", @pid
-    puts @pid
   end
 
   def uptime
@@ -164,7 +167,7 @@ class Sleep
   include State
 
   def initialize
-    @file = "/dev/shm/sleep"
+    @file = "/dev/shm/sleepy"
   end
 
   def asleep?
@@ -181,20 +184,11 @@ class Sleep
 end
 
 def ppid
-  pid = Process.pid
+  pid = ENV.fetch "PUMA_PID", Process.pid
-  # self
+  begin
-  ps = File.open "/proc/#{pid}/stat", &:readline
+    Integer pid
-  ps = ps.split(" ")
+  rescue ArgumentError
-  ppid = Integer(ps[3])
+    -1
-
-  # ppid
-  ps = File.open "/proc/#{ppid}/stat", &:readline
-  ps = ps.split(" ")
-
-  if ps[1].include? "ruby"
-    ppid
-  else
-    pid
   end
 end
 
@@ -232,9 +226,7 @@ end
 
 enable :sessions
 
-on_start do
+puts "#{NAME} #{VERSION} staring, per aspera ad astra"
-  puts "#{NAME} #{VERSION} staring, per aspera ad astra"
-end
 
 configure do
   mime_type :json, "application/json"
@@ -309,31 +301,31 @@ get "/headers", provides: "json" do
   jsonify h, pretty:
 end
 
-get "/livez" do
+get "/uptime", provides: "json" do
-  error 503 unless Health.instance.healthy?
-
-  return Health.instance.to_json if request.env["HTTP_ACCEPT"] == "application/json"
-
-  Health.instance.to_s
-end
-
-get "/livez/uptime" do
   tt = TickTock.new
   x = {started_at: tt.started_at, seconds: tt.uptime.to_i, human: human_time(tt.uptime.to_i)}
 
   jsonify x
 end
 
-post "/livez/toggle" do
+post "/api/livez/toggle" do
   Health.instance.toggle
   "ok\n"
 end
 
-post "/livez/sleep" do
+post "/api/livez/sleep" do
   Sleep.instance.toggle
   "ok\n"
 end
 
+get "/livez" do
+  error 503 unless Health.instance.healthy?
+
+  return Health.instance.to_json if request.env["HTTP_ACCEPT"] == "application/json"
+
+  Health.instance.to_s
+end
+
 get "/readyz" do
   error 503 unless Ready.instance.ready?
 
@@ -382,7 +374,7 @@ post "/halt" do
   nil
 end
 
-get "/pid" do
+get "/pid", provides: "json" do
   pretty = params.key? :pretty
 
   jsonify({ppid: ppid, pid: Process.pid}, pretty:)

charts/kubernaut/Chart.yaml

@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.2
+version: 0.1.4
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.1.2"
+appVersion: "0.1.4"

charts/kubernaut/values.yaml

@@ -97,7 +97,7 @@ readinessProbe:
 
 # This section is for setting up autoscaling more information can be found here: https://kubernetes.io/docs/concepts/workloads/autoscaling/
 autoscaling:
-  enabled: false
+  enabled: true
   minReplicas: 2
   maxReplicas: 100
   targetCPUUtilizationPercentage: 80

config/puma.rb

@@ -0,0 +1 @@
+ENV["PUMA_PID"] = Process.pid.to_s

kustomize/app/deployment.yaml

@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: kubernaut
-          image: git.kill0.net/ryanc/kubernaut:0.1.2
+          image: git.kill0.net/ryanc/kubernaut:0.1.4
           imagePullPolicy: Always
           ports:
             - name: sinatra-web