kubernetes-deploy 0.26.7 → 0.27.0

data/lib/kubernetes-deploy/template_sets.rb

@@ -0,0 +1,135 @@
+# frozen_string_literal: true
+
+module KubernetesDeploy
+  class TemplateSets
+    VALID_TEMPLATES = %w(.yml.erb .yml .yaml .yaml.erb)
+    # private inner class
+    class TemplateSet
+      def initialize(template_dir:, file_whitelist: [], logger:)
+        @template_dir = template_dir
+        @files = file_whitelist
+        @logger = logger
+      end
+
+      def with_resource_definitions(render_erb: false, current_sha: nil, bindings: nil)
+        if render_erb
+          @renderer = Renderer.new(
+            template_dir: @template_dir,
+            logger: @logger,
+            current_sha: current_sha,
+            bindings: bindings,
+          )
+        end
+        @files.each do |filename|
+          next if filename.end_with?(EjsonSecretProvisioner::EJSON_SECRETS_FILE)
+          templates(filename: filename) do |r_def|
+            yield r_def
+          end
+        end
+      end
+
+      def ejson_secrets_file
+        @ejson_secrets_file ||= begin
+          secret_file = @files.find { |f| f == EjsonSecretProvisioner::EJSON_SECRETS_FILE }
+          File.join(@template_dir, secret_file) if secret_file
+        end
+      end
+
+      def validate
+        errors = []
+        if Dir.entries(@template_dir).none? do |filename|
+             filename.end_with?(*TemplateSets::VALID_TEMPLATES) ||
+             filename.end_with?(EjsonSecretProvisioner::EJSON_SECRETS_FILE)
+           end
+          return errors << "Template directory #{@template_dir} does not contain any valid templates"
+        end
+
+        @files.each do |filename|
+          filename = File.join(@template_dir, filename)
+          if !File.exist?(filename)
+            errors << "File #{filename} does not exist"
+          elsif !filename.end_with?(*TemplateSets::VALID_TEMPLATES) &&
+                !filename.end_with?(EjsonSecretProvisioner::EJSON_SECRETS_FILE)
+            errors << "File #{filename} does not have valid suffix (supported suffixes: " \
+              "#{TemplateSets::VALID_TEMPLATES.join(', ')}, or #{EjsonSecretProvisioner::EJSON_SECRETS_FILE})"
+          end
+        end
+        errors
+      end
+
+      private
+
+      def templates(filename:)
+        file_content = File.read(File.join(@template_dir, filename))
+        rendered_content = @renderer ? @renderer.render_template(filename, file_content) : file_content
+        YAML.load_stream(rendered_content, "<rendered> #{filename}") do |doc|
+          next if doc.blank?
+          unless doc.is_a?(Hash)
+            raise InvalidTemplateError.new("Template is not a valid Kubernetes manifest",
+              filename: filename, content: doc)
+          end
+          yield doc
+        end
+      rescue InvalidTemplateError => err
+        err.filename ||= filename
+        raise err
+      rescue Psych::SyntaxError => err
+        raise InvalidTemplateError.new(err.message, filename: filename, content: rendered_content)
+      end
+    end
+    private_constant :TemplateSet
+
+    class << self
+      def from_dirs_and_files(paths:, logger:)
+        resource_templates = {}
+        dir_paths, file_paths = paths.partition { |path| File.directory?(path) }
+
+        # Directory paths
+        dir_paths.each do |template_dir|
+          resource_templates[template_dir] = Dir.foreach(template_dir).select do |filename|
+            filename.end_with?(*VALID_TEMPLATES) || filename == EjsonSecretProvisioner::EJSON_SECRETS_FILE
+          end
+        end
+
+        # Filename paths
+        file_paths.each do |filename|
+          dir_name = File.dirname(filename)
+          resource_templates[dir_name] ||= []
+          resource_templates[dir_name] << File.basename(filename) unless resource_templates[dir_name].include?(filename)
+        end
+
+        template_sets = []
+        resource_templates.each do |template_dir, files|
+          template_sets << TemplateSet.new(template_dir: template_dir, file_whitelist: files, logger: logger)
+        end
+        TemplateSets.new(template_sets: template_sets)
+      end
+    end
+
+    def with_resource_definitions(render_erb: false, current_sha: nil, bindings: nil)
+      @template_sets.each do |template_set|
+        template_set.with_resource_definitions(
+          render_erb: render_erb,
+          current_sha: current_sha,
+          bindings: bindings
+        ) do |r_def|
+          yield r_def
+        end
+      end
+    end
+
+    def ejson_secrets_files
+      @template_sets.map(&:ejson_secrets_file).compact
+    end
+
+    def validate
+      @template_sets.flat_map(&:validate)
+    end
+
+    private
+
+    def initialize(template_sets: [])
+      @template_sets = template_sets
+    end
+  end
+end

data/lib/kubernetes-deploy/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module KubernetesDeploy
-  VERSION = "0.26.7"
+  VERSION = "0.27.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes-deploy
 version: !ruby/object:Gem::Version
-  version: 0.26.7
+  version: 0.27.0
 platform: ruby
 authors:
 - Katrina Verey
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-11 00:00:00.000000000 Z
+date: 2019-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -266,6 +266,7 @@ files:
 - lib/kubernetes-deploy.rb
 - lib/kubernetes-deploy/bindings_parser.rb
 - lib/kubernetes-deploy/cluster_resource_discovery.rb
+- lib/kubernetes-deploy/common.rb
 - lib/kubernetes-deploy/concurrency.rb
 - lib/kubernetes-deploy/container_logs.rb
 - lib/kubernetes-deploy/deferred_summary_logging.rb
@@ -288,14 +289,12 @@ files:
 - lib/kubernetes-deploy/kubernetes_resource/horizontal_pod_autoscaler.rb
 - lib/kubernetes-deploy/kubernetes_resource/ingress.rb
 - lib/kubernetes-deploy/kubernetes_resource/job.rb
-- lib/kubernetes-deploy/kubernetes_resource/memcached.rb
 - lib/kubernetes-deploy/kubernetes_resource/network_policy.rb
 - lib/kubernetes-deploy/kubernetes_resource/persistent_volume_claim.rb
 - lib/kubernetes-deploy/kubernetes_resource/pod.rb
 - lib/kubernetes-deploy/kubernetes_resource/pod_disruption_budget.rb
 - lib/kubernetes-deploy/kubernetes_resource/pod_set_base.rb
 - lib/kubernetes-deploy/kubernetes_resource/pod_template.rb
-- lib/kubernetes-deploy/kubernetes_resource/redis.rb
 - lib/kubernetes-deploy/kubernetes_resource/replica_set.rb
 - lib/kubernetes-deploy/kubernetes_resource/resource_quota.rb
 - lib/kubernetes-deploy/kubernetes_resource/role.rb
@@ -318,7 +317,9 @@ files:
 - lib/kubernetes-deploy/rollout_conditions.rb
 - lib/kubernetes-deploy/runner_task.rb
 - lib/kubernetes-deploy/statsd.rb
-- lib/kubernetes-deploy/template_discovery.rb
+- lib/kubernetes-deploy/task_config.rb
+- lib/kubernetes-deploy/task_config_validator.rb
+- lib/kubernetes-deploy/template_sets.rb
 - lib/kubernetes-deploy/version.rb
 - pull_request_template.md
 - screenshots/deploy-demo.gif
@@ -346,8 +347,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Kubernetes deploy scripts

data/lib/kubernetes-deploy/kubernetes_resource/memcached.rb

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-module KubernetesDeploy
-  class Memcached < KubernetesResource
-    TIMEOUT = 5.minutes
-    CONFIGMAP_NAME = "memcached-url"
-
-    def sync(cache)
-      super
-      @deployment = cache.get_instance(Deployment.kind, "memcached-#{@name}")
-      @service = cache.get_instance(Service.kind, "memcached-#{@name}")
-      @configmap = cache.get_instance(ConfigMap.kind, CONFIGMAP_NAME)
-    end
-
-    def status
-      deploy_succeeded? ? "Provisioned" : "Unknown"
-    end
-
-    def deploy_succeeded?
-      deployment_ready? && service_ready? && configmap_ready?
-    end
-
-    def deploy_failed?
-      false
-    end
-
-    private
-
-    def deployment_ready?
-      return false unless (status = @deployment["status"])
-      status.fetch("availableReplicas", -1) == status.fetch("replicas", 0)
-    end
-
-    def service_ready?
-      return false unless @service.present?
-      @service.dig("spec", "clusterIP").present?
-    end
-
-    def configmap_ready?
-      return false unless @configmap.present?
-      @configmap.dig("data", @name).present?
-    end
-  end
-end

data/lib/kubernetes-deploy/kubernetes_resource/redis.rb

@@ -1,56 +0,0 @@
-# frozen_string_literal: true
-module KubernetesDeploy
-  class Redis < KubernetesResource
-    TIMEOUT = 5.minutes
-    UUID_ANNOTATION = "redis.stable.shopify.io/owner_uid"
-
-    def sync(cache)
-      super
-
-      @deployment = cache.get_instance(Deployment.kind, name)
-      @deployment = cache.get_instance(Deployment.kind, deprecated_name) if @deployment.empty?
-
-      @service = cache.get_instance(Service.kind, name)
-      @service = cache.get_instance(Service.kind, deprecated_name) if @service.empty?
-    end
-
-    def status
-      deploy_succeeded? ? "Provisioned" : "Unknown"
-    end
-
-    def deploy_succeeded?
-      deployment_ready? && service_ready?
-    end
-
-    def deploy_failed?
-      false
-    end
-
-    private
-
-    def deployment_ready?
-      return false unless (status = @deployment["status"])
-      # all redis pods are running
-      status.fetch("availableReplicas", -1) == status.fetch("replicas", 0)
-    end
-
-    def service_ready?
-      return false unless @service.present?
-      # the service has an assigned cluster IP and is therefore functioning
-      @service.dig("spec", "clusterIP").present?
-    end
-
-    def name
-      @definition.dig('metadata', 'name')
-    end
-
-    def deprecated_name
-      "redis-#{redis_resource_uuid}"
-    end
-
-    def redis_resource_uuid
-      return unless @instance_data.present?
-      @instance_data.dig("metadata", "uid")
-    end
-  end
-end

data/lib/kubernetes-deploy/template_discovery.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module KubernetesDeploy
-  class TemplateDiscovery
-    def initialize(template_dir)
-      @template_dir = template_dir
-    end
-
-    def templates
-      Dir.foreach(@template_dir).select do |filename|
-        filename.end_with?(".yml.erb", ".yml", ".yaml", ".yaml.erb")
-      end
-    end
-  end
-end