v0.2.0

.devcontainer/devcontainer.json

@@ -6,7 +6,7 @@
         "vscode": {
             "extensions": [
                 "Shopify.ruby-lsp",
-                "docker.docker"
+                "ms-azuretools.vscode-docker"
             ]
         }
     },

.dockerignore

@@ -1,7 +0,0 @@
-**/.git
-**/.gitignore
-/.devcontainer
-/.gitea
-/.github
-/.vscode
-/charts

.gitea/workflows/ci.yaml

@@ -1,16 +1,65 @@
 ---
-name: Release
+name: Gitea Actions Demo
+run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀
+
 on:
   schedule: 
-    - cron: "0 0 * * *"
+    - cron: "0 10 * * *"
   push:
     branches:
-      - main
+      - "**"
     tags:
       - "v*.*.*"
+  pull_request:
+
 jobs:
-  docker:
+  lint:
     runs-on: ubuntu-latest
+    permissions:
+      checks: write
+      contents: write
+    steps:
+      - name: Login to Docker
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
+        with:
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Ruby Setup
+        uses: ruby/setup-ruby@dffc446db9ba5a0c4446edb5bca1c5c473a806c5 # v1.235.0
+        with:
+          ruby-version: '3.4'
+          bundler-cache: true
+
+      - run: bundle install
+
+      - name: Standard Ruby
+        run: bundle exec standardrb
+
+
+  test:
+    needs: lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Test
+        uses: ruby/setup-ruby@dffc446db9ba5a0c4446edb5bca1c5c473a806c5 # v1.235.0
+        with:
+          ruby-version: '3.4'
+          bundler-cache: true
+
+      - run: bundle exec rake
+
+  docker:
+    needs: test
+    runs-on: ubuntu-latest
+    container:
+      image: catthehacker/ubuntu:act-latest
     env:
       DOCKER_ORG: ryanc
       DOCKER_LATEST: latest
@@ -36,9 +85,6 @@ jobs:
           printf "GITHUB_SHA=%s\n" "$GITHUB_SHA"
           printf "VERSION=%s\n" "$VERSION" | tee -a "$GITHUB_OUTPUT"
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
 
@@ -59,8 +105,7 @@ jobs:
             latest=auto
           bake-target: docker-metadata-action
           tags: |
-            type=schedule,pattern=nightly
-            type=edge
+            type=schedule
             type=ref,event=branch
             type=ref,event=pr
             type=semver,pattern={{version}}
@@ -79,8 +124,7 @@ jobs:
             latest=auto
             suffix=-alpine,onlatest=true
           tags: |
-            type=schedule,pattern=nightly
-            type=edge
+            type=schedule
             type=ref,event=branch
             type=ref,event=pr
             type=semver,pattern={{version}}

.gitea/workflows/lint.yaml

@@ -1,23 +0,0 @@
----
-name: Ruby Lint
-on:
-  push:
-    branches:
-      - "**"
-  pull_request:
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Ruby Setup
-        uses: ruby/setup-ruby@dffc446db9ba5a0c4446edb5bca1c5c473a806c5 # v1.235.0
-        with:
-          ruby-version: '3.4'
-          bundler-cache: true
-
-      - name: Standard Ruby
-        run: bundle exec standardrb
-

.gitea/workflows/test.yaml

@@ -1,22 +0,0 @@
----
-name: Ruby Test
-on:
-  push:
-    branches:
-      - "**"
-  pull_request:
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Test
-        uses: ruby/setup-ruby@dffc446db9ba5a0c4446edb5bca1c5c473a806c5 # v1.235.0
-        with:
-          ruby-version: '3.4'
-          bundler-cache: true
-
-      - run: bundle exec rake
-

Dockerfile

@@ -0,0 +1,42 @@
+ARG RUBY_VERSION="3.4.3"
+FROM ruby:${RUBY_VERSION} AS base
+
+WORKDIR /app
+
+RUN <<EOT
+  apt-get update
+  gem update --system --no-document
+  gem install -N bundler
+EOT
+
+
+FROM base AS build
+
+RUN <<EOT
+  apt-get install --yes gcc make
+EOT
+
+COPY Gemfile* .
+
+RUN <<EOT
+  bundle config set --local without development
+  bundle install
+EOT
+
+
+FROM base
+
+ENV PORT=4567
+
+# RUN useradd ruby --home /app --shell /bin/sh
+RUN useradd --home /app --create-home app
+
+USER app:app
+
+COPY --from=build /usr/local/bundle /usr/local/bundle
+COPY --from=build --chown=app:app /app /app
+
+COPY --chown=app:app . .
+
+EXPOSE 4567
+CMD [ "puma", "--bind", "0.0.0.0", "--port", "$PORT" ]

Gemfile

@@ -3,6 +3,7 @@ source "https://rubygems.org"
 gem "sinatra"
 gem "sinatra-contrib"
 gem "puma"
+gem "rackup"
 
 gem "anyflake"
 gem "ksuid"

Gemfile.lock

@@ -45,6 +45,8 @@ GEM
       rack (>= 3.0.0)
     rack-test (2.2.0)
       rack (>= 1.3)
+    rackup (2.2.1)
+      rack (>= 3)
     rainbow (3.1.1)
     rake (13.2.1)
     rbs (3.9.2)
@@ -136,6 +138,7 @@ DEPENDENCIES
   nanoid
   puma
   rack-test
+  rackup
   rake
   rspec
   ruby-lsp

app.rb

@@ -21,9 +21,11 @@ $LOAD_PATH.unshift File.dirname(__FILE__) + "/lib"
 
 require "config"
 
-VERSION = "0.2.1"
+VERSION = "0.2.0"
 
 CHUNK_SIZE = 1024**2
+SESSION_SECRET_HEX_LENGTH = 64
+JWT_SECRET_HEX_LENGTH = 64
 DEFAULT_FLAKEY = 50
 
 NAME = "kubernaut".freeze
@@ -378,21 +380,19 @@ get "/pid", provides: "json" do
   jsonify({ppid: ppid, pid: Process.pid}, pretty:)
 end
 
-get "/token", provides: "json" do
-  pretty = params.key? :pretty
-
+get "/token" do
   exp = Time.now.to_i + SECONDS_PER_MINUTE * 2
   payload = {name: "anonymous", exp: exp, jti: Random.uuid}
   expires_at = Time.at(exp).to_datetime
-  token = JWT.encode payload, config.jwt_secret.unwrap, "HS256"
+  token = JWT.encode payload, JWT_SECRET, "HS256"
   x = {token: token, expires_at: expires_at}
 
-  jsonify x, pretty:
+  jsonify x
 end
 
 get "/token/validate" do
   token = req_headers["authorization"].split[1]
-  payload = JWT.decode token, config.jwt_secret.unwrap, true, algorithm: "HS256"
+  payload = JWT.decode token, JWT_SECRET, true, algorithm: "HS256"
 
   jsonify payload
 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.1
+version: 0.2.0
 
 # 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.1"
+appVersion: "0.2.0"

dockerfiles/alpine.Dockerfile

@@ -1,54 +1,43 @@
 ARG RUBY_VERSION="3.4.3"
-ARG BASE_REGISTRY="docker.io"
-FROM ${BASE_REGISTRY}/ruby:${RUBY_VERSION}-alpine AS base
+FROM ruby:${RUBY_VERSION}-alpine AS base
 
-ENV RACK_ENV="production" \
-  BUNDLE_DEPLOYMENT=true \
-  BUNDLE_PATH="/usr/local/bundle" \
-  BUNDLE_WITHOUT="development test" \
-  RUBY_YJIT_ENABLE=true
+WORKDIR /app
 
-WORKDIR /kubernaut
-
-RUN \
-  --mount=type=cache,id=var-cache-apk,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; \
+RUN <<EOT
+  apk update
+  gem update --system --no-document
   gem install -N bundler
+EOT
+
 
 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 add bash jemalloc
+ENV BUNDLE_DEPLOYMENT=true \
+  BUNDLE_WITHOUT="development test"
 
-COPY Gemfile Gemfile.lock ./
+RUN <<EOT
+  apk add musl-dev gcc make
+EOT
 
-RUN \
-  --mount=type=cache,id=usr-local-bundle-ruby-cache,target=${BUNDLE_PATH}/ruby/3.4.0/cache,sharing=locked \
+COPY Gemfile* .
+
+RUN <<EOT
   bundle install
+EOT
 
-COPY . .
 
 FROM base
 
 ENV PORT=4567
 
-RUN \
-  addgroup --system --gid 666 kubernaut; \
-  adduser --system --uid 666 --ingroup kubernaut --shell /bin/bash --disabled-password kubernaut
+RUN adduser --home /app --disabled-password app
 
-COPY --from=build "${BUNDLE_PATH}" "${BUNDLE_PATH}"
-COPY --from=build /kubernaut /kubernaut
+USER app:app
 
-USER kubernaut:kubernaut
+COPY --from=build /usr/local/bundle /usr/local/bundle
+COPY --from=build --chown=app:app /app /app
+
+COPY --chown=app:app . .
 
 EXPOSE $PORT
-ENTRYPOINT [ "/kubernaut/dockerfiles/entrypoint.sh" ]
-CMD [ "bundle", "exec", "puma" ]
+CMD [ "puma" ]

dockerfiles/bookworm.Dockerfile

@@ -1,62 +1,44 @@
 ARG RUBY_VERSION="3.4.3"
-ARG BASE_REGISTRY="docker.io"
-ARG DEBIAN_VERSION="bookworm"
-FROM ${BASE_REGISTRY}/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} AS base
+FROM ruby:${RUBY_VERSION}-slim-bookworm AS base
 
-ENV RACK_ENV="production" \
-  BUNDLE_DEPLOYMENT=true \
-  BUNDLE_PATH="/usr/local/bundle" \
-  BUNDLE_WITHOUT="development test" \
-  RUBY_YJIT_ENABLE=true
+WORKDIR /app
 
-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; \
+RUN <<EOT
+  apt-get update
+  gem update --system --no-document
   gem install -N bundler
+EOT
 
-ENV DEBIAN_FRONTEND="noninteractive"
 
 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
+ENV BUNDLE_DEPLOYMENT=true \
+  BUNDLE_WITHOUT="development test"
 
-COPY Gemfile Gemfile.lock ./
+RUN <<EOT
+  apt-get install --yes --no-install-recommends gcc make libc-dev
+EOT
 
-RUN \
-  --mount=type=cache,id=usr-local-bundle-ruby-cache,target=${BUNDLE_PATH}/ruby/3.4.0/cache,sharing=locked \
+COPY Gemfile* .
+
+RUN <<EOT
   bundle install
+EOT
 
-COPY . .
 
 FROM base
 
 ENV PORT=4567
 
-RUN \
-  groupadd --system --gid 666 kubernaut; \
-  useradd --system --uid 666 --gid kubernaut --create-home --shell /bin/bash kubernaut
+# RUN useradd ruby --home /app --shell /bin/sh
+RUN useradd --home /app --create-home app
 
-COPY --from=build "${BUNDLE_PATH}" "${BUNDLE_PATH}"
-COPY --from=build /kubernaut /kubernaut
+USER app:app
 
-USER kubernaut:kubernaut
+COPY --from=build /usr/local/bundle /usr/local/bundle
+COPY --from=build --chown=app:app /app /app
+
+COPY --chown=app:app . .
 
 EXPOSE $PORT
-ENTRYPOINT [ "/kubernaut/dockerfiles/entrypoint.sh" ]
-CMD [ "bundle", "exec", "puma" ]
+CMD [ "puma" ]

dockerfiles/entrypoint.sh

@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-# output debugging info
-ruby --version
-printf "rubygems %s\n" "$(gem --version)"
-bundle version
-
-if [ -z "${LD_PRELOAD+x}" ]; then
-    LD_PRELOAD="$(find /usr/lib -name libjemalloc.so.2 -print -quit)"
-    export LD_PRELOAD
-fi
-
-exec "${@}"

kustomize/app/deployment.yaml

@@ -16,24 +16,18 @@ spec:
     spec:
       containers:
         - name: kubernaut
-          image: git.kill0.net/ryanc/kubernaut:0.2.1
+          image: git.kill0.net/ryanc/kubernaut:0.2.0
           imagePullPolicy: Always
           ports:
             - name: sinatra-web
               containerPort: 4567
           env:
-            - name: KUBERNAUT_SESSION_SECRET
+            - name: SESSION_SECRET
               valueFrom:
                 secretKeyRef:
-                  name: kubernaut
+                  name: kubernaut-session-secret
                   key: session_secret
                   optional: true
-            - name: KUBERNAUT_JWT_SECRET
-              valueFrom:
-                secretKeyRef:
-                  name: kubernaut
-                  key: jwt_secret
-                  optional: true
           envFrom:
             - configMapRef:
                 name: kubernaut-configmap

kustomize/app/kustomization.yaml

@@ -3,6 +3,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: kubernaut
 resources:
+  - secret.yaml
   - configmap.yaml
   - deployment.yaml
   - hpa.yaml

kustomize/app/secret.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: bitnami.com/v1alpha1
+kind: SealedSecret
+metadata:
+  creationTimestamp: null
+  name: kubernaut-session-secret
+  namespace: kubernaut
+spec:
+  encryptedData:
+    session_secret: AgCY08t0AU418znEZt5d252J+lH+fwYki2g6jdJpfdRfVQjnA+b52P0KWrs/x5pB0PKab6Z3JY/Tz0SQCaoIsCR4IzUO3a095aulRqb6Qr1Lz8udBVta4JJMZLmo26tuUfVHlpD1d6J8rkBSm8vzckFLkOA1Wfl/9rS3K4qwiDogA5pI0ULghFkeEx1yKdRwPq0k8PuvOvLUJ6oNq3e5n+B/BrVWdQ+7XQxUq/AMANJrDbe+RD33f99LArHYA7bFMbY8YRazXSTAkeunpTlxTjuGZKYvJKupo29LHz2OVbZVX/hI0nZkdVpcgqvbxF6Vw9CuCeAmtKYl7A3qsAWqDLUdP3hRLsk2P9RDNhEzYWh4ml8APzziWzihdJbGEjwLy7HsHgKslM0XbBnRQDlxp/JtvcWdjQp33A+QOON32zOKHi+qJjDYyGebS1+xkPbnyb1MPSJVAtFpj7dlLbFekLFDZEbXuJYUl1wKdFOIjJHmNK/MTEV2kOhtiVj/aeKgSXwor9hR7Uxzs5ZSawp9uWw+hpr58EX6I+RtfO4yjFC6FjnagiU6SlI1Q2F7/nv82g1UWTYMpNN5bduS1YFWmsnXvK+W7YQHpSForr5ndtCSHmclbXb5Fc33sywC5u6Bi2Gu5/MW6d73BOog5BC3QtOuEQ044Q+cuU3RIlKADBqKLzZmHlmukyyGuZfXJnGjlWGKp3J1KecucTo6XC9QHpUkjXEKdlE63mOI1VuOGyBIHl60v4bnWiBg+aDZVHipz4JLKsVB0HOgBBK7+tOX6tr1GDG/F7Nz/i9ebzUV6i8Ec1jHf+2ZcTtBkNXBIkHc84+4Qd33/gOuP+lizLfIhfQ3DFWbwyfYumpVbeapyYhB0CE=
+  template:
+    metadata:
+      creationTimestamp: null
+      name: kubernaut-session-secret
+      namespace: kubernaut

lib/config.rb

@@ -1,8 +1,5 @@
 require "sensitive"
 
-SESSION_SECRET_HEX_LENGTH = 64
-JWT_SECRET_HEX_LENGTH = 64
-
 class Config
   attr_accessor :cat
 
@@ -12,7 +9,7 @@ class Config
     @prefix = prefix
     @cat = cat
 
-    session_secret ||= fetch_env "SESSION_SECRET" do
+    session_secret ||= ENV.fetch "SESSION_SECRET" do
       SecureRandom.hex SESSION_SECRET_HEX_LENGTH
     end