kubes 0.4.7 → 0.5.0

data/lib/kubes/cli/sequence.rb

@@ -3,6 +3,7 @@ require 'thor'
 class Kubes::CLI
   class Sequence < Thor::Group
     include Thor::Actions
+    include Kubes::Logging
 
   private
     def logger

data/lib/kubes/command.rb

@@ -28,6 +28,8 @@ module Kubes
   class Command < Thor
     class << self
       def dispatch(m, args, options, config)
+        check_project!(args.first)
+
         # Allow calling for help via:
         #   kubes command help
         #   kubes command -h
@@ -54,6 +56,11 @@ module Kubes
         super
       end
 
+      def check_project!(command_name)
+        return if %w[init new].include?(command_name)
+        Kubes.check_project!
+      end
+
       # Override command_help to include the description at the top of the
       # long_description.
       def command_help(shell, command_name)

data/lib/kubes/compiler.rb

@@ -3,6 +3,7 @@ module Kubes
     include Kubes::Hooks::Concern
     include Kubes::Logging
     include Kubes::Util::Consider
+    include Kubes::Kubectl::Ordering
 
     def initialize(options={})
       @options = options
@@ -21,7 +22,9 @@ module Kubes
         end
       end
 
-      puts "Compiled  .kubes/resources files to .kubes/output" if show_compiled_message?
+      write_full
+
+      logger.info "Compiled  .kubes/resources files to .kubes/output" if show_compiled_message?
     end
 
     def resources
@@ -34,24 +37,6 @@ module Kubes
       paths
     end
 
-    # Only considering files 2 layers deep. So:
-    #
-    #    Yes = web/deployment.yaml
-    #    No = web/deployment/dev.yaml
-    #
-    def process?(path)
-      if Kubes.kustomize?
-        File.file?(path)
-      else
-        consider?(path) && two_levels_deep?(path)
-      end
-    end
-
-    def two_levels_deep?(path)
-      rel_path = path.sub(%r{.*\.kubes/resources/},'')
-      rel_path.split('/').size == 2
-    end
-
     def write(result)
       result.decorate!(:post)
       filename, content = result.filename, result.content
@@ -64,12 +49,25 @@ module Kubes
         IO.write(dest, content)
       end
 
-      pretty_dest = dest.sub("#{Kubes.root}/",'')
-      logger.debug "Compiled  #{pretty_dest}"
+      logger.debug "Compiled  #{pretty(dest)}"
+    end
+
+    def write_full
+      full = sorted_files.inject([]) do |acc, file|
+        acc << IO.read(file)
+      end
+      content = full.join("\n")
+      path = "#{Kubes.root}/.kubes/output/full.yaml"
+      IO.write(path, content)
+      logger.debug "Compiled  #{pretty(path)}"
     end
 
     def show_compiled_message?
       !%w[g ge get].include?(ARGV.first)
     end
+
+    def pretty(path)
+      path.sub("#{Kubes.root}/",'')
+    end
   end
 end

data/lib/kubes/compiler/dsl/syntax/job.rb

@@ -0,0 +1,217 @@
+module Kubes::Compiler::Dsl::Syntax
+  class Job < Resource
+    fields :container,          # <Object>
+           "matchLabels:hash",  # <map[string]string>
+           :sidecar,            # <Object>
+           :sidecar_name,       # <string>
+           :sidecar_image,      # <string>
+           :templateMetadata,   # <Object>
+           :templateSpec        # <Object>
+
+    # kubectl explain job.spec
+   fields :activeDeadlineSeconds,    #        <integer>
+          :backoffLimit,             # <integer>
+          :completions,              #  <integer>
+          :manualSelector,           #       <boolean>
+          :parallelism,              #  <integer>
+          :selector,                 #     <Object>
+          :template,                 #     <Object> -required-
+          :ttlSecondsAfterFinished  #      <integer>
+
+
+    # kubectl explain job.spec.template.spec
+    fields :activeDeadlineSeconds,        # <integer>
+           :affinity,                     # <Object>
+           :automountServiceAccountToken, # <boolean>
+           :containers,                   # <[]Object> -required-
+           :dnsConfig,                    # <Object>
+           :dnsPolicy,                    # <string>
+           :enableServiceLinks,           # <boolean>
+           :ephemeralContainers,          # <[]Object>
+           :hostAliases,                  # <[]Object>
+           :hostIPC,                      # <boolean>
+           :hostNetwork,                  # <boolean>
+           :hostPID,                      # <boolean>
+           :hostname,                     # <string>
+           :imagePullSecrets,             # <[]Object>
+           :initContainers,               # <[]Object>
+           :nodeName,                     # <string>
+           :nodeSelector,                 # <map[string]string>
+           :overhead,                     # <map[string]string>
+           :preemptionPolicy,             # <string>
+           :priority,                     # <integer>
+           :priorityClassName,            # <string>
+           :readinessGates,               # <[]Object>
+           :restartPolicy,                # <string>
+           :runtimeClassName,             # <string>
+           :schedulerName,                # <string>
+           :securityContext,              # <Object>
+           :serviceAccount,               # <string>
+           :serviceAccountName,           # <string>
+           :shareProcessNamespace,        # <boolean>
+           :subdomain,                    # <string>
+           :terminationGracePeriodSeconds,# <integer>
+           :tolerations,                  # <[]Object>
+           :topologySpreadConstraints,    # <[]Object>
+           :volumes                       # <[]Object>
+
+    # kubectl explain deployment.spec.template.spec.containers
+    fields :args,                     # <[]string>
+           :command,                  # <[]string>
+           :env,                      # <[]Object>
+           :envFrom,                  # <[]Object>
+           :image,                    # <string>
+           :imagePullPolicy,          # <string>
+           :lifecycle,                # <Object>
+           :livenessProbe,            # <Object>
+           :containerName,            # <string> -required- (originally called name)
+           :ports,                    # <[]Object>
+           :readinessProbe,           # <Object>
+           :resources,                # <Object>
+           :securityContext,          # <Object>
+           :startupProbe,             # <Object>
+           :stdin,                    # <boolean>
+           :stdinOnce,                # <boolean>
+           :terminationMessagePath,   # <string>
+           :terminationMessagePolicy, # <string>
+           :tty,                      # <boolean>
+           :volumeDevices,            # <[]Object>
+           :volumeMounts,             # <[]Object>
+           :workingDir                # <string>
+
+    # kubectl explain deployment.spec.template.spec.containers.ports
+   fields :containerPort, # <integer> -required-
+          :hostIP,        # <string>
+          :hostPort,      # <integer>
+          :portName,      # <string> (originally called name)
+          :protocol       # <string>
+
+    def default_apiVersion
+      "batch/v1"
+    end
+
+    def default_spec
+      {
+        activeDeadlineSeconds: activeDeadlineSeconds,
+        backoffLimit: backoffLimit,
+        completions: completions,
+        manualSelector: manualSelector,
+        parallelism: parallelism,
+        selector: selector,
+        template: template,
+        ttlSecondsAfterFinished:  ttlSecondsAfterFinished,
+      }
+    end
+
+    def default_matchLabels
+      labels
+    end
+
+    def default_template
+      {
+        metadata: templateMetadata,
+        spec: templateSpec,
+      }
+    end
+
+    def default_templateSpec
+      {
+        activeDeadlineSeconds: activeDeadlineSeconds,
+        affinity: affinity,
+        automountServiceAccountToken: automountServiceAccountToken,
+        containers: containers,
+        dnsConfig: dnsConfig,
+        dnsPolicy: dnsPolicy,
+        enableServiceLinks: enableServiceLinks,
+        ephemeralContainers: ephemeralContainers,
+        hostAliases: hostAliases,
+        hostIPC: hostIPC,
+        hostNetwork: hostNetwork,
+        hostPID: hostPID,
+        hostname: hostname,
+        imagePullSecrets: imagePullSecrets,
+        initContainers: initContainers,
+        nodeName: nodeName,
+        nodeSelector: nodeSelector,
+        overhead: overhead,
+        preemptionPolicy: preemptionPolicy,
+        priority: priority,
+        priorityClassName: priorityClassName,
+        readinessGates: readinessGates,
+        restartPolicy: restartPolicy,
+        runtimeClassName: runtimeClassName,
+        schedulerName: schedulerName,
+        securityContext: securityContext,
+        serviceAccount: serviceAccount,
+        serviceAccountName: serviceAccountName,
+        shareProcessNamespace: shareProcessNamespace,
+        subdomain: subdomain,
+        terminationGracePeriodSeconds: terminationGracePeriodSeconds,
+        tolerations: tolerations,
+        topologySpreadConstraints: topologySpreadConstraints,
+        volumes: volumes,
+      }
+    end
+
+    def default_templateMetadata
+      { labels: labels }
+    end
+
+    def default_containers
+      [container, sidecar].compact
+    end
+
+    def default_sidecar
+      {
+        name:  sidecar_name,
+        image: sidecar_image,
+      }
+    end
+
+    def default_sidecar_name
+      "sidecar" if sidecar_image # othewise will create invalid sidecar field w/o image
+    end
+
+    def default_container
+      {
+        args: args,
+        command: command,
+        env: env,
+        envFrom: envFrom,
+        image: image,
+        imagePullPolicy: imagePullPolicy,
+        lifecycle: lifecycle,
+        livenessProbe: livenessProbe,
+        name: containerName || name,
+        ports: ports,
+        readinessProbe: readinessProbe,
+        resources: resources,
+        securityContext: securityContext,
+        startupProbe: startupProbe,
+        stdin: stdin,
+        stdinOnce: stdinOnce,
+        terminationMessagePath: terminationMessagePath,
+        terminationMessagePolicy: terminationMessagePolicy,
+        tty: tty,
+        volumeDevices: volumeDevices,
+        volumeMounts: volumeMounts,
+        workingDir: workingDir,
+      }
+    end
+
+    def default_ports
+      [
+        containerPort: containerPort,
+        hostIP: hostIP,
+        hostPort: hostPort,
+        name: portName,
+        protocol: protocol,
+      ]
+    end
+
+    # Override command instead of default_command since we want to change a String to an Array
+    def command_reader
+      @command.is_a?(String) ? @command.split(' ') : @command # else assume Array
+    end
+  end
+end

data/lib/kubes/compiler/shared/helpers.rb

@@ -5,12 +5,21 @@ module Kubes::Compiler::Shared
     extend Kubes::Compiler::Dsl::Core::Fields
     fields "name"
 
-    def built_image
+    def docker_image
       return @options[:image] if @options[:image] # override
+      return Kubes.config.image if Kubes.config.image
+      built_image_helper
+    end
+
+    def built_image
+      Deprecated.new.built_image
+      built_image_helper
+    end
 
+    def built_image_helper
       path = Kubes.config.state.docker_image_path
       unless File.exist?(path)
-        raise "Missing file with docker image built by kubes: #{path}. Try first running: kubes docker build"
+        raise Kubes::MissingDockerImage.new("Missing file with docker image built by kubes: #{path}. Try first running: kubes docker build")
       end
       IO.read(path)
     end

data/lib/kubes/compiler/shared/helpers/deprecated.rb

@@ -0,0 +1,37 @@
+module Kubes::Compiler::Shared::Helpers
+  class Deprecated
+    def built_image
+      puts "DEPRECATED: built_image is deprecated, use docker_image helper instead.".color(:yellow)
+      print_source
+    end
+
+    def error_info
+      error_info = caller.find { |l| l.include?('.kubes/resources') }
+      path, line_number, _ = error_info.split(':')
+      {path: path, line_number: line_number}
+    end
+
+    def print_source
+      info = error_info
+      path = info[:path]
+      line_number = info[:line_number].to_i
+
+      pretty_path = path.sub("#{Kubes.root}/",'')
+      puts "Here's the line in #{pretty_path} that calls built_image:\n\n"
+
+      contents = IO.read(path)
+      content_lines = contents.split("\n")
+      context = 5 # lines of context
+      top, bottom = [line_number-context-1, 0].max, line_number+context-1
+      lpad = content_lines.size.to_s.size
+      content_lines[top..bottom].each_with_index do |line_content, index|
+        current_line = top+index+1
+        if current_line == line_number
+          printf("%#{lpad}d %s\n".color(:red), current_line, line_content)
+        else
+          printf("%#{lpad}d %s\n", current_line, line_content)
+        end
+      end
+    end
+  end
+end

data/lib/kubes/config.rb

@@ -32,7 +32,7 @@ module Kubes
 
       config.repo = nil # expected to be set by .kubes/config.rb
 
-      config.logger = Logger.new($stdout)
+      config.logger = Logger.new($stderr)
       config.logger.level = ENV['KUBES_LOG_LEVEL'] || :info
 
       config.skip = []

data/lib/kubes/core.rb

@@ -28,5 +28,11 @@ module Kubes
     def kustomize?
       Kubectl::Kustomize.detect?
     end
+
+    def check_project!
+      return if File.exist?("#{Kubes.root}/.kubes/config.rb")
+      logger.error "ERROR: It doesnt look like this is a kubes project. Are you sure you are in a kubes project?".color(:red)
+      ENV['TS_TEST'] ? raise : exit(1)
+    end
   end
 end

data/lib/kubes/docker/strategy/image_name.rb

@@ -30,7 +30,7 @@ module Kubes::Docker::Strategy
       return "tongueroo/demo-kubes:kubes-12345678" if ENV['TEST']
 
       unless File.exist?(image_state_path)
-        puts "Unable to find #{image_state_path} which contains the last docker image name built with kubes build.  Please run `kubes docker build` first."
+        logger.error "ERROR: Unable to find #{image_state_path} which contains the last docker image name built with kubes build.  Please run `kubes docker build` first."
         exit 1
       end
       IO.read(image_state_path).strip

data/lib/kubes/kubectl/batch.rb

@@ -49,38 +49,5 @@ class Kubes::Kubectl
       end
       result
     end
-
-    # kubes apply                   # {role: nil, resource: nil}
-    # kubes apply clock             # {role: "clock", resource: nil}
-    # kubes apply clock deployment  # {role: "clock", resource: "deployment"}
-    def search_expr
-      role, resource = @options[:role], @options[:resource]
-      if role && resource
-        "#{Kubes.root}/.kubes/output/#{role}/#{resource}.yaml"
-      elsif role
-        "#{Kubes.root}/.kubes/output/#{role}/*.yaml"
-      else
-        "#{Kubes.root}/.kubes/output/**/*.yaml"
-      end
-    end
-
-    def files
-      files = []
-      Dir.glob(search_expr).each do |path|
-        next unless process?(path)
-        file = path.sub("#{Kubes.root}/", '')
-        files << file
-      end
-      files
-    end
-
-    def process?(path)
-      consider?(path) && two_levels_deep?(path)
-    end
-
-    def two_levels_deep?(path)
-      rel_path = path.sub(%r{.*\.kubes/output/},'')
-      rel_path.split('/').size == 2
-    end
   end
 end