v0.2.5

Gemfile

@@ -14,6 +14,8 @@ gem "cuid2"
 gem "jwt"
 gem "httparty"
 
+gem "prometheus-client"
+
 group :development do
   gem "ruby-lsp"
   gem "rack-test"

Gemfile.lock

@@ -12,7 +12,7 @@ GEM
       csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    json (2.12.2)
+    json (2.13.2)
     jwt (3.1.2)
       base64
     ksuid (1.0.0)
@@ -21,22 +21,24 @@ GEM
     logger (1.7.0)
     mini_mime (1.1.5)
     minitest (5.25.5)
-    multi_json (1.15.0)
+    multi_json (1.17.0)
     multi_xml (0.7.2)
       bigdecimal (~> 3.1)
-    mustermann (3.0.3)
+    mustermann (3.0.4)
       ruby2_keywords (~> 0.0.1)
     nanoid (2.0.0)
     nio4r (2.7.4)
     parallel (1.27.0)
-    parser (3.3.8.0)
+    parser (3.3.9.0)
       ast (~> 2.4.1)
       racc
     prism (1.4.0)
-    puma (6.6.0)
+    prometheus-client (4.2.5)
+      base64
+    puma (6.6.1)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.1.16)
+    rack (3.2.0)
     rack-protection (4.1.1)
       base64 (>= 0.1.0)
       logger (>= 1.6.0)
@@ -50,7 +52,7 @@ GEM
     rake (13.3.0)
     rbs (3.9.4)
       logger
-    regexp_parser (2.10.0)
+    regexp_parser (2.11.2)
     rspec (3.13.1)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -75,18 +77,17 @@ GEM
       rubocop-ast (>= 1.44.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.45.1)
+    rubocop-ast (1.46.0)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-performance (1.25.0)
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
       rubocop-ast (>= 1.38.0, < 2.0)
-    ruby-lsp (0.24.2)
+    ruby-lsp (0.26.1)
       language_server-protocol (~> 3.17.0)
       prism (>= 1.2, < 2.0)
       rbs (>= 3, < 5)
-      sorbet-runtime (>= 0.5.10782)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     sinatra (4.1.1)
@@ -102,7 +103,6 @@ GEM
       rack-protection (= 4.1.1)
       sinatra (= 4.1.1)
       tilt (~> 2.0)
-    sorbet-runtime (0.5.12210)
     standard (1.50.0)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
@@ -115,7 +115,7 @@ GEM
     standard-performance (1.8.0)
       lint_roller (~> 1.1)
       rubocop-performance (~> 1.25.0)
-    tilt (2.6.0)
+    tilt (2.6.1)
     ulid (1.4.0)
     unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
@@ -136,6 +136,7 @@ DEPENDENCIES
   ksuid
   minitest
   nanoid
+  prometheus-client
   puma
   rack-test
   rake

app.rb

@@ -23,7 +23,15 @@ $LOAD_PATH.unshift File.dirname(__FILE__) + "/lib"
 
 require "config"
 
-VERSION = "0.2.3"
+require "rack"
+require "prometheus/middleware/collector"
+require "prometheus/middleware/exporter"
+
+use Rack::Deflater
+use Prometheus::Middleware::Collector
+use Prometheus::Middleware::Exporter
+
+VERSION = "0.2.5"
 
 CHUNK_SIZE = 1024**2
 DEFAULT_FLAKEY = 50

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.2.3
+version: 0.2.5
 
 # 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.2.3"
+appVersion: "0.2.5"

docker-bake.hcl

@@ -1,5 +1,5 @@
 group "default" {
-    targets = [ "bookworm", "alpine" ]
+    targets = [ "trixie", "alpine" ]
 }
 
 target "docker-metadata-action" {}
@@ -7,7 +7,7 @@ target "docker-metadata-action-alpine" {}
 
 target "_common" {
     args = {
-        RUBY_VERSION = "3.4.4"
+        RUBY_VERSION = "3.4.5"
     }
     platforms = [
         "linux/amd64",
@@ -15,8 +15,8 @@ target "_common" {
     ]
 }
 
-target "bookworm" {
+target "trixie" {
-    dockerfile = "./dockerfiles/bookworm.Dockerfile"
+    dockerfile = "./dockerfiles/trixie.Dockerfile"
     inherits = [ "_common", "docker-metadata-action" ]
 }
 

dockerfiles/alpine.Dockerfile

@@ -1,4 +1,4 @@
-ARG RUBY_VERSION="3.4.4"
+ARG RUBY_VERSION="3.4.5"
 ARG BASE_REGISTRY="docker.io"
 
 FROM ${BASE_REGISTRY}/ruby:${RUBY_VERSION}-alpine AS base

dockerfiles/bookworm.Dockerfile

@@ -1,4 +1,4 @@
-ARG RUBY_VERSION="3.4.4"
+ARG RUBY_VERSION="3.4.5"
 ARG BASE_REGISTRY="docker.io"
 ARG DEBIAN_VERSION="bookworm"
 

dockerfiles/trixie.Dockerfile

@@ -0,0 +1,50 @@
+ARG RUBY_VERSION="3.4.5"
+ARG BASE_REGISTRY="docker.io"
+ARG DEBIAN_VERSION="trixie"
+
+FROM ${BASE_REGISTRY}/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} AS base
+
+ENV RACK_ENV="production" \
+  BUNDLE_DEPLOYMENT=true \
+  BUNDLE_PATH="/usr/local/bundle" \
+  BUNDLE_WITHOUT="development test" \
+  RUBY_YJIT_ENABLE=true
+
+WORKDIR /kubernaut
+
+RUN \
+  apt-get update -qq && \
+  apt-get install --yes --no-install-recommends libjemalloc2 && \
+  rm -rf /var/lib/apt/lists /var/cache/apt/archives
+
+FROM base AS build
+
+RUN \
+  apt-get update -qq && \
+  apt-get install --yes --no-install-recommends build-essential && \
+  rm -rf /var/lib/apt/lists /var/cache/apt/archives
+
+COPY Gemfile Gemfile.lock ./
+
+RUN \
+  bundle install && \
+  rm -rf ~/.bundle/ "${BUNDLE_PATH}"/ruby/*/cache "${BUNDLE_PATH}"/ruby/*/bundler/gems/*/.git
+
+COPY . .
+
+FROM base
+
+ENV PORT=4567
+
+RUN \
+  groupadd --system --gid 666 kubernaut && \
+  useradd --system --uid 666 --gid kubernaut --create-home --shell /bin/bash kubernaut
+
+COPY --from=build "${BUNDLE_PATH}" "${BUNDLE_PATH}"
+COPY --from=build /kubernaut /kubernaut
+
+USER kubernaut:kubernaut
+
+EXPOSE $PORT
+ENTRYPOINT [ "/kubernaut/dockerfiles/entrypoint.sh" ]
+CMD [ "bundle", "exec", "puma" ]

kustomize/app/deployment.yaml

@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: kubernaut
-          image: git.kill0.net/ryanc/kubernaut:0.2.3
+          image: git.kill0.net/ryanc/kubernaut:0.2.5
           imagePullPolicy: IfNotPresent
           ports:
             - name: sinatra-web