feat: update to Debian Trixie

- remove the caching, it's more trouble than it's worth
- use '&&' instead of ';', so it fails earlier

.devcontainer/Dockerfile

@@ -1,2 +1,2 @@
-ARG VARIANT="3.4.2"
+ARG VARIANT="3.4.4"
 FROM ghcr.io/rails/devcontainer/images/ruby:${VARIANT}

Gemfile

@@ -9,10 +9,13 @@ gem "ksuid"
 gem "nanoid"
 gem "ulid"
 gem "uuid7"
+gem "cuid2"
 
 gem "jwt"
 gem "httparty"
 
+gem "prometheus-client"
+
 group :development do
   gem "ruby-lsp"
   gem "rack-test"

Gemfile.lock

@@ -3,67 +3,70 @@ GEM
   specs:
     anyflake (0.0.1)
     ast (2.4.3)
-    base64 (0.2.0)
-    bigdecimal (3.1.9)
-    csv (3.3.4)
-    diff-lcs (1.6.1)
+    base64 (0.3.0)
+    bigdecimal (3.2.2)
+    csv (3.3.5)
+    cuid2 (1.0.1)
+    diff-lcs (1.6.2)
     httparty (0.23.1)
       csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    json (2.11.3)
-    jwt (2.10.1)
+    json (2.13.2)
+    jwt (3.1.2)
       base64
     ksuid (1.0.0)
-    language_server-protocol (3.17.0.4)
+    language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
     mini_mime (1.1.5)
     minitest (5.25.5)
-    multi_json (1.15.0)
-    multi_xml (0.7.1)
+    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.13)
+    rack (3.2.0)
     rack-protection (4.1.1)
       base64 (>= 0.1.0)
       logger (>= 1.6.0)
       rack (>= 3.0.0, < 4)
-    rack-session (2.1.0)
+    rack-session (2.1.1)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)
     rack-test (2.2.0)
       rack (>= 1.3)
     rainbow (3.1.1)
-    rake (13.2.1)
-    rbs (3.9.2)
+    rake (13.3.0)
+    rbs (3.9.4)
       logger
-    regexp_parser (2.10.0)
-    rspec (3.13.0)
+    regexp_parser (2.11.2)
+    rspec (3.13.1)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.3)
+    rspec-core (3.13.5)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.3)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.2)
+    rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.2)
-    rubocop (1.75.4)
+    rspec-support (3.13.4)
+    rubocop (1.75.8)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -74,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.44.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.23.15)
+    ruby-lsp (0.26.1)
       language_server-protocol (~> 3.17.0)
       prism (>= 1.2, < 2.0)
-      rbs (>= 3, < 4)
-      sorbet-runtime (>= 0.5.10782)
+      rbs (>= 3, < 5)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     sinatra (4.1.1)
@@ -101,11 +103,10 @@ GEM
       rack-protection (= 4.1.1)
       sinatra (= 4.1.1)
       tilt (~> 2.0)
-    sorbet-runtime (0.5.12043)
-    standard (1.49.0)
+    standard (1.50.0)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.75.2)
+      rubocop (~> 1.75.5)
       standard-custom (~> 1.0.0)
       standard-performance (~> 1.8)
     standard-custom (1.0.2)
@@ -114,14 +115,14 @@ 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)
     unicode-emoji (4.0.4)
     uuid7 (0.2.0)
       zeitwerk (~> 2.4)
-    zeitwerk (2.7.2)
+    zeitwerk (2.7.3)
 
 PLATFORMS
   ruby
@@ -129,11 +130,13 @@ PLATFORMS
 
 DEPENDENCIES
   anyflake
+  cuid2
   httparty
   jwt
   ksuid
   minitest
   nanoid
+  prometheus-client
   puma
   rack-test
   rake
@@ -146,4 +149,4 @@ DEPENDENCIES
   uuid7
 
 BUNDLED WITH
-   2.6.8
+   2.6.9

app.rb

@@ -12,6 +12,8 @@ require "securerandom"
 require "random/formatter"
 require "ulid"
 require "anyflake"
+require "cuid2"
+require "ksuid"
 
 require "jwt"
 
@@ -21,7 +23,15 @@ $LOAD_PATH.unshift File.dirname(__FILE__) + "/lib"
 
 require "config"
 
-VERSION = "0.2.2"
+require "rack"
+require "prometheus/middleware/collector"
+require "prometheus/middleware/exporter"
+
+use Rack::Deflater
+use Prometheus::Middleware::Collector
+use Prometheus::Middleware::Exporter
+
+VERSION = "0.2.4"
 
 CHUNK_SIZE = 1024**2
 DEFAULT_FLAKEY = 50
@@ -362,6 +372,24 @@ get "/snowflake" do
   end
 end
 
+get "/cuid2" do
+  n = params.fetch(:n, 1).to_i
+  stream do |out|
+    n.times do |_|
+      out << format("%s\n", Cuid2.generate)
+    end
+  end
+end
+
+get "/ksuid" do
+  n = params.fetch(:n, 1).to_i
+  stream do |out|
+    n.times do |_|
+      out << format("%s\n", KSUID.new)
+    end
+  end
+end
+
 post "/quit" do
   Process.kill("TERM", ppid)
   nil
@@ -444,7 +472,13 @@ end
 
 get "/_cat/env" do
   stream do |out|
-    ENV.sort.each do |k, v|
+    e = if params.key? :rack
+      env
+    else
+      ENV
+    end
+
+    e.sort.each do |k, v|
       out << "#{k}=#{v}\n"
     end
   end

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.2
+version: 0.2.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.2.2"
+appVersion: "0.2.4"

docker-bake.hcl

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

dockerfiles/alpine.Dockerfile

@@ -1,5 +1,6 @@
-ARG RUBY_VERSION="3.4.3"
+ARG RUBY_VERSION="3.4.4"
 ARG BASE_REGISTRY="docker.io"
+
 FROM ${BASE_REGISTRY}/ruby:${RUBY_VERSION}-alpine AS base
 
 ENV RACK_ENV="production" \
@@ -11,28 +12,21 @@ ENV RACK_ENV="production" \
 WORKDIR /kubernaut
 
 RUN \
-  --mount=type=cache,id=var-cache-apk,target=/var/cache/apk,sharing=locked \
-  apk update -q; \
+  apk update -q && \
   apk add bash jemalloc
 
-RUN \
-  --mount=type=cache,id=usr-local-bundle-cache,target=${BUNDLE_PATH},sharing=locked \
-  gem update --system --no-document; \
-  gem install -N bundler
-
 FROM base AS build
 
 RUN \
-  --mount=type=cache,id=var-cache-apk,target=/var/cache/apk,sharing=locked \
-  apk update -q; \
-  apk add musl-dev gcc make; \
+  apk update -q && \
+  apk add musl-dev gcc make && \
   apk add bash jemalloc
 
 COPY Gemfile Gemfile.lock ./
 
 RUN \
-  --mount=type=cache,id=usr-local-bundle-ruby-cache,target=${BUNDLE_PATH}/ruby/3.4.0/cache,sharing=locked \
-  bundle install
+  bundle install && \
+  rm -rf ~/.bundle/ "${BUNDLE_PATH}"/ruby/*/cache "${BUNDLE_PATH}"/ruby/*/bundler/gems/*/.git
 
 COPY . .
 
@@ -41,7 +35,7 @@ FROM base
 ENV PORT=4567
 
 RUN \
-  addgroup --system --gid 666 kubernaut; \
+  addgroup --system --gid 666 kubernaut && \
   adduser --system --uid 666 --ingroup kubernaut --shell /bin/bash --disabled-password kubernaut
 
 COPY --from=build "${BUNDLE_PATH}" "${BUNDLE_PATH}"

dockerfiles/bookworm.Dockerfile

@@ -1,6 +1,7 @@
-ARG RUBY_VERSION="3.4.3"
+ARG RUBY_VERSION="3.4.4"
 ARG BASE_REGISTRY="docker.io"
 ARG DEBIAN_VERSION="bookworm"
+
 FROM ${BASE_REGISTRY}/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} AS base
 
 ENV RACK_ENV="production" \
@@ -11,36 +12,23 @@ ENV RACK_ENV="production" \
 
 WORKDIR /kubernaut
 
-RUN rm -f /etc/apt/apt.conf.d/docker-clean
-
 RUN \
-  --mount=type=cache,id=var-cache-apt,target=/var/cache/apt,sharing=locked \
-  --mount=type=cache,id=var-lib-apt,target=/var/lib/apt,sharing=locked \
-  apt-get update -qq; \
-  apt-get install --yes --no-install-recommends \
-  libjemalloc2
-
-RUN \
-  --mount=type=cache,id=usr-local-bundle-cache,target=${BUNDLE_PATH},sharing=locked \
-  gem update --system --no-document; \
-  gem install -N bundler
-
-ENV DEBIAN_FRONTEND="noninteractive"
+  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 \
-  --mount=type=cache,id=var-cache-apt,target=/var/cache/apt,sharing=locked \
-  --mount=type=cache,id=var-lib-apt,target=/var/lib/apt,sharing=locked \
-  apt-get update -qq; \
-  apt-get install --yes --no-install-recommends \
-  build-essential
+  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 \
-  --mount=type=cache,id=usr-local-bundle-ruby-cache,target=${BUNDLE_PATH}/ruby/3.4.0/cache,sharing=locked \
-  bundle install
+  bundle install && \
+  rm -rf ~/.bundle/ "${BUNDLE_PATH}"/ruby/*/cache "${BUNDLE_PATH}"/ruby/*/bundler/gems/*/.git
 
 COPY . .
 
@@ -49,7 +37,7 @@ FROM base
 ENV PORT=4567
 
 RUN \
-  groupadd --system --gid 666 kubernaut; \
+  groupadd --system --gid 666 kubernaut && \
   useradd --system --uid 666 --gid kubernaut --create-home --shell /bin/bash kubernaut
 
 COPY --from=build "${BUNDLE_PATH}" "${BUNDLE_PATH}"

dockerfiles/trixie.Dockerfile

@@ -0,0 +1,50 @@
+ARG RUBY_VERSION="3.4.4"
+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/cronjob.yaml

@@ -0,0 +1,19 @@
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+  name: kubernaut
+spec:
+  schedule: "* * * * *"
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          containers:
+          - name: hello
+            image: busybox:1.37
+            imagePullPolicy: IfNotPresent
+            command:
+            - /bin/sh
+            - -c
+            - echo "=^.^= <(meow)"
+          restartPolicy: OnFailure

kustomize/app/deployment.yaml

@@ -16,8 +16,8 @@ spec:
     spec:
       containers:
         - name: kubernaut
-          image: git.kill0.net/ryanc/kubernaut:0.2.2
-          imagePullPolicy: Always
+          image: git.kill0.net/ryanc/kubernaut:0.2.4
+          imagePullPolicy: IfNotPresent
           ports:
             - name: sinatra-web
               containerPort: 4567

kustomize/app/kustomization.yaml

@@ -7,3 +7,4 @@ resources:
   - deployment.yaml
   - hpa.yaml
   - services.yaml
+  - cronjob.yaml

kustomize/kustomization.yaml

@@ -6,4 +6,3 @@ metadata:
 resources:
   - namespace.yaml
   - ./app
-  - ./memcached

kustomize/memcached/deployment.yaml

@@ -1,21 +0,0 @@
----
-kind: Deployment
-apiVersion: apps/v1
-metadata:
-  name: kubernaut-memcached
-
-spec:
-  selector:
-    matchLabels:
-      app: kubernaut-memcached
-  template:
-    metadata:
-      labels:
-        app: kubernaut-memcached
-    spec:
-      containers:
-        - name: kubernaut-memcached
-          image: memcached:latest
-          ports:
-            - name: memcached
-              containerPort: 11211

kustomize/memcached/kustomization.yaml

@@ -1,7 +0,0 @@
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-namespace: kubernaut
-resources:
-  - deployment.yaml
-  - services.yaml

kustomize/memcached/services.yaml

@@ -1,13 +0,0 @@
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: kubernaut-memcached
-
-spec:
-  ports:
-    - name: memcached
-      port: 11211
-      targetPort: memcached
-  selector:
-    app: kubernaut-memcached