namespace cache IDs by TARGETARCH

Gemfile

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

Gemfile.lock

@@ -12,8 +12,8 @@ GEM
       csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    json (2.13.2)
+    json (2.12.2)
-    jwt (3.1.2)
+    jwt (3.1.1)
       base64
     ksuid (1.0.0)
     language_server-protocol (3.17.0.5)
@@ -21,24 +21,22 @@ GEM
     logger (1.7.0)
     mini_mime (1.1.5)
     minitest (5.25.5)
-    multi_json (1.17.0)
+    multi_json (1.15.0)
     multi_xml (0.7.2)
       bigdecimal (~> 3.1)
-    mustermann (3.0.4)
+    mustermann (3.0.3)
       ruby2_keywords (~> 0.0.1)
     nanoid (2.0.0)
     nio4r (2.7.4)
     parallel (1.27.0)
-    parser (3.3.9.0)
+    parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
     prism (1.4.0)
-    prometheus-client (4.2.5)
+    puma (6.6.0)
-      base64
-    puma (6.6.1)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.2.0)
+    rack (3.1.16)
     rack-protection (4.1.1)
       base64 (>= 0.1.0)
       logger (>= 1.6.0)
@@ -52,7 +50,7 @@ GEM
     rake (13.3.0)
     rbs (3.9.4)
       logger
-    regexp_parser (2.11.2)
+    regexp_parser (2.10.0)
     rspec (3.13.1)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -77,17 +75,18 @@ GEM
       rubocop-ast (>= 1.44.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.46.0)
+    rubocop-ast (1.45.1)
       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.26.1)
+    ruby-lsp (0.24.2)
       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)
@@ -103,6 +102,7 @@ GEM
       rack-protection (= 4.1.1)
       sinatra (= 4.1.1)
       tilt (~> 2.0)
+    sorbet-runtime (0.5.12204)
     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.1)
+    tilt (2.6.0)
     ulid (1.4.0)
     unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
@@ -136,7 +136,6 @@ DEPENDENCIES
   ksuid
   minitest
   nanoid
-  prometheus-client
   puma
   rack-test
   rake

app.rb

@@ -12,8 +12,6 @@ require "securerandom"
 require "random/formatter"
 require "ulid"
 require "anyflake"
-require "cuid2"
-require "ksuid"
 
 require "jwt"
 
@@ -23,15 +21,7 @@ $LOAD_PATH.unshift File.dirname(__FILE__) + "/lib"
 
 require "config"
 
-require "rack"
+VERSION = "0.2.3"
-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
@@ -372,24 +362,6 @@ 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

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.5
+version: 0.2.3
 
 # 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.5"
+appVersion: "0.2.3"

docker-bake.hcl

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

dockerfiles/alpine.Dockerfile

@@ -1,5 +1,6 @@
-ARG RUBY_VERSION="3.4.5"
+ARG RUBY_VERSION="3.4.4"
 ARG BASE_REGISTRY="docker.io"
+ARG TARGETARCH
 
 FROM ${BASE_REGISTRY}/ruby:${RUBY_VERSION}-alpine AS base
 
@@ -12,21 +13,28 @@ ENV RACK_ENV="production" \
 WORKDIR /kubernaut
 
 RUN \
-  apk update -q && \
+  --mount=type=cache,id=var-cache-apk-${TARGETARCH},target=/var/cache/apk,sharing=locked \
+  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 \
-  apk update -q && \
+  --mount=type=cache,id=var-cache-apk-${TARGETARCH},target=/var/cache/apk,sharing=locked \
-  apk add musl-dev gcc make && \
+  apk update -q; \
+  apk add musl-dev gcc make; \
   apk add bash jemalloc
 
 COPY Gemfile Gemfile.lock ./
 
 RUN \
-  bundle install && \
+  --mount=type=cache,id=usr-local-bundle-ruby-cache-${TARGETARCH},target=${BUNDLE_PATH}/ruby/3.4.0/cache,sharing=locked \
-  rm -rf ~/.bundle/ "${BUNDLE_PATH}"/ruby/*/cache "${BUNDLE_PATH}"/ruby/*/bundler/gems/*/.git
+  bundle install
 
 COPY . .
 
@@ -35,7 +43,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.5"
+ARG RUBY_VERSION="3.4.4"
 ARG BASE_REGISTRY="docker.io"
 ARG DEBIAN_VERSION="bookworm"
+ARG TARGETARCH
 
 FROM ${BASE_REGISTRY}/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} AS base
 
@@ -12,23 +13,36 @@ ENV RACK_ENV="production" \
 
 WORKDIR /kubernaut
 
+RUN rm -f /etc/apt/apt.conf.d/docker-clean
+
 RUN \
-  apt-get update -qq && \
+  --mount=type=cache,id=var-cache-apt-${TARGETARCH},target=/var/cache/apt,sharing=locked \
-  apt-get install --yes --no-install-recommends libjemalloc2 && \
+  --mount=type=cache,id=var-lib-apt-${TARGETARCH},target=/var/lib/apt,sharing=locked \
-  rm -rf /var/lib/apt/lists /var/cache/apt/archives
+  apt-get update -qq; \
+  apt-get install --yes --no-install-recommends \
+  libjemalloc2
+
+RUN \
+  --mount=type=cache,id=usr-local-bundle-cache-${TARGETARCH},target=${BUNDLE_PATH},sharing=locked \
+  gem update --system --no-document; \
+  gem install -N bundler
+
+ENV DEBIAN_FRONTEND="noninteractive"
 
 FROM base AS build
 
 RUN \
-  apt-get update -qq && \
+  --mount=type=cache,id=var-cache-apt-${TARGETARCH},target=/var/cache/apt,sharing=locked \
-  apt-get install --yes --no-install-recommends build-essential && \
+  --mount=type=cache,id=var-lib-apt-${TARGETARCH},target=/var/lib/apt,sharing=locked \
-  rm -rf /var/lib/apt/lists /var/cache/apt/archives
+  apt-get update -qq; \
+  apt-get install --yes --no-install-recommends \
+  build-essential
 
 COPY Gemfile Gemfile.lock ./
 
 RUN \
-  bundle install && \
+  --mount=type=cache,id=usr-local-bundle-ruby-cache-${TARGETARCH},target=${BUNDLE_PATH}/ruby/3.4.0/cache,sharing=locked \
-  rm -rf ~/.bundle/ "${BUNDLE_PATH}"/ruby/*/cache "${BUNDLE_PATH}"/ruby/*/bundler/gems/*/.git
+  bundle install
 
 COPY . .
 
@@ -37,7 +51,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

@@ -1,50 +0,0 @@
-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/cronjob.yaml

@@ -1,19 +0,0 @@
-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,7 +16,7 @@ spec:
     spec:
       containers:
         - name: kubernaut
-          image: git.kill0.net/ryanc/kubernaut:0.2.5
+          image: git.kill0.net/ryanc/kubernaut:0.2.3
           imagePullPolicy: IfNotPresent
           ports:
             - name: sinatra-web

kustomize/app/kustomization.yaml

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