configure CI to push Helm charts

2025-04-01 17:20:32 -05:00
12 changed files with 100 additions and 266 deletions
--- a/.gitea/workflows/ci.yaml
+++ b/.gitea/workflows/ci.yaml
@ -20,16 +20,16 @@ jobs:
      contents: write
    steps:
      - name: Login to Docker
-        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
+        uses: docker/login-action@v3
        with:
          username: ${{ vars.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

      - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@v4

      - name: Ruby Setup
-        uses: ruby/setup-ruby@dffc446db9ba5a0c4446edb5bca1c5c473a806c5 # v1.235.0
+        uses: ruby/setup-ruby@v1
        with:
          ruby-version: '3.4'
          bundler-cache: true
@ -45,10 +45,10 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@v4

      - name: Test
-        uses: ruby/setup-ruby@dffc446db9ba5a0c4446edb5bca1c5c473a806c5 # v1.235.0
+        uses: ruby/setup-ruby@v1
        with:
          ruby-version: '3.4'
          bundler-cache: true
@ -66,11 +66,9 @@ jobs:
    defaults:
      run:
        shell: bash
-    outputs:
-      metadata: ${{ steps.output.outputs.metadata }}
    steps:
      - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0 # all history for all branches and tags

@ -85,67 +83,43 @@ jobs:
          printf "GITHUB_SHA=%s\n" "$GITHUB_SHA"
          printf "VERSION=%s\n" "$VERSION" | tee -a "$GITHUB_OUTPUT"

+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            git.kill0.net/ryanc/kubernaut
+          tags: |
+            type=schedule
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=sha
+
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
+        uses: docker/setup-buildx-action@v3

      - name: Login to Gitea registry
-        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
+        uses: docker/login-action@v3
        with:
          registry: git.kill0.net
          username: ${{ secrets.DOCKER_USERNAME }}
          password: ${{ secrets.DOCKER_PASSWORD }}

-      - name: Docker meta (debian)
-        id: meta
-        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
-        with:
-          images: |
-            git.kill0.net/ryanc/kubernaut
-          flavor: |
-            latest=auto
-          bake-target: docker-metadata-action
-          tags: |
-            type=schedule
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=sha
-
-      - name: Docker meta (alpine)
-        id: meta-alpine
-        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
-        with:
-          images: |
-            git.kill0.net/ryanc/kubernaut
-          bake-target: docker-metadata-action-alpine
-          flavor: |
-            latest=auto
-            suffix=-alpine,onlatest=true
-          tags: |
-            type=schedule
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=sha
-
      - name: Docker build and push
-        uses: docker/bake-action@76f9fa3a758507623da19f6092dc4089a7e61592 # v6.6.0
+        uses: docker/build-push-action@v5
        with:
          push: ${{ github.event_name != 'pull_request' }}
-          files: |
-            ./docker-bake.hcl
-            cwd://${{ steps.meta.outputs.bake-file }}
-            cwd://${{ steps.meta-alpine.outputs.bake-file }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

      - name: Setup Helm
-        uses: azure/setup-helm@b9e51907a09c216f16ebe8536097933489208112 # v4.3.0
+        uses: azure/setup-helm@v4.3.0

      - name: Publish Helm chart
-        if: ${{ contains(github.ref, 'refs/tags/') }}
+        if: ${{ contains(github.ref, 'ref/tags/') }}
        run: |
          HELM_VERSION="${{ steps.prep.outputs.VERSION }}"
          HELM_VERSION="${HELM_VERSION#v}"
--- a/20
+++ b/20
@ -1,19 +1,19 @@
-ARG RUBY_VERSION="3.4.3"
-FROM ruby:${RUBY_VERSION} AS base
+FROM ruby:alpine AS base

 WORKDIR /app

 RUN <<EOT
-  apt-get update
  gem update --system --no-document
  gem install -N bundler
+  apk update
+  apk upgrade --no-cache
 EOT


 FROM base AS build

 RUN <<EOT
-  apt-get install --yes gcc make
+  apk add gcc musl-dev ruby-dev make
 EOT

 COPY Gemfile* .
@ -26,17 +26,15 @@ EOT

 FROM base

-ENV PORT=4567
-
 # RUN useradd ruby --home /app --shell /bin/sh
-RUN useradd --home /app --create-home app
+RUN adduser ruby -h /app -D

-USER app:app
+USER ruby:ruby

 COPY --from=build /usr/local/bundle /usr/local/bundle
-COPY --from=build --chown=app:app /app /app
+COPY --from=build --chown=ruby:ruby /app /app

-COPY --chown=app:app . .
+COPY --chown=ruby:ruby . .

 EXPOSE 4567
-CMD [ "puma", "--bind", "0.0.0.0", "--port", "$PORT" ]
+CMD [ "bundle", "exec", "rackup", "--host", "0.0.0.0", "--port", "4567" ]
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -4,22 +4,22 @@ GEM
    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)
-    httparty (0.23.1)
+    bigdecimal (3.1.8)
+    csv (3.3.0)
+    diff-lcs (1.6.0)
+    httparty (0.22.0)
      csv
      mini_mime (>= 1.0.0)
      multi_xml (>= 0.5.2)
-    json (2.11.3)
+    json (2.10.2)
    jwt (2.10.1)
      base64
    ksuid (1.0.0)
    language_server-protocol (3.17.0.4)
    lint_roller (1.1.0)
-    logger (1.7.0)
+    logger (1.6.6)
    mini_mime (1.1.5)
-    minitest (5.25.5)
+    minitest (5.25.4)
    multi_json (1.15.0)
    multi_xml (0.7.1)
      bigdecimal (~> 3.1)
@ -27,15 +27,15 @@ GEM
      ruby2_keywords (~> 0.0.1)
    nanoid (2.0.0)
    nio4r (2.7.4)
-    parallel (1.27.0)
-    parser (3.3.8.0)
+    parallel (1.26.3)
+    parser (3.3.7.2)
      ast (~> 2.4.1)
      racc
-    prism (1.4.0)
+    prism (1.3.0)
    puma (6.6.0)
      nio4r (~> 2.0)
    racc (1.8.1)
-    rack (3.1.13)
+    rack (3.1.11)
    rack-protection (4.1.1)
      base64 (>= 0.1.0)
      logger (>= 1.6.0)
@ -49,7 +49,7 @@ GEM
      rack (>= 3)
    rainbow (3.1.1)
    rake (13.2.1)
-    rbs (3.9.2)
+    rbs (3.8.1)
      logger
    regexp_parser (2.10.0)
    rspec (3.13.0)
@ -65,7 +65,7 @@ GEM
      diff-lcs (>= 1.2.0, < 2.0)
      rspec-support (~> 3.13.0)
    rspec-support (3.13.2)
-    rubocop (1.75.4)
+    rubocop (1.73.2)
      json (~> 2.3)
      language_server-protocol (~> 3.17.0.2)
      lint_roller (~> 1.1.0)
@ -73,17 +73,16 @@ GEM
      parser (>= 3.3.0.2)
      rainbow (>= 2.2.2, < 4.0)
      regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.44.0, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
      ruby-progressbar (~> 1.7)
      unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.44.1)
+    rubocop-ast (1.41.0)
      parser (>= 3.3.7.2)
-      prism (~> 1.4)
-    rubocop-performance (1.25.0)
+    rubocop-performance (1.24.0)
      lint_roller (~> 1.1)
-      rubocop (>= 1.75.0, < 2.0)
+      rubocop (>= 1.72.1, < 2.0)
      rubocop-ast (>= 1.38.0, < 2.0)
-    ruby-lsp (0.23.15)
+    ruby-lsp (0.23.11)
      language_server-protocol (~> 3.17.0)
      prism (>= 1.2, < 2.0)
      rbs (>= 3, < 4)
@ -103,19 +102,19 @@ GEM
      rack-protection (= 4.1.1)
      sinatra (= 4.1.1)
      tilt (~> 2.0)
-    sorbet-runtime (0.5.12043)
-    standard (1.49.0)
+    sorbet-runtime (0.5.11911)
+    standard (1.47.0)
      language_server-protocol (~> 3.17.0.2)
      lint_roller (~> 1.0)
-      rubocop (~> 1.75.2)
+      rubocop (~> 1.73.0)
      standard-custom (~> 1.0.0)
-      standard-performance (~> 1.8)
+      standard-performance (~> 1.7)
    standard-custom (1.0.2)
      lint_roller (~> 1.0)
      rubocop (~> 1.50)
-    standard-performance (1.8.0)
+    standard-performance (1.7.0)
      lint_roller (~> 1.1)
-      rubocop-performance (~> 1.25.0)
+      rubocop-performance (~> 1.24.0)
    tilt (2.6.0)
    ulid (1.4.0)
    unicode-display_width (3.1.4)
@ -149,4 +148,4 @@ DEPENDENCIES
  uuid7

 BUNDLED WITH
-   2.6.8
+   2.6.6
--- a/app.rb
+++ b/app.rb
@ -2,7 +2,6 @@ require "bundler/setup"
 require "sinatra"
 require "sinatra/cookies"
 require "sinatra/multi_route"
-require "sinatra/quiet_logger"
 require "time"
 require "fileutils"
 require "json"
@ -21,8 +20,6 @@ $LOAD_PATH.unshift File.dirname(__FILE__) + "/lib"

 require "config"

-VERSION = "0.2.0"
-
 CHUNK_SIZE = 1024**2
 SESSION_SECRET_HEX_LENGTH = 64
 JWT_SECRET_HEX_LENGTH = 64
@ -53,12 +50,9 @@ 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
@ -117,6 +111,7 @@ class TickTock
  def initialize
    @pid = ppid
    @procfs_f = format "/proc/%s/stat", @pid
+    puts @pid
  end

  def uptime
@ -167,7 +162,7 @@ class Sleep
  include State

  def initialize
-    @file = "/dev/shm/sleepy"
+    @file = "/dev/shm/sleep"
  end

  def asleep?
@ -184,11 +179,20 @@ class Sleep
 end

 def ppid
-  pid = ENV.fetch "PUMA_PID", Process.pid
-  begin
-    Integer pid
-  rescue ArgumentError
-    -1
+  pid = Process.pid
+  # self
+  ps = File.open "/proc/#{pid}/stat", &:readline
+  ps = ps.split(" ")
+  ppid = Integer(ps[3])
+
+  # ppid
+  ps = File.open "/proc/#{ppid}/stat", &:readline
+  ps = ps.split(" ")
+
+  if ps[1].include? "ruby"
+    ppid
+  else
+    pid
  end
 end

@ -226,8 +230,6 @@ end

 enable :sessions

-puts "#{NAME} #{VERSION} staring, per aspera ad astra"
-
 configure do
  mime_type :json, "application/json"
 end
@ -301,23 +303,6 @@ get "/headers", provides: "json" do
  jsonify h, pretty:
 end

-get "/uptime", provides: "json" 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 "/api/livez/toggle" do
-  Health.instance.toggle
-  "ok\n"
-end
-
-post "/api/livez/sleep" do
-  Sleep.instance.toggle
-  "ok\n"
-end
-
 get "/livez" do
  error 503 unless Health.instance.healthy?

@ -326,6 +311,23 @@ get "/livez" do
  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
+  Health.instance.toggle
+  "ok\n"
+end
+
+post "/livez/sleep" do
+  Sleep.instance.toggle
+  "ok\n"
+end
+
 get "/readyz" do
  error 503 unless Ready.instance.ready?

@ -374,7 +376,7 @@ post "/halt" do
  nil
 end

-get "/pid", provides: "json" do
+get "/pid" do
  pretty = params.key? :pretty

  jsonify({ppid: ppid, pid: Process.pid}, pretty:)
--- a/charts/kubernaut/Chart.yaml
+++ b/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.0
+version: 0.1.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.0"
+appVersion: "0.1.0"
--- a/charts/kubernaut/values.yaml
+++ b/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: true
+  enabled: false
  minReplicas: 2
  maxReplicas: 100
  targetCPUUtilizationPercentage: 80
--- a/config/puma.rb
+++ b/config/puma.rb
@ -1,5 +0,0 @@
-ENV["PUMA_PID"] = Process.pid.to_s
-
-port ENV.fetch("PORT", 4567)
-
-pidfile ENV["PIDFILE"] if ENV["PIDFILE"]
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@ -1,22 +0,0 @@
-group "default" {
-    targets = [ "bookworm", "alpine" ]
-}
-
-target "docker-metadata-action" {}
-target "docker-metadata-action-alpine" {}
-
-target "_common" {
-    args = {
-        RUBY_VERSION = "3.4.3"
-    }
-}
-
-target "bookworm" {
-    dockerfile = "./dockerfiles/bookworm.Dockerfile"
-    inherits = [ "_common", "docker-metadata-action" ]
-}
-
-target "alpine" {
-    dockerfile = "./dockerfiles/alpine.Dockerfile"
-    inherits = [ "_common", "docker-metadata-action-alpine" ]
-}
--- a/dockerfiles/alpine.Dockerfile
+++ b/dockerfiles/alpine.Dockerfile
@ -1,51 +0,0 @@
-ARG RUBY_VERSION="3.4.3"
-FROM docker.io/library/ruby:${RUBY_VERSION}-alpine AS base
-
-WORKDIR /kubernaut
-
-RUN <<EOT
-  apk update -q
-  apk add bash
-  rm -rf /var/cache/apk
-  gem update --system --no-document
-  gem install -N bundler
-EOT
-
-ENV RACK_ENV="production" \
-  BUNDLE_DEPLOYMENT=true \
-  BUNDLE_PATH="/usr/local/bundle" \
-  BUNDLE_WITHOUT="development test"
-
-FROM base AS build
-
-RUN <<EOT
-  apk add musl-dev gcc make
-  rm -rf /var/cache/apk
-EOT
-
-COPY Gemfile Gemfile.lock ./
-
-RUN <<EOT
-  bundle install
-  rm -rf ~/.bundle/ "${BUNDLE_PATH}"/ruby/*/cache "${BUNDLE_PATH}"/ruby/*/bundler/gems/*/.git
-EOT
-
-COPY . .
-
-FROM base
-
-ENV PORT=4567
-
-RUN <<EOT
-  addgroup --system --gid 666 kubernaut
-  adduser --system --uid 666 --ingroup kubernaut --shell /bin/bash --disabled-password kubernaut
-EOT
-
-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" ]
--- a/dockerfiles/bookworm.Dockerfile
+++ b/dockerfiles/bookworm.Dockerfile
@ -1,51 +0,0 @@
-ARG RUBY_VERSION="3.4.3"
-FROM docker.io/library/ruby:${RUBY_VERSION}-slim-bookworm AS base
-
-WORKDIR /kubernaut
-
-RUN <<EOT
-  apt-get update -qq
-  rm -rf /var/lib/apt/lists /var/cache/apt/archives
-  gem update --system --no-document
-  gem install -N bundler
-EOT
-
-ENV RACK_ENV="production" \
-  BUNDLE_DEPLOYMENT=true \
-  BUNDLE_PATH="/usr/local/bundle" \
-  BUNDLE_WITHOUT="development test"
-
-FROM base AS build
-
-RUN <<EOT
-  apt-get update -qq
-  apt-get install --yes --no-install-recommends gcc make libc-dev
-  rm -rf /var/lib/apt/lists /var/cache/apt/archives
-EOT
-
-COPY Gemfile Gemfile.lock ./
-
-RUN <<EOT
-  bundle install
-  rm -rf ~/.bundle/ "${BUNDLE_PATH}"/ruby/*/cache "${BUNDLE_PATH}"/ruby/*/bundler/gems/*/.git
-EOT
-
-COPY . .
-
-FROM base
-
-ENV PORT=4567
-
-RUN <<EOT
-  groupadd --system --gid 666 kubernaut
-  useradd --system --uid 666 --gid kubernaut --create-home --shell /bin/bash kubernaut
-EOT
-
-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" ]
--- a/dockerfiles/entrypoint.sh
+++ b/dockerfiles/entrypoint.sh
@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-# output debugging info
-ruby --version
-printf "rubygems %s\n" "$(gem --version)"
-bundle version
-
-exec "${@}"
--- a/kustomize/app/deployment.yaml
+++ b/kustomize/app/deployment.yaml
@ -16,7 +16,7 @@ spec:
    spec:
      containers:
        - name: kubernaut
-          image: git.kill0.net/ryanc/kubernaut:0.2.0
+          image: git.kill0.net/ryanc/kubernaut:latest
          imagePullPolicy: Always
          ports:
            - name: sinatra-web