kube_cluster 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cfe0887eeac1f4f52fc6f4f9730e5db9dacc66e132765301380d2a16933ebe7
-  data.tar.gz: 9ab9e7350e92274bc4f4ba73f5ffc025d18035a87fee5ed2a1c1d29e1e9dfc5b
+  metadata.gz: 0f1c23db70574ae658780a8fcdcaefa84a23b917f206cce85749c84739ccd8c1
+  data.tar.gz: bd673c8ab74f4a2c6c046d27e40994cd7a819ad6e552b5a98e14fc1974f52bcc
 SHA512:
-  metadata.gz: 4d2f96411424735612533763d8e79430bcc52792399732de0b06ab9e9a5f07e3ec3329ffd04a479353d050753e404b6b0d66dbb920a26cc2f985a066dad10751
-  data.tar.gz: aff4fe39dabe60aee449c15e57656c7deaf33e73de8bbbc5a046186bec2fe6c79370e024ae86a4acb8f5b00218515a41bbf5fcf0468a56a8352474a8b6c5885f
+  metadata.gz: 49d328773bd999a1270386fec416f6a4afa0aa88d8fe6fe51e42af84e134154ac80b0220426c7be1b45e534ab2c164dc5ff22a9c0208f2d623c67aaba1be621e
+  data.tar.gz: fe000f50ed0f0b55a2b4efedc4fbedbf0bfcbf61039b64dd8584384cd0cf317d31e8b8db2d1bb79ae1b46dffcd6165ce27835d57cd5a9b86fbabdf976675dd21

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kube_cluster (0.6.0)
+    kube_cluster (0.7.0)
       kube_kubectl (~> 2.0)
       kube_schema (~> 1.5)
       scampi (~> 0.1)

data/lib/kube/cluster/standard/cloud_native_pg/helm.rb

@@ -30,7 +30,7 @@ module Kube
           # class Cluster < Kube::Cluster["HelmChart"]
           #   def initialize(&block)
           #     super {
-          #       metadata.name = "cloudnative-pg"
+          #       metadata.name = "cloudnative-pg--cluster"
           #       metadata.namespace = "kube-system"
           #       spec.chart = "cluster"
           #       spec.version = "0.6.1"
@@ -46,7 +46,7 @@ module Kube
           class Barman < Kube::Cluster["HelmChart"]
             def initialize(&block)
               super {
-                metadata.name = "cloudnative-pg"
+                metadata.name = "plugin-barman-cloud"
                 metadata.namespace = "kube-system"
                 spec.chart = "plugin-barman-cloud"
                 spec.version = "0.6.0"
@@ -65,27 +65,33 @@ module Kube
 end
 
 test do
-  it "Operator initializes without error" do
-    Kube::Cluster::Standard::CloudNativePg::Helm::Operator
-      .new()
-      .to_yaml
-      .is_a?(String)
-      .should == true
+  describe "Operator" do
+    it "initializes without error" do
+      Kube::Cluster::Standard::CloudNativePg::Helm::Operator
+        .new()
+        .to_yaml
+        .is_a?(String)
+        .should == true
+    end
   end
 
-  # it "Cluster initializes without error" do
-  #   Kube::Cluster::Standard::CloudNativePg::Helm::Cluster
-  #     .new()
-  #     .to_yaml
-  #     .is_a?(String)
-  #     .should == true
-  # end
+  #describe "Cluster" do
+  #  it "initializes without error" do
+  #    Kube::Cluster::Standard::CloudNativePg::Helm::Cluster
+  #      .new()
+  #      .to_yaml
+  #      .is_a?(String)
+  #      .should == true
+  #  end
+  #end
 
-  it "Barman initializes without error" do
-    Kube::Cluster::Standard::CloudNativePg::Helm::Barman
-      .new()
-      .to_yaml
-      .is_a?(String)
-      .should == true
+  describe "Barman" do
+    it "initializes without error" do
+      Kube::Cluster::Standard::CloudNativePg::Helm::Barman
+        .new()
+        .to_yaml
+        .is_a?(String)
+        .should == true
+    end
   end
 end

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

@@ -0,0 +1,152 @@
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "kube/cluster"
+
+module Kube
+  module Cluster
+    module Standard
+      class DeploymentWithService < Kube::Cluster::Manifest
+        def initialize(
+          name:,
+          image:,
+          port:,
+          namespace: 'default',
+          env: {},
+          security_context: nil,
+          pod_security_context: nil,
+          volume_mounts: {},
+          service_port: nil,
+          &block
+        )
+          @_limits = {}
+          @_probes = {}
+
+          processed_env     = EnvProcessing.process(env)
+          processed_volumes = VolumeProcessing.process(volume_mounts)
+
+          service_ports = Array(service_port || port)
+
+          service = Kube::Cluster::Standard::Service.new(
+            name: name,
+            namespace: namespace,
+            ports: service_ports
+          )
+
+          deployment = Kube::Cluster['Deployment'].new do
+            metadata.name = name
+            metadata.namespace = namespace
+            metadata.labels = { 'app' => name }
+
+            spec.replicas = 1
+            spec.selector.matchLabels = { 'app' => name }
+
+            spec.template.metadata.labels = { 'app' => name }
+            spec.template.spec.securityContext = pod_security_context if pod_security_context
+
+            container = {
+              name: name,
+              image: image,
+              ports: [{ name: 'http', containerPort: port, protocol: 'TCP' }],
+              env: processed_env
+            }
+            container[:securityContext] = security_context if security_context
+            container[:volumeMounts] = processed_volumes[:volume_mounts] unless processed_volumes[:volume_mounts].empty?
+
+            spec.template.spec.containers = [container]
+            spec.template.spec.volumes = processed_volumes[:volumes] unless processed_volumes[:volumes].empty?
+          end
+
+          super(deployment, service)
+
+          instance_exec(&block) if block
+
+          _apply_limits(deployment)
+          _apply_probes(deployment)
+        end
+
+        def limits
+          @_limits
+        end
+
+        def probes
+          @_probes
+        end
+
+        private
+
+        def _apply_limits(deployment)
+          return if @_limits.empty?
+
+          container = deployment.to_h[:spec][:template][:spec][:containers][0]
+          resources = {}
+
+          @_limits.each do |resource_type, mapping|
+            mapping.each do |request, limit|
+              resources[:requests] ||= {}
+              resources[:requests][resource_type] = request.to_s
+
+              if limit != Float::INFINITY
+                resources[:limits] ||= {}
+                resources[:limits][resource_type] = limit.to_s
+              end
+            end
+          end
+
+          container[:resources] = resources
+          h = deployment.to_h
+          h[:spec][:template][:spec][:containers][0] = container
+          deployment.rebuild(h)
+        end
+
+        def _apply_probes(deployment)
+          return if @_probes.empty?
+          return unless @_probes[:url]
+
+          container = deployment.to_h[:spec][:template][:spec][:containers][0]
+          url = @_probes[:url]
+
+          if @_probes[:liveness]
+            delay, period = @_probes[:liveness].first
+            container[:livenessProbe] = {
+              httpGet: url,
+              initialDelaySeconds: delay,
+              periodSeconds: period,
+              timeoutSeconds: 5
+            }
+          end
+
+          if @_probes[:readiness]
+            delay, period = @_probes[:readiness].first
+            container[:readinessProbe] = {
+              httpGet: url,
+              initialDelaySeconds: delay,
+              periodSeconds: period,
+              timeoutSeconds: 5
+            }
+          end
+
+          h = deployment.to_h
+          h[:spec][:template][:spec][:containers][0] = container
+          deployment.rebuild(h)
+        end
+      end
+    end
+  end
+end
+
+test do
+  describe "DeploymentWithService" do
+    it "initializes without error" do
+      Kube::Cluster::Standard::DeploymentWithService
+        .new(
+          name: "pointless-ruby-container",
+          image: "ruby/ruby",
+          port: 3000,
+        )
+        .to_yaml
+        .is_a?(String)
+        .should == true
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "kube/cluster"
+
+module Kube
+  module Cluster
+    module Standard
+      module EnvProcessing
+        # Convert an env hash into a Kubernetes env array.
+        #
+        # String/numeric values become plain env vars:
+        #   "FOO" => "bar"  =>  { name: "FOO", value: "bar" }
+        #
+        # ExternalSecret::TemplateRef values become secretKeyRef env vars
+        # and register the template entry on the ExternalSecret:
+        #   "FOO" => secret.template("{{ .bar }}")
+        #     =>  { name: "FOO", valueFrom: { secretKeyRef: { name: "secret-name", key: "FOO" } } }
+        #
+        def self.process(env)
+          return env if env.is_a?(Array)
+          return [] if env.nil?
+
+          env.map do |key, value|
+            key = key.to_s
+
+            if value.is_a?(ExternalSecret::TemplateRef)
+              value.secret.register_template!(key, value.template_value)
+              { name: key, valueFrom: { secretKeyRef: { name: value.secret.secret_name, key: key } } }
+            else
+              { name: key, value: value.to_s }
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+test do
+  # no op
+end

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "kube/cluster"
+
+module Kube
+  module Cluster
+    module Standard
+      class Secret < Kube::Cluster["Secret"]
+        def initialize(name:, **data, &block)
+          super() {
+            metadata.name = name
+            data.each { |k, v| stringData[k.to_s] = v }
+            instance_exec(&block) if block_given?
+          }
+        end
+      end
+    end
+  end
+end
+
+test do
+  describe "Secret" do
+    it "initializes without error" do
+      Kube::Cluster::Standard::Secret
+        .new(
+          name: "my-secret"
+        )
+        .to_yaml
+        .is_a?(String)
+        .should == true
+    end
+  end
+end

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

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "kube/cluster"
+
+module Kube
+  module Cluster
+    module Standard
+      class Service < Kube::Cluster["Service"]
+        def initialize(name:, ports:, namespace: "default", **options, &block)
+          super() {
+            metadata.name = name
+            metadata.namespace = namespace
+            metadata.labels = { "app" => name }
+            spec.selector = { "app" => name }
+            spec.ports = ports.map do |port|
+              { name: "http-#{port}", port: port, targetPort: port, protocol: "TCP" }
+            end
+
+            instance_exec(&block) if block_given?
+          }
+        end
+      end
+    end
+  end
+end
+
+test do
+  describe "Service" do
+    it "initializes without error" do
+      Kube::Cluster::Standard::Service
+        .new(
+          name: "my-secret",
+          ports: [],
+        )
+        .to_yaml
+        .is_a?(String)
+        .should == true
+    end
+  end
+end

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

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "kube/cluster"
+
+module Kube
+  module Cluster
+    module Standard
+      module VolumeProcessing
+        # Convert a volume_mounts hash into Kubernetes volumes and volumeMounts arrays.
+        #
+        # Hash values (mount path => source ref):
+        #   ExternalSecret::KeyRef  => secret volume with items, mount with subPath + readOnly
+        #   ExternalSecret          => secret volume, directory mount
+        #   PersistentVolumeClaim   => persistentVolumeClaim volume, plain mount
+        #
+        # Legacy: if input is an Array, it is returned as-is for backwards compat.
+        #
+        def self.process(input)
+          return { volumes: [], volume_mounts: input } if input.is_a?(Array)
+          return { volumes: [], volume_mounts: [] } if input.nil? || input.empty?
+
+          volumes = []
+          mounts = []
+
+          input.each do |mount_path, source|
+            case source
+            when ExternalSecret::KeyRef
+              name = source.secret.secret_name
+              key  = source.key_name
+              volumes << {
+                name: name,
+                secret: {
+                  secretName: name,
+                  items: [{ key: key, path: key }]
+                }
+              }
+              mounts << {
+                name: name,
+                mountPath: mount_path,
+                subPath: key,
+                readOnly: true
+              }
+
+            when ExternalSecret
+              name = source.secret_name
+              volumes << { name: name, secret: { secretName: name } }
+              mounts  << { name: name, mountPath: mount_path }
+
+            when PersistentVolumeClaim
+              name = source.to_h.dig(:metadata, :name)
+              volumes << { name: name, persistentVolumeClaim: { claimName: name } }
+              mounts  << { name: name, mountPath: mount_path }
+
+            when ConfigMap::KeyRef
+              name = source.config_map.config_map_name
+              key  = source.key_name
+              volumes << {
+                name: name,
+                configMap: {
+                  name: name,
+                  items: [{ key: key, path: key }]
+                }
+              }
+              mounts << {
+                name: name,
+                mountPath: mount_path,
+                subPath: key,
+                readOnly: true
+              }
+
+            when ConfigMap
+              name = source.to_h.dig(:metadata, :name)
+              volumes << { name: name, configMap: { name: name } }
+              mounts  << { name: name, mountPath: mount_path, readOnly: true }
+            end
+          end
+
+          { volumes: volumes, volume_mounts: mounts }
+        end
+      end
+    end
+  end
+end
+
+test do
+  # no op
+end

data/lib/kube/cluster/version.rb

@@ -2,6 +2,6 @@
 
 module Kube
   module Cluster
-    VERSION = "0.6.0"
+    VERSION = "0.7.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kube_cluster
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Nathan K
@@ -197,6 +197,11 @@ files:
 - lib/kube/cluster/script_command.rb
 - lib/kube/cluster/standard/cloud_native_pg.rb
 - lib/kube/cluster/standard/cloud_native_pg/helm.rb
+- lib/kube/cluster/standard/deployment_with_service.rb
+- lib/kube/cluster/standard/env_processing.rb
+- lib/kube/cluster/standard/secret.rb
+- lib/kube/cluster/standard/service.rb
+- lib/kube/cluster/standard/volume_processing.rb
 - lib/kube/cluster/version.rb
 - lib/kube/cluster/version.rb.erb
 - lib/kube/errors.rb