remove secret from Kustomize

.devcontainer/Dockerfile

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

Gemfile

@@ -9,7 +9,6 @@ gem "ksuid"
 gem "nanoid"
 gem "ulid"
 gem "uuid7"
-gem "cuid2"
 
 gem "jwt"
 gem "httparty"

Gemfile.lock

@@ -3,26 +3,25 @@ GEM
   specs:
     anyflake (0.0.1)
     ast (2.4.3)
-    base64 (0.3.0)
+    base64 (0.2.0)
-    bigdecimal (3.2.2)
+    bigdecimal (3.1.9)
-    csv (3.3.5)
+    csv (3.3.4)
-    cuid2 (1.0.1)
+    diff-lcs (1.6.1)
-    diff-lcs (1.6.2)
     httparty (0.23.1)
       csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    json (2.12.2)
+    json (2.11.3)
-    jwt (3.1.1)
+    jwt (2.10.1)
       base64
     ksuid (1.0.0)
-    language_server-protocol (3.17.0.5)
+    language_server-protocol (3.17.0.4)
     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.2)
+    multi_xml (0.7.1)
       bigdecimal (~> 3.1)
     mustermann (3.0.3)
       ruby2_keywords (~> 0.0.1)
@@ -36,35 +35,35 @@ GEM
     puma (6.6.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.1.16)
+    rack (3.1.13)
     rack-protection (4.1.1)
       base64 (>= 0.1.0)
       logger (>= 1.6.0)
       rack (>= 3.0.0, < 4)
-    rack-session (2.1.1)
+    rack-session (2.1.0)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)
     rack-test (2.2.0)
       rack (>= 1.3)
     rainbow (3.1.1)
-    rake (13.3.0)
+    rake (13.2.1)
-    rbs (3.9.4)
+    rbs (3.9.2)
       logger
     regexp_parser (2.10.0)
-    rspec (3.13.1)
+    rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.5)
+    rspec-core (3.13.3)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.5)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.5)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.4)
+    rspec-support (3.13.2)
-    rubocop (1.75.8)
+    rubocop (1.75.4)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -75,17 +74,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.44.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.24.2)
+    ruby-lsp (0.23.15)
       language_server-protocol (~> 3.17.0)
       prism (>= 1.2, < 2.0)
-      rbs (>= 3, < 5)
+      rbs (>= 3, < 4)
       sorbet-runtime (>= 0.5.10782)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
@@ -102,11 +101,11 @@ GEM
       rack-protection (= 4.1.1)
       sinatra (= 4.1.1)
       tilt (~> 2.0)
-    sorbet-runtime (0.5.12204)
+    sorbet-runtime (0.5.12043)
-    standard (1.50.0)
+    standard (1.49.0)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.75.5)
+      rubocop (~> 1.75.2)
       standard-custom (~> 1.0.0)
       standard-performance (~> 1.8)
     standard-custom (1.0.2)
@@ -122,7 +121,7 @@ GEM
     unicode-emoji (4.0.4)
     uuid7 (0.2.0)
       zeitwerk (~> 2.4)
-    zeitwerk (2.7.3)
+    zeitwerk (2.7.2)
 
 PLATFORMS
   ruby
@@ -130,7 +129,6 @@ PLATFORMS
 
 DEPENDENCIES
   anyflake
-  cuid2
   httparty
   jwt
   ksuid
@@ -148,4 +146,4 @@ DEPENDENCIES
   uuid7
 
 BUNDLED WITH
-   2.6.9
+   2.6.8

app.rb

@@ -21,9 +21,11 @@ $LOAD_PATH.unshift File.dirname(__FILE__) + "/lib"
 
 require "config"
 
-VERSION = "0.2.3"
+VERSION = "0.2.1"
 
 CHUNK_SIZE = 1024**2
+SESSION_SECRET_HEX_LENGTH = 64
+JWT_SECRET_HEX_LENGTH = 64
 DEFAULT_FLAKEY = 50
 
 NAME = "kubernaut".freeze
@@ -444,13 +446,7 @@ end
 
 get "/_cat/env" do
   stream do |out|
-    e = if params.key? :rack
+    ENV.sort.each do |k, v|
-      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.3
+version: 0.2.1
 
 # 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.1"

docker-bake.hcl

@@ -7,7 +7,7 @@ target "docker-metadata-action-alpine" {}
 
 target "_common" {
     args = {
-        RUBY_VERSION = "3.4.4"
+        RUBY_VERSION = "3.4.3"
     }
 }
 

dockerfiles/alpine.Dockerfile

@@ -1,4 +1,4 @@
-ARG RUBY_VERSION="3.4.4"
+ARG RUBY_VERSION="3.4.3"
 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.3"
 ARG BASE_REGISTRY="docker.io"
 ARG DEBIAN_VERSION="bookworm"
 FROM ${BASE_REGISTRY}/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} AS base

kustomize/app/deployment.yaml

@@ -16,24 +16,18 @@ spec:
     spec:
       containers:
         - name: kubernaut
-          image: git.kill0.net/ryanc/kubernaut:0.2.3
+          image: git.kill0.net/ryanc/kubernaut:0.2.1
-          imagePullPolicy: IfNotPresent
+          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/kustomization.yaml

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

kustomize/memcached/deployment.yaml

@@ -0,0 +1,21 @@
+---
+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

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

kustomize/memcached/services.yaml

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

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