kube_cluster 0.17.0 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7b1fa07c1c7e080961d17a281c4b2c8a6e84abc6cc9d4ae6c568415b2e989ae
-  data.tar.gz: 80994ba308efe68700f925dff182abf89908a55b1d35224c75eb577d7a42485c
+  metadata.gz: 928086733f7475611aa69193643f88719d926b70bb4aa3ed9d8a1c8f27efdec7
+  data.tar.gz: 3cc456aa515c6ca51fd87f26d35b2fcc740d984f8d907385a9f4b46bfc273a1c
 SHA512:
-  metadata.gz: ac7da1390a3fedf1973a709b0ce5547ee99590d68dfdf46686d4fcf64e237b3a37e86f27b3dfc1350ef22bd264828d4c13705b79e05e6abc1f5ac20ae2cd8364
-  data.tar.gz: 96154be98c24b04e56a49c2c6a4df93b94fe67bfa8b79c754c62e543187a7083418815049e05a47db516b16d58db91e2e9dc649a46f9d04243219c28af87df27
+  metadata.gz: 9fb588b0b214cad46930473827384993fb0577d9997ae1a60a2a5e808eb23a792697d95e877d31e959661322b7adf1c2c31ecaf41cc7a910e132ad728f31bab4
+  data.tar.gz: 240eb7a87911cb284cd6fc2526608f843dadfee100f25b7b9611e6a27531d440604ae9c7b1d8586b26b5b926292c01f98ffd97e64c51659c0bad983629322e41

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kube_cluster (0.17.0)
+    kube_cluster (0.17.1)
       activesupport (~> 8.0)
       kube_kubectl (~> 2.0)
       kube_schema (~> 1.7)

data/lib/kube/cluster/standard/deployment_with_service.rb

@@ -73,7 +73,7 @@ module Kube
 
           instance_exec(&block) if block
 
-          _apply_limits(deployment)
+          deployment = _apply_limits(deployment)
           _apply_probes(deployment)
         end
 
@@ -88,7 +88,7 @@ module Kube
         private
 
         def _apply_limits(deployment)
-          return if @_limits.empty?
+          return deployment if @_limits.empty?
 
           container = deployment.to_h[:spec][:template][:spec][:containers][0]
           resources = {}
@@ -108,12 +108,12 @@ module Kube
           container[:resources] = resources
           h = deployment.to_h
           h[:spec][:template][:spec][:containers][0] = container
-          deployment.rebuild(h)
+          _replace(deployment, deployment.rebuild(h))
         end
 
         def _apply_probes(deployment)
-          return if @_probes.empty?
-          return unless @_probes[:url]
+          return deployment if @_probes.empty?
+          return deployment unless @_probes[:url]
 
           container = deployment.to_h[:spec][:template][:spec][:containers][0]
           url = @_probes[:url]
@@ -140,7 +140,14 @@ module Kube
 
           h = deployment.to_h
           h[:spec][:template][:spec][:containers][0] = container
-          deployment.rebuild(h)
+          _replace(deployment, deployment.rebuild(h))
+        end
+
+        # rebuild returns a new resource; swap it into this manifest so the
+        # change actually lands in the rendered output.
+        def _replace(old, rebuilt)
+          @resources[@resources.index(old)] = rebuilt
+          rebuilt
         end
       end
     end
@@ -175,5 +182,63 @@ test do
       yaml.include?("stdin: true").should == true
       yaml.include?("tty: true").should == true
     end
+
+    it "renders limits from the block DSL" do
+      yaml = Kube::Cluster::Standard::DeploymentWithService
+        .new(
+          name: "limited",
+          image: "ruby/ruby",
+          port: 3000,
+        ) {
+          limits.cpu    = { "500m" => Float::INFINITY }
+          limits.memory = { "1Gi" => "2Gi" }
+        }
+        .to_yaml
+
+      yaml.include?("cpu: 500m").should == true
+      yaml.include?("memory: 1Gi").should == true
+      yaml.include?("memory: 2Gi").should == true
+      # Infinity means request-only — no cpu limit is emitted.
+      yaml.scan(/cpu:/).length.should == 1
+    end
+
+    it "renders probes from the block DSL" do
+      yaml = Kube::Cluster::Standard::DeploymentWithService
+        .new(
+          name: "probed",
+          image: "ruby/ruby",
+          port: 3000,
+        ) {
+          probes.url       = { path: "/healthz", port: "http" }
+          probes.liveness  = { 120 => 30 }
+          probes.readiness = { 60 => 10 }
+        }
+        .to_yaml
+
+      yaml.include?("livenessProbe").should == true
+      yaml.include?("readinessProbe").should == true
+      yaml.include?("path: \"/healthz\"").should == true
+      yaml.include?("initialDelaySeconds: 120").should == true
+      yaml.include?("initialDelaySeconds: 60").should == true
+    end
+
+    it "renders limits and probes together" do
+      yaml = Kube::Cluster::Standard::DeploymentWithService
+        .new(
+          name: "both",
+          image: "ruby/ruby",
+          port: 3000,
+        ) {
+          limits.memory    = { "1Gi" => "2Gi" }
+          probes.url       = { path: "/healthz", port: "http" }
+          probes.readiness = { 5 => 5 }
+        }
+        .to_yaml
+
+      # The probe pass must not clobber the limits pass (each rebuilds the
+      # deployment; the second must start from the first's result).
+      yaml.include?("memory: 2Gi").should == true
+      yaml.include?("readinessProbe").should == true
+    end
   end
 end

data/lib/kube/cluster/version.rb

@@ -2,6 +2,6 @@
 
 module Kube
   module Cluster
-    VERSION = "0.17.0"
+    VERSION = "0.17.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kube_cluster
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.1
 platform: ruby
 authors:
 - Nathan K