kdep 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f292fc84fbd868827a225e5a63ec7ef74949f954216c69fd6eac1fb8d431f7ff
-  data.tar.gz: b3486a1fc6c39ed310d0cf4a138421fcbbf46b2d7b31deb59f403d5d37c62e5c
+  metadata.gz: 661f22197841e0bcfd4ff7089399ab62efbd428b5aec5b8bae914f5fd80d63a4
+  data.tar.gz: 2671d06e5e5e71b3ba1842d5d58e172674c819a20ecce554f47d80a0d58798c1
 SHA512:
-  metadata.gz: 9c5521c97e1c89ab7bd74f94967d735dca9d46e497dbeaa788274138ebe45ce6c28e4f8ecd24bfb1d2a9180ed995e3713bc488c23793b40154b7d98b38f4c71d
-  data.tar.gz: cb3a4a8b54be7f2852396207eab1971c47f2922b30878f8d26d2b4625e3cb130a5408d6eaa78e1ad06b815e9ac009c4719e992ffad9c18fc9432ee0525df4518
+  metadata.gz: 02bb2c68ba2fc5a08746214c2b163d7fa8d51fb220853e2facd17b3af86c62cd36c1b9e5f95e77e5ee18cc345b4ad97a8874af8764f87f49e4f22aa3c8b78651
+  data.tar.gz: f9e32dff02c9061d0f00aea72980d1e8fe1687a29f68e48faa72e11eee4f13758e32e0ee6fcede71357bf44778d2ad045537d06eec6ab4c7512a84d5074da8c2

data/lib/kdep/commands/build.rb

@@ -42,6 +42,11 @@ module Kdep
         # Load config
         config = Kdep::Config.new(deploy_dir, env).load
 
+        if config["build"] == false
+          @ui.error("#{deploy_dir} declares `build: false` — its image is built elsewhere, so there is nothing to build here.")
+          exit 1
+        end
+
         # Resolve tag from state.yml — app.yml has no tag field by design;
         # state.yml is the source of truth for the last bumped version.
         tag = Kdep::State.tag(deploy_dir)

data/lib/kdep/commands/bump.rb

@@ -59,8 +59,13 @@ module Kdep
         if preset == "helm"
           run_helm_pipeline(deploy_dir, env)
           return
-        elsif preset == "custom"
-          run_custom_pipeline(deploy_dir, config, kdep_dir, env)
+        elsif preset == "custom" || config["build"] == false
+          # `build: false` marks a target whose image is built elsewhere
+          # (upstream images: elasticsearch, fluentd, curator...). It takes the
+          # same no-docker route as `custom`, but keeps its own preset's
+          # resource list -- the point is to reuse web/worker/statefulset/etc
+          # without a Dockerfile. Its tag comes from app.yml, not state.yml.
+          run_no_build_pipeline(deploy_dir, config, kdep_dir, env)
           return
         end
 
@@ -229,8 +234,11 @@ module Kdep
         helm_install.execute
       end
 
-      # Feature E: custom-preset bump = render + apply, no docker, no state.
-      def run_custom_pipeline(deploy_dir, config, kdep_dir, env = nil)
+      # Feature E: bump with no image to build = render + apply, no docker, no
+      # state.yml. Used by the `custom` preset and by any preset with
+      # `build: false`; the only difference is which resource list is rendered,
+      # which is why this reads config["preset"] instead of hardcoding one.
+      def run_no_build_pipeline(deploy_dir, config, kdep_dir, env = nil)
         # Context guard for safety.
         begin
           Kdep::ContextGuard.new(config["context"]).validate!
@@ -246,7 +254,7 @@ module Kdep
         writer = Kdep::Writer.new(output_dir)
         writer.clean
         renderer = Kdep::Renderer.new(config, deploy_dir, env: env)
-        preset_resources = Kdep::Preset.new("custom", deploy_dir).resources
+        preset_resources = Kdep::Preset.new(config["preset"], deploy_dir).resources
 
         preset_resources.each_with_index do |resource, idx|
           content = renderer.render_resource(resource)

data/lib/kdep/commands/push.rb

@@ -41,6 +41,11 @@ module Kdep
         # Load config
         config = Kdep::Config.new(deploy_dir, env).load
 
+        if config["build"] == false
+          @ui.error("#{deploy_dir} declares `build: false` — its image lives in an upstream registry, so there is nothing to push.")
+          exit 1
+        end
+
         # Resolve tag from state.yml — app.yml has no tag field by design;
         # state.yml is the source of truth for the last bumped version.
         tag = Kdep::State.tag(deploy_dir)

data/lib/kdep/defaults.rb

@@ -13,6 +13,9 @@ module Kdep
       "cronjob" => {},
       "statefulset" => {},
       "statefulset_svc" => {},
+      # No replicas override: a DaemonSet has no replicas field at all, so the
+      # BASE_DEFAULTS value is simply never read by daemonset.yml.erb.
+      "daemonset" => {},
       "helm"    => {},
       "custom"  => {},
     }.freeze

data/lib/kdep/preset.rb

@@ -1,6 +1,6 @@
 module Kdep
   class Preset
-    BUILT_IN = %w[web worker job cronjob statefulset statefulset_svc helm custom].freeze
+    BUILT_IN = %w[web worker job cronjob statefulset statefulset_svc daemonset helm custom].freeze
 
     def initialize(preset_name, deploy_dir)
       raise "preset: is required in app.yml" if preset_name.to_s.strip.empty?

data/lib/kdep/version.rb

@@ -1,3 +1,3 @@
 module Kdep
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end

data/templates/presets/daemonset

@@ -0,0 +1,5 @@
+# daemonset preset: one pod per node (log shippers, node exporters, agents)
+# Order determines kubectl apply sequence
+configmap
+secret
+daemonset

data/templates/resources/daemonset.yml.erb

@@ -0,0 +1,120 @@
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: <%= @config["daemonset_name"] || name %>
+  namespace: <%= namespace %>
+  labels:
+    app: <%= name %>
+spec:
+  selector:
+    matchLabels:
+      app: <%= name %>
+  template:
+    metadata:
+      labels:
+        app: <%= name %>
+<% if @config["pod_labels"] -%>
+<% @config["pod_labels"].each do |k, v| -%>
+        <%= k %>: "<%= v %>"
+<% end -%>
+<% end -%>
+    spec:
+<% if @config["service_account_name"] -%>
+      serviceAccountName: <%= @config["service_account_name"] %>
+<% end -%>
+<% if @config["host_network"] -%>
+      hostNetwork: <%= @config["host_network"] %>
+<% end -%>
+<% if @config["termination_grace_period"] -%>
+      terminationGracePeriodSeconds: <%= @config["termination_grace_period"] %>
+<% end -%>
+<% if @config["node_selector"] -%>
+      nodeSelector:
+<%= @config["node_selector"].to_yaml.sub("---\n", "").gsub(/^/, "        ").rstrip %>
+<% end -%>
+<% if @config["tolerations"] -%>
+<%# DaemonSets routinely need to land on control-plane/tainted nodes. -%>
+      tolerations:
+<%= @config["tolerations"].to_yaml.sub("---\n", "").gsub(/^/, "        ").rstrip %>
+<% end -%>
+<% if @config["image_pull_secrets"] -%>
+      imagePullSecrets:
+        - name: <%= @config["image_pull_secrets"] %>
+<% end -%>
+<% if @config["init_containers"] -%>
+      initContainers:
+<%= @config["init_containers"].to_yaml.sub("---\n", "").gsub(/^/, "        ").rstrip %>
+<% end -%>
+      containers:
+        - name: <%= @config["container_name"] || name %>
+          image: <%= image_ref %>
+<% if @config["image_pull_policy"] -%>
+          imagePullPolicy: <%= @config["image_pull_policy"] %>
+<% end -%>
+<% if @config["command"] -%>
+          command: <%= @config["command"].is_a?(Array) ? @config["command"].inspect : "[\"#{@config["command"]}\"]" %>
+<% end -%>
+<% if @config["args"] -%>
+          args: <%= @config["args"].is_a?(Array) ? @config["args"].inspect : "[\"#{@config["args"]}\"]" %>
+<% end -%>
+<% if @config["port"] -%>
+          ports:
+            - containerPort: <%= port %>
+<% if @config["container_port_protocol"] -%>
+              protocol: <%= @config["container_port_protocol"] %>
+<% end -%>
+<% end -%>
+<% if @config["security_context"] -%>
+          securityContext:
+<%= @config["security_context"].to_yaml.sub("---\n", "").gsub(/^/, "            ").rstrip %>
+<% end -%>
+<% if @config["resources"] -%>
+          resources:
+<% if @config["resources"]["requests"] -%>
+            requests:
+<% @config["resources"]["requests"].each do |k, v| -%>
+              <%= k %>: <%= v.is_a?(Numeric) ? v : "\"#{v}\"" %>
+<% end -%>
+<% end -%>
+<% if @config["resources"]["limits"] -%>
+            limits:
+<% @config["resources"]["limits"].each do |k, v| -%>
+              <%= k %>: <%= v.is_a?(Numeric) ? v : "\"#{v}\"" %>
+<% end -%>
+<% end -%>
+<% end -%>
+<% if @config["volume_mounts"] -%>
+          volumeMounts:
+<% @config["volume_mounts"].each do |vm| -%>
+            - name: <%= vm["name"] %>
+              mountPath: <%= vm["mountPath"] %>
+<% if vm["readOnly"] -%>
+              readOnly: <%= vm["readOnly"] %>
+<% end -%>
+<% if vm["subPath"] -%>
+              subPath: <%= vm["subPath"] %>
+<% end -%>
+<% end -%>
+<% end -%>
+<% if @config["container_env"] -%>
+<%# Named container_env, not env: `env:` is a backward-compat alias for -%>
+<%# `configmap:` (see Config#apply_defaults), so it never reaches a template. -%>
+          env:
+<%= @config["container_env"].to_yaml.sub("---\n", "").gsub(/^/, "            ").rstrip %>
+<% end -%>
+          envFrom:
+<% env_from_list = @config["env_from"] || ["configmap/config-#{name}", "secret/secret-#{name}"] -%>
+<% env_from_list.each do |ref| -%>
+<%   type, ref_name = ref.split("/", 2) -%>
+<% if type == "configmap" -%>
+            - configMapRef:
+                name: <%= ref_name %>
+<% elsif type == "secret" -%>
+            - secretRef:
+                name: <%= ref_name %>
+<% end -%>
+<% end -%>
+<% if @config["volumes"] -%>
+      volumes:
+<%= @config["volumes"].to_yaml.sub("---\n", "").gsub(/^/, "        ").rstrip %>
+<% end -%>

data/templates/resources/statefulset.yml.erb

@@ -27,6 +27,10 @@ spec:
 <% if @config["image_pull_secrets"] -%>
       imagePullSecrets:
         - name: <%= @config["image_pull_secrets"] %>
+<% end -%>
+<% if @config["init_containers"] -%>
+      initContainers:
+<%= @config["init_containers"].to_yaml.sub("---\n", "").gsub(/^/, "        ").rstrip %>
 <% end -%>
       containers:
         - name: <%= @config["container_name"] || name %>
@@ -106,6 +110,12 @@ spec:
               subPath: <%= vm["subPath"] %>
 <% end -%>
 <% end -%>
+<% end -%>
+<% if @config["container_env"] -%>
+<%# Named container_env, not env: `env:` is a backward-compat alias for -%>
+<%# `configmap:` (see Config#apply_defaults), so it never reaches a template. -%>
+          env:
+<%= @config["container_env"].to_yaml.sub("---\n", "").gsub(/^/, "            ").rstrip %>
 <% end -%>
           envFrom:
 <% env_from_list = @config["env_from"] || ["configmap/config-#{name}", "secret/secret-#{name}"] -%>
@@ -123,3 +133,9 @@ spec:
       volumes:
 <%= @config["volumes"].to_yaml.sub("---\n", "").gsub(/^/, "        ").rstrip %>
 <% end -%>
+<% if @config["volume_claim_templates"] -%>
+<%# Sibling of `template:`, not part of the pod spec -- this is the one field -%>
+<%# that makes a StatefulSet a StatefulSet, so it belongs in the built-in. -%>
+  volumeClaimTemplates:
+<%= @config["volume_claim_templates"].to_yaml.sub("---\n", "").gsub(/^/, "    ").rstrip %>
+<% end -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kdep
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Leadfy
@@ -42,14 +42,14 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
@@ -150,6 +150,7 @@ files:
 - templates/init/secrets.yml
 - templates/presets/cronjob
 - templates/presets/custom
+- templates/presets/daemonset
 - templates/presets/helm
 - templates/presets/job
 - templates/presets/statefulset
@@ -158,6 +159,7 @@ files:
 - templates/presets/worker
 - templates/resources/configmap.yml.erb
 - templates/resources/cronjob.yml.erb
+- templates/resources/daemonset.yml.erb
 - templates/resources/deployment.yml.erb
 - templates/resources/helm_ingress.yml.erb
 - templates/resources/infisical_secret.yml.erb