kube_cluster 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f35a6fb5b6ece5ffc32651a5ad104c896bc8cb80810c80ecb560a22fe0a59eca
-  data.tar.gz: df13e8af081ff1bba21254570f12eef80f82fe2ab47804877e76c0f360c9212c
+  metadata.gz: 143c409d80b81ee281ed0b8a11fcfedc2d1ae76aa15bae26cbf5a6a1e4d820df
+  data.tar.gz: 8866e6cecdca078a5ceb6df8003b3c0433c915bf97ca0b9650e6d0e07a2decd6
 SHA512:
-  metadata.gz: cbfd8728fd22e79cc2429dc503cbba4f931da5d2f36e99d210b189863bdaa9fcf21965b13b1af231029d973dfafc03f1d44dba48f0f51eb07ba3d6597d8dfea1
-  data.tar.gz: 4dd4cec8ee94d15cce4430e6ee1b6a80a5db1e5aa97995b4aa58c3d5180dc9ac7829dbb4d36e9ba2b55c17ec025de097d0622d808dc24ba9e87ee5fadf4a2478
+  metadata.gz: 8d35f3da0f04b39e204a4a2df015ce7723537d7cf08f3cecd30d6a2532ec1cb1ce7005ae00173e7549a6223ce7312b67353e3aa20dc4693fbf1f75f66bb0de43
+  data.tar.gz: 497038c1324cff9eab76b0b15e1ab6e6cd91d88526af313db21bca45387b48efb2b35827f5320be8f13465a2b45c8b2a09880c66e36200ea5dccdcc8762d3863

data/Gemfile.lock

@@ -1,17 +1,16 @@
 PATH
   remote: .
   specs:
-    kube_cluster (0.2.1)
+    kube_cluster (0.3.1)
       kube_kit (> 0)
       kube_kubectl (~> 2.0.0)
-      kube_schema (~> 1.2.0)
+      kube_schema (~> 1.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.3)
     bigdecimal (4.1.2)
-    black_hole_struct (0.1.3)
     date (3.5.1)
     debug (1.11.1)
       irb (~> 1.10)
@@ -37,10 +36,9 @@ GEM
       rubyshell (~> 1.5)
       shellwords (~> 0.2.2)
       string_builder (~> 1.2.0)
-    kube_schema (1.2.3)
-      black_hole_struct (~> 0.1)
-      json_schemer (~> 2.5)
-      rubyshell (~> 1.5)
+    kube_schema (1.3.1)
+      json_schemer (~> 2.5.0)
+      rubyshell (~> 1.5.0)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     minitest (5.27.0)
@@ -83,7 +81,7 @@ GEM
     rubyshell (1.5.0)
     shellwords (0.2.2)
     simpleidn (0.2.3)
-    string_builder (1.2.0)
+    string_builder (1.2.1)
     stringio (3.2.0)
     tsort (0.2.0)
     unicode-display_width (3.2.0)

data/examples/01-basic-redis-pod/manifest.rb

@@ -1,9 +1,9 @@
 require "bundler/setup"
-require "kube/schema"
+require "kube/cluster"
 
 class RedisPod < Kube::Cluster['Pod']
   def initialize(container_name: 'my-redis-container', **options, &block)
-    super {
+    super(**options) {
       spec.containers = [
         {
           name: container_name,

data/examples/02-manifest-with-middleware/manifest.rb

@@ -1,37 +1,37 @@
+require "bundler/setup"
+require "kube/cluster"
+
+APP_NAME        = "my-app"
+FULLNAME        = "my-app"
+IMAGE           = "my-app:latest"
+MATCH_LABELS    = { app: APP_NAME }
+STANDARD_LABELS = { app: APP_NAME, version: "1.0" }
+RESOURCES       = { requests: { cpu: "100m", memory: "128Mi" }, limits: { cpu: "500m", memory: "256Mi" } }
+
 require_relative 'templates/config_map'
 require_relative 'templates/deployment'
 require_relative 'templates/ingress'
 require_relative 'templates/service'
 require_relative 'templates/horizontal_pod_autoscaler'
 
-require_relative 'middlware/labels'
-require_relative 'middlware/namespace'
+require_relative 'middleware/labels'
+require_relative 'middleware/namespace'
 
-class MyApp < Kube::Schema::Manifest
-  stack do
-    use Middleware::Namespace
-    use Middleware::Labels
-  end
-end
+namespace = APP_NAME
 
-puts MyApp.new(
-  Templates::ConfigMap.new {
-    # no overrides today
-  },
+manifest = Kube::Cluster::Manifest.new(
+  ConfigMap.new(namespace: namespace),
+  Deployment.new(namespace: namespace),
+  Ingress.new(namespace: namespace),
+  Service.new(namespace: namespace),
+  HorizontalPodAutoscaler.new(namespace: namespace),
+)
 
-  Templates::Deployment.new {
-    # no overrides today
-  },
-
-  Templates::Ingress.new {
-    # no overrides today
-  },
+stack = Kube::Cluster::Middleware::Stack.new do
+  use Middleware::Namespace
+  use Middleware::Labels
+end
 
-  Templates::Service.new {
-    # no overrides today
-  },
+stack.call(manifest)
 
-  Templates::HorizontalPodScaler.new {
-    # no overrides today
-  },
-).to_yaml
+puts manifest.to_yaml

data/examples/02-manifest-with-middleware/middleware/labels.rb

@@ -1,4 +1,4 @@
 module Middleware
-  class Labels < Kube::Cluster::Manifest::Middleware
+  class Labels < Kube::Cluster::Middleware
   end
 end

data/examples/02-manifest-with-middleware/middleware/namespace.rb

@@ -1,4 +1,4 @@
 module Middleware
-  class Namespace < Kube::Cluster::Manifest::Middleware
+  class Namespace < Kube::Cluster::Middleware
   end
 end

data/examples/02-manifest-with-middleware/templates/config_map.rb

@@ -1,12 +1,12 @@
 class ConfigMap < Kube::Cluster["ConfigMap"]
   def initialize(namespace:)
-    build {
+    super {
       metadata.name = "#{namespace}-config"
       spec.data = {
-        RAILS_ENV:     "production",
-        LOG_LEVEL:     "info",
-        WORKERS:       "4",
-        PORT:          "3000",
+        "RAILS_ENV": "production",
+        "LOG_LEVEL": "info",
+        "WORKERS":   "4",
+        "PORT":      "3000",
       }
     }
   end

data/examples/02-manifest-with-middleware/templates/deployment.rb

@@ -1,6 +1,6 @@
 class Deployment < Kube::Cluster["Deployment"]
   def initialize(namespace:)
-    build {
+    super {
       metadata.name = namespace
 
       spec.replicas = 3

data/examples/02-manifest-with-middleware/templates/horizontal_pod_autoscaler.rb

@@ -1,6 +1,6 @@
 class HorizontalPodAutoscaler < Kube::Cluster["HorizontalPodAutoscaler"]
   def initialize(namespace:)
-    build {
+    super {
       metadata.name = namespace
 
       spec.scaleTargetRef.apiVersion = "apps/v1"

data/examples/02-manifest-with-middleware/templates/ingress.rb

@@ -1,6 +1,6 @@
 class Ingress < Kube::Cluster["Ingress"]
   def initialize(namespace:)
-    build {
+    super {
       metadata.name = namespace
       metadata.annotations = {
         "cert-manager.io/cluster-issuer": "letsencrypt-prod",

data/examples/02-manifest-with-middleware/templates/service.rb

@@ -1,6 +1,6 @@
 class Service < Kube::Cluster["Service"]
   def initialize(namespace:)
-    build {
+    super {
       metadata.name = namespace
 
       spec.selector = MATCH_LABELS

data/kube_cluster.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rubocop", "~> 1.21"
 
-  spec.add_dependency "kube_schema", "~> 1.2.0"
+  spec.add_dependency "kube_schema", "~> 1.3.0"
   spec.add_dependency "kube_kit", "> 0"
   spec.add_dependency "kube_kubectl", "~> 2.0.0"
 end

data/lib/kube/cluster/resource/dirty_tracking.rb

@@ -94,7 +94,7 @@ module Kube
                 if current[key] == original[key]
                   next
                 else
-                  hash[key] = [original[key], current[key]]
+                  hash[key] = [deep_dup(original[key]), deep_dup(current[key])]
                 end
               end
             end

data/lib/kube/cluster/resource/persistence.rb

@@ -46,7 +46,7 @@ module Kube
             tap do
               kubectl("get", resource_type, name, *ns_flags, "-o", "json").then do |json|
                 JSON.parse(json).then do |hash|
-                  @data = BlackHoleStruct.new(hash)
+                  @data = deep_symbolize_keys(hash)
                   snapshot!
                 end
               end

data/lib/kube/cluster/version.rb

@@ -2,6 +2,6 @@
 
 module Kube
   module Cluster
-    VERSION = "0.3.0"
+    VERSION = "0.3.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kube_cluster
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Nathan K
@@ -57,14 +57,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: kube_kit
   requirement: !ruby/object:Gem::Requirement